From 9b4dac8d8b47bdb940e44b688c61f2e2ca308e5d Mon Sep 17 00:00:00 2001
From: Pawan Koshti <v-pakoshti@microsoft.com>
Date: Wed, 11 Sep 2024 17:50:44 +0530
Subject: [PATCH 1/3] Fixed issues for these samples

---
 .../teamsfileupload/TeamsFileUploadBot.java   |  96 +++++++++++-------
 .../demo-manifest/bot-sso-adaptivecard.zip    | Bin 4522 -> 4756 bytes
 .../Pages/conversation-tab.cshtml             |  13 ++-
 .../nodejs/server/views/conversation-tab.html |  25 +++--
 4 files changed, 86 insertions(+), 48 deletions(-)

diff --git a/samples/bot-file-upload/java/src/main/java/com/microsoft/bot/sample/teamsfileupload/TeamsFileUploadBot.java b/samples/bot-file-upload/java/src/main/java/com/microsoft/bot/sample/teamsfileupload/TeamsFileUploadBot.java
index dac172e10c..7bb024fdfa 100644
--- a/samples/bot-file-upload/java/src/main/java/com/microsoft/bot/sample/teamsfileupload/TeamsFileUploadBot.java
+++ b/samples/bot-file-upload/java/src/main/java/com/microsoft/bot/sample/teamsfileupload/TeamsFileUploadBot.java
@@ -28,6 +28,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -51,6 +53,8 @@ public class TeamsFileUploadBot extends TeamsActivityHandler {
 
     private static String microsoftAppId;
     private static String microsoftAppPassword;
+    private static final String FILES_DIR = "files";
+    private TurnContext context;
 
     public TeamsFileUploadBot(Configuration configuration) {
         microsoftAppId = configuration.getProperty("MicrosoftAppId");
@@ -190,51 +194,71 @@ private boolean messageWithDownload(Activity activity) {
         return messageWithFileDownloadInfo;
     }
 
-    private CompletableFuture<ResultPair<String>> upload(
-        FileConsentCardResponse fileConsentCardResponse
-    ) {
+
+    private CompletableFuture<ResultPair<String>> upload(FileConsentCardResponse fileConsentCardResponse) {
         AtomicReference<ResultPair<String>> result = new AtomicReference<>();
 
         return CompletableFuture.runAsync(() -> {
-            Map<String, String> context = (Map<String, String>) fileConsentCardResponse
-                .getContext();
+            Map<String, String> context = (Map<String, String>) fileConsentCardResponse.getContext();
             File filePath = new File("files", context.get("filename"));
             HttpURLConnection connection = null;
 
-            try {
-                URL url = new URL(fileConsentCardResponse.getUploadInfo().getUploadUrl());
-                connection = (HttpURLConnection) url.openConnection();
-                connection.setRequestMethod("PUT");
-                connection.setDoOutput(true);
-                connection.setRequestProperty("Content-Length", Long.toString(filePath.length()));
-                connection.setRequestProperty(
-                    "Content-Range",
-                    String.format("bytes 0-%d/%d", filePath.length() - 1, filePath.length())
-                );
 
-                try (
-                    FileInputStream fileStream = new FileInputStream(filePath);
-                    OutputStream uploadStream = connection.getOutputStream()
-                ) {
-                    byte[] buffer = new byte[4096];
-                    int bytes_read;
-                    while ((bytes_read = fileStream.read(buffer)) != -1) {
-                        uploadStream.write(buffer, 0, bytes_read);
+            
+                try {
+                    URI uri = new URI(fileConsentCardResponse.getUploadInfo().getUploadUrl());
+                    URL url = uri.toURL();
+                    connection = (HttpURLConnection) url.openConnection();
+                    connection.setRequestMethod("PUT");
+                    connection.setDoOutput(true);
+                    connection.setRequestProperty("Content-Type", "image/png");
+                    connection.setRequestProperty("Content-Length", Long.toString(filePath.length()));
+                    connection.setRequestProperty(
+                        "Content-Range",
+                        String.format("bytes 0-%d/%d", filePath.length() - 1, filePath.length())
+                    );
+
+                    try (FileInputStream fileStream = new FileInputStream(filePath);
+                         OutputStream uploadStream = connection.getOutputStream()) {
+
+                        byte[] buffer = new byte[4096];
+                        int bytesRead;
+                        while ((bytesRead = fileStream.read(buffer)) != -1) {
+                            uploadStream.write(buffer, 0, bytesRead);
+                        }
                     }
-                }
 
-                result.set(new ResultPair<String>(true, null));
-            } catch (Throwable t) {
-                result.set(new ResultPair<String>(false, t.getLocalizedMessage()));
-            } finally {
-                if (connection != null) {
-                    connection.disconnect();
+                    int responseCode = connection.getResponseCode();
+                    if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED) {
+                        result.set(new ResultPair<>(true, null));
+                        
+                    } else {
+                        result.set(new ResultPair<>(false, "Failed with HTTP error code: " + responseCode));
+                        
+                        Thread.sleep(1000); // Simple backoff before retrying
+                    }
+                } catch (IOException e) {
+                    result.set(new ResultPair<>(false, "IOException: " + e.getMessage()));
+                    
+                } catch (URISyntaxException e) {
+                    result.set(new ResultPair<>(false, "URISyntaxException: " + e.getMessage()));
+                 
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt(); // Restore interrupt status
+                    result.set(new ResultPair<>(false, "InterruptedException: " + e.getMessage()));
+                 
+                } finally {
+                    if (connection != null) {
+                        connection.disconnect();
+                    }
                 }
-            }
-        })
-            .thenApply(aVoid -> result.get());
+
+            
+        }).thenApply(aVoid -> result.get());
     }
 
+
+
     private CompletableFuture<Void> processInlineImage(TurnContext turnContext) {
         Attachment attachment = turnContext.getActivity().getAttachments().get(0);
         final HttpURLConnection[] connection = {null};
@@ -243,7 +267,8 @@ private CompletableFuture<Void> processInlineImage(TurnContext turnContext) {
             try {
                 // Save the inline image to Files directory.
                 String filePath = "files/imageFromUser.png";
-                URL url = new URL(attachment.getContentUrl());
+                URI uri = new URI(attachment.getContentUrl());
+                URL url = uri.toURL();
                 connection[0] = (HttpURLConnection) url.openConnection();
                 connection[0].setRequestProperty("Authorization", "Bearer " + token);
                 try (
@@ -302,7 +327,8 @@ private CompletableFuture<ResultPair<String>> downloadAttachment(Attachment atta
             HttpURLConnection connection = null;
 
             try {
-                URL url = new URL(fileDownload.getDownloadUrl());
+                URI uri = new URI(fileDownload.getDownloadUrl());
+                URL url = uri.toURL();
                 connection = (HttpURLConnection) url.openConnection();
                 connection.setDoInput(true);
 
diff --git a/samples/bot-sso-adaptivecard/csharp/demo-manifest/bot-sso-adaptivecard.zip b/samples/bot-sso-adaptivecard/csharp/demo-manifest/bot-sso-adaptivecard.zip
index b99c3ebc0aaef156798bf4d0e64215ab8c7096c9..0497160bbc17b061fa7f9081c83f63d7687004b4 100644
GIT binary patch
delta 4313
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

delta 4078
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
Lvg^7=^Y`jsdY!e!

diff --git a/samples/tab-conversations/csharp/TabConversation/Pages/conversation-tab.cshtml b/samples/tab-conversations/csharp/TabConversation/Pages/conversation-tab.cshtml
index 10e3f42d48..dda136fce2 100644
--- a/samples/tab-conversations/csharp/TabConversation/Pages/conversation-tab.cshtml
+++ b/samples/tab-conversations/csharp/TabConversation/Pages/conversation-tab.cshtml
@@ -6,7 +6,9 @@
 <head>
     <link rel="stylesheet" type="text/css" href="/static/styles/msteams-16.css"/>
     <link rel="stylesheet" type="text/css" href="/static/styles/custom.css"/>
-    <script src="https://res.cdn.office.net/teams-js/2.0.0/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.27.0/js/MicrosoftTeams.min.js"
+            integrity="sha384-QGb/h0ACuraFEnqrpkMcMBTU+baTLZy1Mh61IGbM206IPGRWiWCIL5dkLzG1RKZH"
+            crossorigin="anonymous"></script>
     <script>
         microsoftTeams.app.initialize().then(() => {
         }); 
@@ -14,10 +16,9 @@
         // Method to start a new conversation.
         function startConversation() {
             microsoftTeams.app.getContext().then((context) => {
-                console.log(context);
                 microsoftTeams.conversations.openConversation(
                     {
-                        "subEntityId": Date.now(),
+                        "subEntityId": Date.now().toString(),
                         "entityId": context.page.id,
                         "channelId": context.channel.id,
                         "title": "Task Title",
@@ -40,6 +41,7 @@
         }
 
         // Method to continue an existing conversation.
+        
         function continueConversation() {
             microsoftTeams.app.getContext().then((context) => {
                 microsoftTeams.conversations.openConversation(
@@ -51,8 +53,11 @@
                         "conversationId": localStorage.conversationId
                     }
                 );
-            });
+            })
         }
+        
+        
+
 
         // Method to execute deeplink to redirect to the subentity/conversation in the channel.
             function deeplinkConversation() {
diff --git a/samples/tab-conversations/nodejs/server/views/conversation-tab.html b/samples/tab-conversations/nodejs/server/views/conversation-tab.html
index f5d2ad15b3..438534ecf7 100644
--- a/samples/tab-conversations/nodejs/server/views/conversation-tab.html
+++ b/samples/tab-conversations/nodejs/server/views/conversation-tab.html
@@ -6,7 +6,9 @@
     </link>
     <link rel="stylesheet" type="text/css" href="/static/styles/custom.css">
     </link>
-    <script src="https://res.cdn.office.net/teams-js/2.0.0/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.26.0/js/MicrosoftTeams.min.js"
+        integrity="sha384-gqPg5qCjdUgTGRZ/stLskrnJllL5h5+f4kTqvxVqtl2FdT7PVRa9Q7zq4gFlZ7bO"
+        crossorigin="anonymous"></script>
     <script>
         microsoftTeams.app.initialize().then(() => {
         });
@@ -16,7 +18,7 @@
             microsoftTeams.app.getContext().then((context) => {
                 microsoftTeams.conversations.openConversation(
                     {
-                        "subEntityId": Date.now(),
+                        "subEntityId": Date.now().toString(),
                         "entityId": context.page.id,
                         "channelId": context.channel.id,
                         "title": "Task Title",
@@ -29,10 +31,11 @@
         // Callback function for open conversation.
         // We should save the subEntityId and conversationId to continue an existing conversartion
         function onStartConversation(conversationResponse) {
-            localStorage.setItem("subEntityId", conversationResponse.subEntityId);
-            localStorage.setItem("conversationId", conversationResponse.conversationId);
+                localStorage.setItem("subEntityId", conversationResponse.subEntityId);
+                localStorage.setItem("conversationId", conversationResponse.conversationId);
         }
 
+
         // Method to close an existing conversation.
         function closeConversation() {
             microsoftTeams.conversations.closeConversation();
@@ -56,7 +59,7 @@
         // Method to execute deeplink to redirect to the subentity/conversation in the channel.
         function deeplinkConversation() {
             microsoftTeams.app.getContext().then((context) => {
-                microsoftTeams.app.openLink("https://teams.microsoft.com/l/message/"+context.channel.id+"/" + localStorage.conversationId + "?groupId="+context.team.groupId+"&tenantId="+context.user.tenant.id+"&parentMessageId="+localStorage.conversationId);
+                microsoftTeams.app.openLink("https://teams.microsoft.com/l/message/" + context.channel.id + "/" + localStorage.conversationId + "?groupId=" + context.team.groupId + "&tenantId=" + context.user.tenant.id + "&parentMessageId=" + localStorage.conversationId);
             })
         }
     </script>
@@ -76,22 +79,26 @@
                     <tr>
                         <td>Start Conversation</td>
                         <td>To open a conversation</td>
-                        <td><img src="../../images/start-conversation.svg" onclick="startConversation()" title="Click to start a new conversation"/></td>
+                        <td><img src="../../images/start-conversation.svg" onclick="startConversation()"
+                                title="Click to start a new conversation" /></td>
                     </tr>
                     <tr>
                         <td>Close Conversation</td>
                         <td>To close the conversation view</td>
-                        <td><img src="../../images/close.svg"onclick="closeConversation()" title="Click to close the conversation view"/></td>
+                        <td><img src="../../images/close.svg" onclick="closeConversation()"
+                                title="Click to close the conversation view" /></td>
                     </tr>
                     <tr>
                         <td>Continue Conversation</td>
                         <td>To continue a conversation.</td>
-                        <td><img src="../../images/continue-conversation.svg" onclick="continueConversation()" title="Click to continue existing conversation"/></td>
+                        <td><img src="../../images/continue-conversation.svg" onclick="continueConversation()"
+                                title="Click to continue existing conversation" /></td>
                     </tr>
                     <tr>
                         <td>Deeplink to conversation</td>
                         <td>Redirect to channel conversation.</td>
-                        <td><img src="../../images/link.svg" onclick="deeplinkConversation()" title="Click to redirect to conversation in chat"/></td>
+                        <td><img src="../../images/link.svg" onclick="deeplinkConversation()"
+                                title="Click to redirect to conversation in chat" /></td>
                     </tr>
                 </table>
             </div>

From bdb90f00f1183c628ec0cb780cdfa950207f5a9c Mon Sep 17 00:00:00 2001
From: Pawan Koshti <v-pakoshti@microsoft.com>
Date: Mon, 16 Sep 2024 11:55:05 +0530
Subject: [PATCH 2/3] Changes or expert finder

---
 samples/msgext-expert-finder-js/assets/sample.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/msgext-expert-finder-js/assets/sample.json b/samples/msgext-expert-finder-js/assets/sample.json
index 4c4490dabd..5376b6d9c6 100644
--- a/samples/msgext-expert-finder-js/assets/sample.json
+++ b/samples/msgext-expert-finder-js/assets/sample.json
@@ -4,7 +4,7 @@
     "source": "officeDev",
     "title": "Expert Finder with SSO in Copilot using multi parameter search",
     "shortDescription": "Microsoft Teams message extension that can be used as a plugin to Search for candidates and share profiles matching a criteria.",
-    "url": "https://github.com/OfficeDev/Microsoft-Teams-Samples/tree/main/samples/msgext-expert-finder",
+    "url": "https://github.com/OfficeDev/Microsoft-Teams-Samples/tree/main/samples/msgext-expert-finder-js",
     "longDescription": [
       "This sample implements a Teams message extension that can be used as a plugin for Microsoft Copilot for Microsoft 365. The message extension allows users to query the candidates based on their skills, location and availability."
     ],

From 4660b26d6251da8e9264e50c1ae76a723a958ce3 Mon Sep 17 00:00:00 2001
From: Pawan Koshti <v-pakoshti@microsoft.com>
Date: Mon, 16 Sep 2024 12:34:23 +0530
Subject: [PATCH 3/3] Tab-product inspection fixed for android and IOS

---
 .../Views/Home/ScanProduct.cshtml             | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ScanProduct.cshtml b/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ScanProduct.cshtml
index 412dfff68e..3745e2bf37 100644
--- a/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ScanProduct.cshtml
+++ b/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ScanProduct.cshtml
@@ -23,7 +23,7 @@
         let productName;
         let image = "";
 
-        // Method to scan barcode
+        //Method to scan barcode
         function scanBarCode() {
             var config = {
                 timeOutIntervalInSec: 30
@@ -67,24 +67,37 @@
             }, config);
         }
 
-        // Method to capture product image
-        function captureImage() {
+        //Method to capture product image  
+        function selectMedia() {
             microsoftTeams.app.initialize().then(() => {
+                
+                var imageProp = {
+                    sources: [microsoftTeams.media.Source.Camera, microsoftTeams.media.Source.Gallery],
+                    startMode: microsoftTeams.media.CameraStartMode.Photo,
+                    ink: false,
+                    cameraSwitcher: false,
+                    textSticker: false,
+                    enableFilter: true
+                };
 
-                // Method to ask for image capture permission and then capture image
-                microsoftTeams.media.captureImage((error, files) => {
-                    // If there's any error, an alert shows the error message/code
+                var mediaInput = {
+                    mediaType: microsoftTeams.media.MediaType.Image,
+                    maxMediaCount: 1,
+                    imageProps: imageProp
+                };
+
+                microsoftTeams.media.selectMedia(mediaInput, function (error, attachments) {
                     if (error) {
                         if (error.message) {
                             alert(" ErrorCode: " + error.errorCode + error.message);
                         } else {
                             alert(" ErrorCode: " + error.errorCode);
                         }
-                    } else if (files) {
-                        image = files[0].content;
-                        $("#productImg").attr("src", "data:image/png;base64," + image);
-                        $("#productStatus").show();
-                    }
+                    } else if (attachments) {
+                         image = attachments[0];
+                            $("#productImg").attr("src", "data:image/png;base64," + image.preview);
+                            $("#productStatus").show();
+                        }
                 });
             });
         }
@@ -93,7 +106,7 @@
             var productStatus = status ? "Approved" : "Rejected";
             const formData = new FormData();
             formData.append('productId', productId);
-            formData.append('image', "data:image/png;base64," + image);
+            formData.append('image', "data:image/png;base64," + image.preview);
             formData.append('status', productStatus);
             $("#productStatus").hide();
             $("#captureImage").hide();
@@ -125,7 +138,7 @@
     <div class="surface">
         <div class="panel">
             <div id="captureImage">
-                <button type="button" class="btn btn-outline-info" onclick="captureImage()">Capture Image</button>
+                <button type="button" class="btn btn-outline-info" onclick="selectMedia()">Capture Image</button>
             </div>
             <div id="productStatus">
                 <label id="scannedText"></label>