Merge pull request #844 from OfficeDev/v-harikrishnan/bot-task-module

Fixed Bot-Task-Module Sample Issues
OfficeDev · Jul 3, 2023 · 1227bf2 · 1227bf2
2 parents 859cc9c + 3e01334
commit 1227bf2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/samples/bot-task-module/nodejs/index.js b/samples/bot-task-module/nodejs/index.js
@@ -67,3 +67,10 @@ server.post('/api/messages', async (req, res) => {
 server.get('/*', restify.plugins.serveStatic({
     directory: './pages'
 }));
+
+server.get('/getAppConfig', (req, res,next) => {
+    var responseMessageData = {
+        MicrosoftAppId: process.env.MicrosoftAppId
+    }
+    res.send(responseMessageData);
+  });
diff --git a/samples/bot-task-module/nodejs/pages/CustomForm.html b/samples/bot-task-module/nodejs/pages/CustomForm.html
@@ -9,7 +9,7 @@
     <script src="https://statics.teams.cdn.office.net/sdk/v1.5.2/js/MicrosoftTeams.min.js" asp-append-version="true"></script>
 </head>
 <body class="theme-light">
-    <div class="surface">
+    <div class="surface" style="height:max-content;">
         <div class="panel">
 
 <html>
@@ -27,12 +27,14 @@
     <script>
         microsoftTeams.initialize();
         function validateForm() {
+            fetch(`${window.location.origin}/getAppConfig`).then(response => response.json()).then(data => {
             var customerInfo = {
                 name: document.forms["customerForm"]["name"].value,
                 email: document.forms["customerForm"]["email"].value,
                 favoriteBook: document.forms["customerForm"]["favoriteBook"].value
             }
-            microsoftTeams.tasks.submitTask(customerInfo, "<<YOUR-MICROSOFT-APP-ID>>");
+            microsoftTeams.tasks.submitTask(customerInfo, data.MicrosoftAppId);
+        });
             return true;
         }
     </script>

diff --git a/samples/bot-task-module/nodejs/pages/TaskModuleTab.js b/samples/bot-task-module/nodejs/pages/TaskModuleTab.js
@@ -1,15 +1,15 @@
 //- Copyright (c) Microsoft Corporation.
 //- All rights reserved.
-
 // microsoftTeams app Initilize
-microsoftTeams.app.initialize().then(() => {
+ microsoftTeams.app.initialize().then(() => {
     var taskModuleButtons = document.getElementsByClassName("taskModuleButton");
     if (taskModuleButtons.length > 0) {
+        fetch(`${window.location.origin}/getAppConfig`).then(response => response.json()).then(data => {
 
         //config your appid and baseurl
         var config = {
-            MicrosoftAppID: "<<Microsoft-App-ID>>",
-            BaseUrl: "<<BaseUrl>>"
+            MicrosoftAppID: data.MicrosoftAppId,
+            BaseUrl: `${window.location.origin}`
         }
 
         var taskInfo_1 = {
@@ -221,7 +221,7 @@ microsoftTeams.app.initialize().then(() => {
                         };
 
                         //Allows app to open a url based dialog.
-                        microsoftTeams.dialog.open(taskInfo_1, submitHandler);
+                        microsoftTeams.tasks.startTask(taskInfo_1, submitHandler);
                         break;
 
                     case TaskModuleIds.AdaptiveCard1:
@@ -249,5 +249,6 @@ microsoftTeams.app.initialize().then(() => {
                 console.log("URL: " + taskInfo_1.url);
             });
         }
+    });
     }
-});
+});
diff --git a/samples/bot-task-module/nodejs/pages/taskmodule.html b/samples/bot-task-module/nodejs/pages/taskmodule.html
@@ -34,7 +34,7 @@
             <button class="taskModuleButton button-primary" id="adaptivecard1">Adaptive Card (results &rarr; tab)</button>
             <p></p>
             <p></p>
-            <div><a id="deeplink" target="_blank" )>Deep Link</a></div>
+            <div><a id="deeplink" target="_blank" >Deep Link</a></div>
         </div>
     </p>