Merge pull request #1276 from OfficeDev/dev

build: preview release 20240517
OfficeDev · May 17, 2024 · b83537c · b83537c
2 parents abc25fa + 93bec57
commit b83537c
Show file tree

Hide file tree

Showing 17 changed files with 167 additions and 162 deletions.
diff --git a/bot-sso-docker/public/auth-end.html b/bot-sso-docker/public/auth-end.html
@@ -6,31 +6,32 @@
 
   <body>
     <script
-      src="https://statics.teams.cdn.office.net/sdk/v1.6.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-mhp2E+BLMiZLe7rDIzj19WjgXJeI32NkPvrvvZBrMi5IvWup/1NUfS5xuYN5S3VT"
+      src="https://res.cdn.office.net/teams-js/2.22.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-WSG/sWulIv7rel5TnFlH8JTpxl2OxzZh9Lux2mIzBFiTRLFvMBeFv9VURu/3vQdx"
       crossorigin="anonymous"
     ></script>
     <div id="divError"></div>
     <script type="text/javascript">
-      microsoftTeams.initialize();
-      let hashParams = getHashParameters();
+      microsoftTeams.app.initialize().then(() => {
+        let hashParams = getHashParameters();
 
-      if (hashParams["error"]) {
-        // Authentication failed
-        handleAuthError(hashParams["error"], hashParams);
-      } else if (hashParams["code"]) {
-        // Get the stored state parameter and compare with incoming state
-        let expectedState = localStorage.getItem("state");
-        if (expectedState !== hashParams["state"]) {
-          // State does not match, report error
-          handleAuthError("StateDoesNotMatch", hashParams);
+        if (hashParams["error"]) {
+          // Authentication failed
+          handleAuthError(hashParams["error"], hashParams);
+        } else if (hashParams["code"]) {
+          // Get the stored state parameter and compare with incoming state
+          let expectedState = localStorage.getItem("state");
+          if (expectedState !== hashParams["state"]) {
+            // State does not match, report error
+            handleAuthError("StateDoesNotMatch", hashParams);
+          } else {
+            microsoftTeams.authentication.notifySuccess();
+          }
         } else {
-          microsoftTeams.authentication.notifySuccess();
+          // Unexpected condition: hash does not contain error or access_token parameter
+          handleAuthError("UnexpectedFailure", hashParams);
         }
-      } else {
-        // Unexpected condition: hash does not contain error or access_token parameter
-        handleAuthError("UnexpectedFailure", hashParams);
-      }
+      });
 
       // Parse hash parameters into key-value pairs
       function getHashParameters() {

diff --git a/bot-sso/public/auth-end.html b/bot-sso/public/auth-end.html
@@ -6,31 +6,32 @@
 
   <body>
     <script
-      src="https://statics.teams.cdn.office.net/sdk/v1.6.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-mhp2E+BLMiZLe7rDIzj19WjgXJeI32NkPvrvvZBrMi5IvWup/1NUfS5xuYN5S3VT"
+      src="https://res.cdn.office.net/teams-js/2.22.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-WSG/sWulIv7rel5TnFlH8JTpxl2OxzZh9Lux2mIzBFiTRLFvMBeFv9VURu/3vQdx"
       crossorigin="anonymous"
     ></script>
     <div id="divError"></div>
     <script type="text/javascript">
-      microsoftTeams.initialize();
-      let hashParams = getHashParameters();
+      microsoftTeams.app.initialize().then(() => {
+        let hashParams = getHashParameters();
 
-      if (hashParams["error"]) {
-        // Authentication failed
-        handleAuthError(hashParams["error"], hashParams);
-      } else if (hashParams["code"]) {
-        // Get the stored state parameter and compare with incoming state
-        let expectedState = localStorage.getItem("state");
-        if (expectedState !== hashParams["state"]) {
-          // State does not match, report error
-          handleAuthError("StateDoesNotMatch", hashParams);
+        if (hashParams["error"]) {
+          // Authentication failed
+          handleAuthError(hashParams["error"], hashParams);
+        } else if (hashParams["code"]) {
+          // Get the stored state parameter and compare with incoming state
+          let expectedState = localStorage.getItem("state");
+          if (expectedState !== hashParams["state"]) {
+            // State does not match, report error
+            handleAuthError("StateDoesNotMatch", hashParams);
+          } else {
+            microsoftTeams.authentication.notifySuccess();
+          }
         } else {
-          microsoftTeams.authentication.notifySuccess();
+          // Unexpected condition: hash does not contain error or access_token parameter
+          handleAuthError("UnexpectedFailure", hashParams);
         }
-      } else {
-        // Unexpected condition: hash does not contain error or access_token parameter
-        handleAuthError("UnexpectedFailure", hashParams);
-      }
+      });
 
       // Parse hash parameters into key-value pairs
       function getHashParameters() {

diff --git a/command-bot-with-sso/src/public/auth-end.html b/command-bot-with-sso/src/public/auth-end.html
@@ -9,31 +9,32 @@
 
   <body>
     <script
-      src="https://statics.teams.cdn.office.net/sdk/v1.6.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-mhp2E+BLMiZLe7rDIzj19WjgXJeI32NkPvrvvZBrMi5IvWup/1NUfS5xuYN5S3VT"
+      src="https://res.cdn.office.net/teams-js/2.22.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-WSG/sWulIv7rel5TnFlH8JTpxl2OxzZh9Lux2mIzBFiTRLFvMBeFv9VURu/3vQdx"
       crossorigin="anonymous"
     ></script>
     <div id="divError"></div>
     <script type="text/javascript">
-      microsoftTeams.initialize();
-      let hashParams = getHashParameters();
+      microsoftTeams.app.initialize().then(() => {
+        let hashParams = getHashParameters();
 
-      if (hashParams.get("error")) {
-        // Authentication failed
-        handleAuthError(hashParams.get("error"), hashParams);
-      } else if (hashParams.get("code")) {
-        // Get the stored state parameter and compare with incoming state
-        let expectedState = localStorage.getItem("state");
-        if (expectedState !== hashParams.get("state")) {
-          // State does not match, report error
-          handleAuthError("StateDoesNotMatch", hashParams);
+        if (hashParams.get("error")) {
+          // Authentication failed
+          handleAuthError(hashParams.get("error"), hashParams);
+        } else if (hashParams.get("code")) {
+          // Get the stored state parameter and compare with incoming state
+          let expectedState = localStorage.getItem("state");
+          if (expectedState !== hashParams.get("state")) {
+            // State does not match, report error
+            handleAuthError("StateDoesNotMatch", hashParams);
+          } else {
+            microsoftTeams.authentication.notifySuccess();
+          }
         } else {
-          microsoftTeams.authentication.notifySuccess();
+          // Unexpected condition: hash does not contain error or access_token parameter
+          handleAuthError("UnexpectedFailure", hashParams);
         }
-      } else {
-        // Unexpected condition: hash does not contain error or access_token parameter
-        handleAuthError("UnexpectedFailure", hashParams);
-      }
+      });
 
       // Parse hash parameters into key-value pairs
       function getHashParameters() {

diff --git a/developer-assist-dashboard/api/package.json b/developer-assist-dashboard/api/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@azure/functions": "^4.2.0",
     "@microsoft/teamsfx": "^2.0.0",
-    "@microsoft/teams-js": "^2.7.1",
+    "@microsoft/teams-js": "^2.22.0",
     "@octokit/core": "^5",
     "isomorphic-fetch": "^3.0.0"
   },

diff --git a/developer-assist-dashboard/package.json b/developer-assist-dashboard/package.json
@@ -9,7 +9,7 @@
     "@fluentui/react-components": "^9.18.0",
     "@fluentui/react-icons": "^2.0.186",
     "@microsoft/microsoft-graph-client": "^3.0.5",
-    "@microsoft/teams-js": "^2.7.1",
+    "@microsoft/teams-js": "^2.22.0",
     "@microsoft/teamsfx": "2.3.0",
     "@microsoft/teamsfx-react": "3.1.0",
     "axios": "^1.3.6",

diff --git a/developer-assist-dashboard/public/auth-end.html b/developer-assist-dashboard/public/auth-end.html
@@ -8,8 +8,8 @@
 
   <body>
     <script
-      src="https://res.cdn.office.net/teams-js/2.0.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-QtTBFeFlfRDZBfwHJHYQp7MdLJ2C3sfAEB1Qpy+YblvjavBye+q87TELpTnvlXw4"
+      src="https://res.cdn.office.net/teams-js/2.22.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-WSG/sWulIv7rel5TnFlH8JTpxl2OxzZh9Lux2mIzBFiTRLFvMBeFv9VURu/3vQdx"
       crossorigin="anonymous"
     ></script>
     <script

diff --git a/developer-assist-dashboard/public/auth-start.html b/developer-assist-dashboard/public/auth-start.html
@@ -8,8 +8,8 @@
 
   <body>
     <script
-      src="https://res.cdn.office.net/teams-js/2.0.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-QtTBFeFlfRDZBfwHJHYQp7MdLJ2C3sfAEB1Qpy+YblvjavBye+q87TELpTnvlXw4"
+      src="https://res.cdn.office.net/teams-js/2.22.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-WSG/sWulIv7rel5TnFlH8JTpxl2OxzZh9Lux2mIzBFiTRLFvMBeFv9VURu/3vQdx"
       crossorigin="anonymous"
     ></script>
     <script

diff --git a/hello-world-bot-with-tab/tab/package.json b/hello-world-bot-with-tab/tab/package.json
@@ -7,7 +7,7 @@
   "private": true,
   "dependencies": {
     "@fluentui/react-components": "^9.18.0",
-    "@microsoft/teams-js": "^2.7.1",
+    "@microsoft/teams-js": "^2.22.0",
     "@microsoft/teamsfx": "^2.2.0",
     "@microsoft/teamsfx-react": "^3.0.0",
     "axios": "^1.6.7",

diff --git a/hello-world-tab-docker/package.json b/hello-world-tab-docker/package.json
@@ -7,7 +7,7 @@
   "private": true,
   "dependencies": {
     "@fluentui/react-components": "^9.18.0",
-    "@microsoft/teams-js": "^2.7.1",
+    "@microsoft/teams-js": "^2.22.0",
     "@microsoft/teamsfx": "^2.2.0",
     "@microsoft/teamsfx-react": "^3.0.0",
     "axios": "^0.21.1",

diff --git a/hello-world-tab-docker/public/auth-end.html b/hello-world-tab-docker/public/auth-end.html
@@ -8,8 +8,8 @@
 
   <body>
     <script
-    src="https://res.cdn.office.net/teams-js/2.0.0/js/MicrosoftTeams.min.js"
-    integrity="sha384-QtTBFeFlfRDZBfwHJHYQp7MdLJ2C3sfAEB1Qpy+YblvjavBye+q87TELpTnvlXw4"
+      src="https://res.cdn.office.net/teams-js/2.22.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-WSG/sWulIv7rel5TnFlH8JTpxl2OxzZh9Lux2mIzBFiTRLFvMBeFv9VURu/3vQdx"
       crossorigin="anonymous"
     ></script>
     <script

diff --git a/hello-world-tab-docker/public/auth-start.html b/hello-world-tab-docker/public/auth-start.html
@@ -8,8 +8,8 @@
 
   <body>
     <script
-    src="https://res.cdn.office.net/teams-js/2.0.0/js/MicrosoftTeams.min.js"
-    integrity="sha384-QtTBFeFlfRDZBfwHJHYQp7MdLJ2C3sfAEB1Qpy+YblvjavBye+q87TELpTnvlXw4"
+      src="https://res.cdn.office.net/teams-js/2.22.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-WSG/sWulIv7rel5TnFlH8JTpxl2OxzZh9Lux2mIzBFiTRLFvMBeFv9VURu/3vQdx"
       crossorigin="anonymous"
     ></script>
     <script

diff --git a/intelligent-data-chart-generator/package.json b/intelligent-data-chart-generator/package.json
@@ -9,7 +9,7 @@
     "@fluentui/react": "^8.114.2",
     "@fluentui/react-components": "^9.44.2",
     "@fluentui/react-icons": "^2.0.224",
-    "@microsoft/teams-js": "^2.18.0",
+    "@microsoft/teams-js": "^2.22.0",
     "@microsoft/teamsfx": "^2.3.0",
     "@microsoft/teamsfx-react": "^3.1.0",
     "axios": "^1.6.5",

diff --git a/intelligent-data-chart-generator/public/auth-end.html b/intelligent-data-chart-generator/public/auth-end.html
@@ -8,8 +8,8 @@
 
   <body>
     <script
-      src="https://statics.teams.cdn.office.net/sdk/v1.6.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-mhp2E+BLMiZLe7rDIzj19WjgXJeI32NkPvrvvZBrMi5IvWup/1NUfS5xuYN5S3VT"
+      src="https://res.cdn.office.net/teams-js/2.22.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-WSG/sWulIv7rel5TnFlH8JTpxl2OxzZh9Lux2mIzBFiTRLFvMBeFv9VURu/3vQdx"
       crossorigin="anonymous"
     ></script>
     <script
@@ -22,34 +22,35 @@
       var currentURL = new URL(window.location);
       var clientId = currentURL.searchParams.get("clientId");
 
-      microsoftTeams.initialize();
-      microsoftTeams.getContext(async function (context) {
-        const msalConfig = {
-          auth: {
-            clientId: clientId,
-            authority: `https://login.microsoftonline.com/${context.tid}`,
-            navigateToLoginRequestUrl: false
-          },
-          cache: {
-            cacheLocation: "sessionStorage",
-          },
-        }
+      microsoftTeams.app.initialize().then(() => {
+        microsoftTeams.getContext(async function (context) {
+          const msalConfig = {
+            auth: {
+              clientId: clientId,
+              authority: `https://login.microsoftonline.com/${context.tid}`,
+              navigateToLoginRequestUrl: false
+            },
+            cache: {
+              cacheLocation: "sessionStorage",
+            },
+          }
 
-        const msalInstance = new window.msal.PublicClientApplication(msalConfig);
-        msalInstance.handleRedirectPromise()
-          .then((tokenResponse) => {
-            if (tokenResponse !== null) {
-              microsoftTeams.authentication.notifySuccess(JSON.stringify({
-                sessionStorage: sessionStorage
-              }));
-            } else {
-              microsoftTeams.authentication.notifyFailure("Get empty response.");
-            }
-          })
-          .catch((error) => {
-            microsoftTeams.authentication.notifyFailure(JSON.stringify(error));
-          });
-      })
+          const msalInstance = new window.msal.PublicClientApplication(msalConfig);
+          msalInstance.handleRedirectPromise()
+            .then((tokenResponse) => {
+              if (tokenResponse !== null) {
+                microsoftTeams.authentication.notifySuccess(JSON.stringify({
+                  sessionStorage: sessionStorage
+                }));
+              } else {
+                microsoftTeams.authentication.notifyFailure("Get empty response.");
+              }
+            })
+            .catch((error) => {
+              microsoftTeams.authentication.notifyFailure(JSON.stringify(error));
+            });
+        })
+      });
     </script>
   </body>
 </html>
diff --git a/intelligent-data-chart-generator/public/auth-start.html b/intelligent-data-chart-generator/public/auth-start.html
@@ -8,8 +8,8 @@
 
   <body>
     <script
-      src="https://statics.teams.cdn.office.net/sdk/v1.6.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-mhp2E+BLMiZLe7rDIzj19WjgXJeI32NkPvrvvZBrMi5IvWup/1NUfS5xuYN5S3VT"
+      src="https://res.cdn.office.net/teams-js/2.22.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-WSG/sWulIv7rel5TnFlH8JTpxl2OxzZh9Lux2mIzBFiTRLFvMBeFv9VURu/3vQdx"
       crossorigin="anonymous"
     ></script>
     <script
@@ -19,36 +19,36 @@
       crossorigin="anonymous">
     </script>
     <script type="text/javascript">
-      microsoftTeams.initialize();
+      microsoftTeams.app.initialize().then(() => {
+        // Get the tab context, and use the information to navigate to Azure AD login page
+        microsoftTeams.getContext(async function (context) {
+          // Generate random state string and store it, so we can verify it in the callback
+          var currentURL = new URL(window.location);
+          var clientId = currentURL.searchParams.get("clientId");
+          var scope = currentURL.searchParams.get("scope");
+          var loginHint = currentURL.searchParams.get("loginHint");
 
-      // Get the tab context, and use the information to navigate to Azure AD login page
-      microsoftTeams.getContext(async function (context) {
-        // Generate random state string and store it, so we can verify it in the callback
-        var currentURL = new URL(window.location);
-        var clientId = currentURL.searchParams.get("clientId");
-        var scope = currentURL.searchParams.get("scope");
-        var loginHint = currentURL.searchParams.get("loginHint");
+          const msalConfig = {
+            auth: {
+              clientId: clientId,
+              authority: `https://login.microsoftonline.com/${context.tid}`,
+              navigateToLoginRequestUrl: false
+            },
+            cache: {
+              cacheLocation: "sessionStorage",
+            },
+          }
 
-        const msalConfig = {
-          auth: {
-            clientId: clientId,
-            authority: `https://login.microsoftonline.com/${context.tid}`,
-            navigateToLoginRequestUrl: false
-          },
-          cache: {
-            cacheLocation: "sessionStorage",
-          },
-        }
-
-        const msalInstance = new msal.PublicClientApplication(msalConfig);
-        const scopesArray = scope.split(" ");
-        const scopesRequest = {
-          scopes: scopesArray,
-          redirectUri: window.location.origin + `/auth-end.html?clientId=${clientId}`,
-          loginHint: loginHint,
-          prompt : "consent"
-        };
-        await msalInstance.loginRedirect(scopesRequest);
+          const msalInstance = new msal.PublicClientApplication(msalConfig);
+          const scopesArray = scope.split(" ");
+          const scopesRequest = {
+            scopes: scopesArray,
+            redirectUri: window.location.origin + `/auth-end.html?clientId=${clientId}`,
+            loginHint: loginHint,
+            prompt : "consent"
+          };
+          await msalInstance.loginRedirect(scopesRequest);
+        });
       });
     </script>
   </body>