@microsoft/teamsfx-core 2.0.6 → 2.0.7-alpha.07c4fbf2b.0

package/resource/package.nls.json

@@ -33,8 +33,8 @@
   "core.migrationV3.manifestNotExist": "templates/appPackage/manifest.template.json does not exist. You may be trying to upgrade a project created by Teams Toolkit for Visual Studio Code v3.x / Teams Toolkit CLI v0.x / Teams Toolkit for Visual Studio v17.3. Please install Teams Toolkit for Visual Studio Code v4.x / Teams Toolkit CLI v1.x / Teams Toolkit for Visual Studio v17.4 and run upgrade first.",
   "core.migrationV3.manifestInvalid": "templates/appPackage/manifest.template.json is invalid.",
   "core.migrationV3.abandonedProject": "This project is only for previewing and will not be supported by Teams Toolkit. Please try Teams Toolkit by creating a new project",
-  "core.migrationV3.notAllowedMigration": "Teams Toolkit's Pre-Release version supports new project configuration and is incompatible with previous versions. Try it by creating a new project or run \"teamsfx upgrade\" to upgrade your project first.",
-  "core.projectVersionChecker.cliUseNewVersion": "Your TeamFx CLI version is old and it doesn't support current project, please upgrade to the latest version using command below:\nnpm install -g @microsoft/teamsfx-cli@latest",
+  "core.migrationV3.notAllowedMigration": "Teams Toolkit's Pre-Release version supports new project configuration and is incompatible with previous versions. Try it by creating a new project or run \"teamsapp upgrade\" to upgrade your project first.",
+  "core.projectVersionChecker.cliUseNewVersion": "Your TeamFx CLI version is old and it doesn't support current project, please upgrade to the latest version using command below:\nnpm install -g @microsoft/teamsapp-cli@latest",
   "core.projectVersionChecker.incompatibleProject": "The current project is incompatible with the installed version of Teams Toolkit.",
   "core.projectVersionChecker.vs.incompatibleProject": "The project in the solution is created with Teams Toolkit preview feature - Teams App Configuration Improvements. You can turn on the preview feature to continue.",
   "core.deployArmTemplates.ActionSuccess": "Successfully deployed ARM templates. Resource group name: %s. Deployment name: %s",
@@ -97,7 +97,7 @@
   "plugins.spfx.scaffold.scaffoldProject": "Generate SPFx project using Yeoman CLI",
   "plugins.spfx.scaffold.updateManifest": "Update webpart manifest",
   "plugins.spfx.GetTenantFailedError": "Cannot get tenant %s %s",
-  "plugins.spfx.error.installLatestDependencyError": "Encountered unknown issues when setting up SPFx environment in %s folder. You could follow [Set up your SharePoint Framework development environment | Microsoft Learn](%s) to set up global SPFx environment.",
+  "plugins.spfx.error.installLatestDependencyError": "Encountered unknown issues when setting up SPFx environment in %s folder. Follow [Set up your SharePoint Framework development environment | Microsoft Learn](%s) to set up global SPFx environment.",
   "_plugins.spfx.error.installLatestDependencyError.comment": "'Microsoft Learn' and 'SharePoint' are the product brand names which should not be localized.",
   "plugins.spfx.error.scaffoldError": "Project creation failed. A possible reason could be from Yeoman SharePoint Generator. Check [Output panel](%s) for details.",
   "plugins.spfx.error.import.retrieveSolutionInfo": "Failed to retrieve existing SPFx solution information. Please make sure your SPFx solution is valid.",
@@ -111,6 +111,17 @@
   "plugins.spfx.import.success": "Your SPFx solution has been successfully imported to %s.",
   "plugins.spfx.import.log.success": "Teams Toolkit has imported your SPFx solution successfully. A complete log of import details can be found in %s.",
   "plugins.spfx.import.log.fail": "Teams Toolkit failed to import your SPFx solution. A complete log of import details can be found in %s.",
+  "plugins.spfx.addWebPart.confirmInstall": "SPFx version in your solution is %s, not yet installed on your machine. Do you want to install SPFx %s in Teams Toolkit directory to continue adding web part?",
+  "plugins.spfx.addWebPart.install": "Install",
+  "plugins.spfx.addWebPart.confirmUpgrade": "Teams Toolkit is using SPFx version %s, but SPFx version in your solution is %s. Do you want to upgrade SPFx version in Teams Toolkit directory to %s and add web part?",
+  "plugins.spfx.addWebPart.upgrade": "Upgrade",
+  "plugins.spfx.addWebPart.versionMismatch.continueConfirm": "SPFx version in your solution is %s, not yet installed on this machine. Teams Toolkit uses SPFx installed in Teams Toolkit directory by default (%s). The version mismatch may cause unexpected error. Do you want to continue?",
+  "plugins.spfx.addWebPart.versionMismatch.help": "Help",
+  "plugins.spfx.addWebPart.versionMismatch.continue": "Continue",
+  "plugins.spfx.addWebPart.versionMismatch.output": "SPFx version in your solution is %s. You have %s installed globally and %s installed in Teams Toolkit directory. Teams Toolkit uses SPFx installed in Teams Toolkit directory by default (%s). The version mismatch may cause unexpected error. Find possible solutions in %s.",
+  "plugins.spfx.addWebPart.versionMismatch.localOnly.output": "SPFx version in your solution is %s. You have %s installed in Teams Toolkit directory. Teams Toolkit uses SPFx installed in Teams Toolkit directory by default (%s). The version mismatch may cause unexpected error. Find possible solutions in %s.",
+  "plugins.spfx.addWebPart.cannotFindSolutionVersion": "Unable to find SPFx version in your solution in %s",
+  "plugins.spfx.error.installDependencyError": "Encountered unknown issues when setting up SPFx environment in %s folder. Follow %s to install %s to set up global SPFx environment.",
   "plugins.frontend.checkNetworkTip": "Check your network connection.",
   "plugins.frontend.checkFsPermissionsTip": "Check if you have Read/Write permissions to your file system.",
   "plugins.frontend.checkStoragePermissionsTip": "Check if you have permissions to your Azure Storage Account.",
@@ -199,18 +210,18 @@
   "error.generator.TemplateZipFallbackError": "Unable to download zip package and open local zip package.",
   "error.generator.TemplateNotFoundError": "Unable to find template: %s.",
   "error.generator.SampleNotFoundError": "Unable to find sample: %s.",
-  "error.generator.FetchZipFromUrlError": "Unable to download zip package from %s.",
   "error.generator.UnzipError": "Unable to unzip templates and write to disk.",
   "error.generator.MissKeyError": "Unable to find key %s",
+  "error.generator.FetchSampleInfoError": "Unable to fetch sample info",
   "error.generator.DownloadSampleApiLimitError": "Unable to download sample due to throttling. Retry later after rate limit reset (This may take up to 1 hour). Alternatively, you can go to %s to git clone the repo manually",
   "error.generator.DownloadSampleNetworkError": "Unable to download sample due to network error. Check your network connection and retry. Alternatively, you can go to %s to git clone the repo manually",
-  "error.generator.ParseUrlError": "Unable to parse url %s",
   "error.copilotPlugin.openAiPluginManifest.CannotGetManifest": "Unable to get OpenAI plugin manifest from '%s'.",
   "error.copilotPlugin.noExtraAPICanBeAdded": "No API can be added. Only GET and POST methods with at most one required parameter and no auth are supported. Methods defined in manifest.json are not listed.",
   "error.m365.NotExtendedToM365Error": "Unable to extend Teams app to Microsoft 365. Use 'teamsApp/extendToM365' action to extend your Teams app to Microsoft 365.",
   "core.QuestionAppName.validation.pattern": "Application name must start with letters and contain at least two letters or digits. It can not contain some special characters.",
   "core.QuestionAppName.validation.maxlength": "Application name is longer than the maximum length of 30.",
   "core.QuestionAppName.validation.pathExist": "Path exists: %s. Select a different application name.",
+  "core.QuestionAppName.validation.lengthWarning": "Your application name may exceed the maximum length of 30 characters because Teams Toolkit will automatically append a \"local\" suffix for the Teams application registered for local debugging purposes. You may continue, but make sure to update your application name in the \"manifest.json\" file.",
   "core.ProgrammingLanguageQuestion.placeholder": "Select a programming language.",
   "core.ProgrammingLanguageQuestion.placeholder.spfx": "SPFx is currently supporting TypeScript only.",
   "core.option.tutorial": "Open tutorial",
@@ -293,7 +304,8 @@
   "core.createProjectQuestion.apiSpecInputUrl.label": "Enter OpenAPI Description Document Location",
   "core.createProjectQuestion.OpenAIPluginDomain": "OpenAI Plugin Manifest",
   "core.createProjectQuestion.OpenAIPluginDomain.placeholder": "Enter your website domain or manifest URL",
-  "core.createaProjectQuestion.ApiKey": "Client secret for API key in OpenAPI specification",
+  "core.createProjectQuestion.ApiKey": "Enter API Key in OpenAPI Description Document",
+  "core.createProjectQuestion.ApiKeyConfirm": "Teams Toolkit will upload the API key to Teams Developer Portal. The API key will be used by Teams client to securely access your API in runtime when API-Based Message Extension is triggered. Teams Toolkit will not store your API key.",
   "core.createProjectQuestion.invalidApiKey.message": "Client secret is invalid. The length of secret should be >= 10 and <= 128",
   "core.createProjectQuestion.invalidUrl.message": "Enter a valid HTTP URL without authentication to access your OpenAPI description document.",
   "core.createProjectQuestion.apiSpec.operation.title": "Select Operation(s) Teams Can Interact with",
@@ -405,7 +417,7 @@
   "core.common.NoServerInformation":  "No server information is found in the OpenAPI description document.",
   "core.common.RemoteRefNotSupported": "Remote reference is not supported: %s.",
   "core.common.MissingOperationId": "Missing operationIds: %s.",
-  "core.common.NoSupportedApi": "No supported API is found in the OpenAPI description document: only GET and POST methods are supported, additionally, there can be at most one required parameter, and no auth is allowed.",
+  "core.common.NoSupportedApi": "No supported API is found in the OpenAPI description document: only GET and POST methods are supported, additionally, there can be at most one required parameter, and no auth is allowed. \nFor more information visit: \"https://aka.ms/build-api-based-message-extension\".",
   "core.common.UrlProtocolNotSupported": "Server url is not correct: protocol %s is not supported, you should use https protocol instead.",
   "core.common.RelativeServerUrlNotSupported": "Server url is not correct: relative server url is not supported.",
   "core.common.ErrorFetchApiSpec": "Your OpenAPI description document should be accessible without authentication, otherwise download and start from a local copy.",
@@ -433,11 +445,14 @@
   "error.aad.manifest.RequiredResourceAccessIsMissing": "requiredResourceAccess is missing\n",
   "error.aad.manifest.Oauth2PermissionsIsMissing": "oauth2Permissions is missing\n",
   "error.aad.manifest.PreAuthorizedApplicationsIsMissing": "preAuthorizedApplications is missing\n",
+  "error.aad.manifest.ResourceAppIdIsMissing": "Some item(s) in requiredResourceAccess misses resourceAppId property.",
+  "error.aad.manifest.ResourceAccessIdIsMissing": "Some item(s) in resourceAccess misses id property.",
   "error.aad.manifest.AccessTokenAcceptedVersionIs1": "accessTokenAcceptedVersion is 1\n",
   "error.aad.manifest.OptionalClaimsIsMissing": "optionalClaims is missing\n",
   "error.aad.manifest.OptionalClaimsMissingIdtypClaim": "optionalClaims access token doesn't contain idtyp claim\n",
   "error.aad.manifest.AADManifestIssues": "Microsoft Entra manifest has following issues that may potentially break the Teams App:\n",
   "error.aad.manifest.DeleteOrUpdatePermissionFailed": "Unable to update or delete an existing permission when it's enabled. One possible reason is that the ACCESS_AS_USER_PERMISSION_ID environment variable is changed for selected environment. Ensure your permission id(s) are identical with the actual Microsoft Entra application and try again.\n",
+  "error.aad.manifest.HostNameNotOnVerifiedDomain": "Unable to set identifierUri because the value is not on verified domain: %s",
   "error.aad.manifest.UnknownResourceAppId": "Unknown resourceAppId %s",
   "error.aad.manifest.UnknownResourceAccessType": "Unknown resourceAccess: %s",
   "error.aad.manifest.UnknownResourceAccessId": "Unknown resourceAccess id: %s, if you're using permission as resourceAccess id, please try to use permission id instead.",
@@ -562,9 +577,11 @@
   "driver.deploy.azureFunctionsDeployDetailSummary": "Successfully deployed `%s` to Azure Functions.",
   "driver.deploy.azureStorageDeployDetailSummary": "Successfully deployed `%s` to Azure Storage.",
   "driver.deploy.enableStaticWebsiteSummary": "Azure Storage enable static website successfully.",
+  "driver.deploy.getSWADeploymentTokenSummary": "Successfully get the deployment token for Azure Static Web Apps.",
   "driver.deploy.deployToAzureAppServiceDescription": "deploy the project to the Azure App Service.",
   "driver.deploy.deployToAzureFunctionsDescription": "deploy the project to the Azure Functions.",
   "driver.deploy.deployToAzureStorageDescription": "deploy the project to the Azure Storage.",
+  "driver.deploy.getSWADeploymentToken": "Get the deployment token from Azure Static Web Apps.",
   "driver.deploy.enableStaticWebsiteInAzureStorageDescription": "enable static website setting in Azure Storage.",
   "driver.common.suggestion.retryLater": "Please try again.",
   "driver.common.FailRetrieveAzureCredentialsRemoteError": "Unable to retrieve Azure credentials due to remote service error.",
@@ -623,6 +640,7 @@
   "error.yaml.LifeCycleUndefinedError": "Lifecycle '%s' is undefined, yaml file: %s",
   "error.yaml.InvalidActionInputError": "The '%s' action cannot be completed as the following parameter(s): %s, are either missing or have an invalid value in the provided yaml file: %s. Ensure that the required parameters are provided and have valid values and try again.",
   "error.common.InstallSoftwareError": "Unable to install %s. You can install it manually and restart Visual Studio Code if you are using the Toolkit in Visual Studio Code.",
+  "error.common.VersionError": "Unable to find a version satisfying the version range %s.",
   "error.common.MissingEnvironmentVariablesError": "The program cannot proceed as the following environment variables are missing: '%s', which are required for file: %s. Make sure the required variables are set either by editing the .env file '%s' with the correct names and values , or by setting the system environment variables with the correct names and values. If you are developing with a new project created with Teams Toolkit, running provision or debug will register correct values for these environment variables.",
   "error.common.InvalidProjectError": "This command only works for project created by Teams Toolkit.",
   "error.common.FileNotFoundError": "The file or directory is not found: '%s'. Check if it exists and you have permission to access it.",
@@ -663,6 +681,8 @@
   "error.arm.ConvertArmOutputError": "Unable to convert ARM deployment result to action output, there is a duplicated key '%s' in ARM deployment result.",
   "error.deploy.DeployEmptyFolderError": "Unable to locate any files in the distribution folder: '%s'. Please ensure that the folder is not empty and that all necessary files have been included.",
   "error.deploy.CheckDeploymentStatusTimeoutError": "Unable to check deployment status because the process timed out. Check your internet connection and try again. If the issue persists, please review the deployment logs (Deployment -> Deployment center -> Logs) in Azure portal to identify any issues that may have occurred.",
+  "error.deploy.ZipFileError": "Failed to zip the artifact folder. The folder size exceeds the maximum limit of 2GB. Please reduce the size of the folder and try again.",
+  "error.deploy.ZipFileTargetInUse": "Failed to clear the distribution zip file in %s. The file may be currently in use. Please close any applications using the file and try again.",
   "error.deploy.GetPublishingCredentialsError.Notification": "Unable to obtain publishing credentials of app '%s' in resource group '%s'. Refer to the [Output panel](command:fx-extension.showOutputChannel) for more details.",
   "error.deploy.GetPublishingCredentialsError": "Unable to obtain publishing credentials of app '%s' in resource group '%s' for reason:\n %s.\n Suggestions:\n 1. Verify that the app name and resource group name are spelled correctly and are valid. \n 2. Verify that your Azure account has the necessary permissions to access the API. You may need to elevate your role or request additional permissions from an administrator. \n 3. If the error message includes a specific reason, such as an authentication failure or a network issue, investigate that issue specifically to resolve the error and try again. \n 4. You can test the API in this page: '%s'",
   "error.deploy.DeployZipPackageError.Notification": "Unable to deploy zip package to endpoint: '%s'. Refer to the [Output panel](command:fx-extension.showOutputChannel) for more details and try again.",

package/resource/yaml-schema/v1.3/yaml.schema.json

@@ -10,7 +10,7 @@
     "environmentFolderPath": {
       "type": "string",
       "description": "The folder path of .env files used for variables and different envrironments."
-    },
+      },
     "version": {
       "type": "string",
       "description": "The version of the yaml file schema",
@@ -71,7 +71,8 @@
           { "$ref": "#/definitions/spfxDeploy" },
           { "$ref": "#/definitions/teamsAppCopyAppPackageToSPFx" },
           { "$ref": "#/definitions/script" },
-          { "$ref": "#/definitions/apiKeyRegister"}
+          { "$ref": "#/definitions/apiKeyRegister"},
+          { "$ref": "#/definitions/azureStaticWebAppGetDeploymentKey"}
         ]
       }
     },
@@ -1434,12 +1435,11 @@
             },
             "workingDirectory": {
               "type": "string",
-              "description": "current working directory. Defaults to the directory of this file."
+              "description": "Current working directory. Defaults to the directory of this file."
             },
             "shell": {
               "type": "string",
-              "enum": ["bash", "sh", "powershell", "pwsh", "cmd"],
-              "description": "The shell type. Can be omitted. If omitted, it defaults to bash on Linux/MacOS, defaults to pwsh on windows."
+              "description": "Shell command. If not specified, use default shell for current platform. The rule is: 1) use the value of the 'SHELL' environment variable if it is set. Otherwise the shell depends on operation system: 2) on macOS, use '/bin/zsh' if it exists, otherwise use '/bin/bash'; 3) On Windows, use the value of the 'ComSpec' environment variable if it exists, otherwise use 'cmd.exe'; 4) On Linux or other OS, use '/bin/sh' if it extis."
             },
             "timeout": {
               "type": "number",
@@ -1542,6 +1542,43 @@
           }
         }
       }
+    },
+    "azureStaticWebAppGetDeploymentKey": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Get deployment key from Azure Static Web App.",
+      "required": ["uses", "with", "writeToEnvironmentFile"],
+      "properties": {
+        "uses": {
+          "type": "string",
+          "description": "Get deployment key. Refer to https://aka.ms/teamsfx-actions/swa-get-deployment-key for more details.",
+          "const": "azureStaticWebApps/getDeploymentToken"
+        },
+        "with": {
+          "type": "object",
+          "additionalProperties": false,
+          "description": "Parameters for this action",
+          "required": ["resourceId"],
+          "properties": {
+            "resourceId": {
+              "type": "string",
+              "description": "The resource ID of Azure Static Web App."
+            }
+          }
+        },
+        "writeToEnvironmentFile": {
+          "type": "object",
+          "additionalProperties": false,
+          "description": "Write environment variables to environment file",
+          "required": ["deploymentToken"],
+          "properties": {
+            "deploymentToken": {
+              "description": "Required. The deployment token of Azure Static Web App.",
+              "$ref": "#/definitions/envVarName"
+            }
+          }
+        }
+      }
     }
   }
 }

package/templates/plugins/resource/aad/auth/V3/Bot/Pages/BotAuthorizeEndPage.cshtml

@@ -1,61 +1,65 @@
 @page "/bot-auth-end.html"
 
 <html>
+
 <head>
-    <title>Login End Page</title>
-    <meta charset="utf-8" />
+  <title>Login End Page</title>
+  <meta charset="utf-8" />
 </head>
 
 <body>
-    <script src="https://res.cdn.office.net/teams-js/2.7.1/js/MicrosoftTeams.min.js" integrity="sha384-4Gy2G+qxzDVdrdemcVqKVQvaSK1Ghg3x6xcsaMLPc/pw7KPtiogHGM97LTWF2PWg" crossorigin="anonymous"></script>
-    <div id="divError"></div>
-    <script type="text/javascript">
-        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);
-            } else {
-              microsoftTeams.authentication.notifySuccess();
-            }
-          } else {
-            // Unexpected condition: hash does not contain error or access_token parameter
-            handleAuthError("UnexpectedFailure", hashParams);
-          }
-        });
-        
-        // Parse hash parameters into key-value pairs
-        function getHashParameters() {
-          let hashParams = {};
-          location.hash
-            .substr(1)
-            .split("&")
-            .forEach(function (item) {
-              let s = item.split("="),
-                k = s[0],
-                v = s[1] && decodeURIComponent(s[1]);
-              hashParams[k] = v;
-            });
-          return hashParams;
-        }
-        // Show error information
-        function handleAuthError(errorType, errorMessage) {
-          const err = JSON.stringify({
-            error: errorType,
-            message: JSON.stringify(errorMessage),
-          });
-          let para = document.createElement("p");
-          let node = document.createTextNode(err);
-          para.appendChild(node);
-          let element = document.getElementById("divError");
-          element.appendChild(para);
+  <script src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
+    integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+    crossorigin="anonymous"></script>
+  <div id="divError"></div>
+  <script type="text/javascript">
+    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);
+        } else {
+          microsoftTeams.authentication.notifySuccess();
         }
-    </script>
+      } else {
+        // Unexpected condition: hash does not contain error or access_token parameter
+        handleAuthError("UnexpectedFailure", hashParams);
+      }
+    });
+
+    // Parse hash parameters into key-value pairs
+    function getHashParameters() {
+      let hashParams = {};
+      location.hash
+        .substr(1)
+        .split("&")
+        .forEach(function (item) {
+          let s = item.split("="),
+            k = s[0],
+            v = s[1] && decodeURIComponent(s[1]);
+          hashParams[k] = v;
+        });
+      return hashParams;
+    }
+    // Show error information
+    function handleAuthError(errorType, errorMessage) {
+      const err = JSON.stringify({
+        error: errorType,
+        message: JSON.stringify(errorMessage),
+      });
+      let para = document.createElement("p");
+      let node = document.createTextNode(err);
+      para.appendChild(node);
+      let element = document.getElementById("divError");
+      element.appendChild(para);
+    }
+  </script>
 </body>
+
 </html>

package/templates/plugins/resource/aad/auth/bot/csharp/Pages/BotAuthorizeEndPage.cshtml

@@ -1,61 +1,65 @@
 @page "/bot-auth-end.html"
 
 <html>
+
 <head>
-    <title>Login End Page</title>
-    <meta charset="utf-8" />
+  <title>Login End Page</title>
+  <meta charset="utf-8" />
 </head>
 
 <body>
-    <script src="https://res.cdn.office.net/teams-js/2.7.1/js/MicrosoftTeams.min.js" integrity="sha384-4Gy2G+qxzDVdrdemcVqKVQvaSK1Ghg3x6xcsaMLPc/pw7KPtiogHGM97LTWF2PWg" crossorigin="anonymous"></script>
-    <div id="divError"></div>
-    <script type="text/javascript">
-        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);
-            } else {
-              microsoftTeams.authentication.notifySuccess();
-            }
-          } else {
-            // Unexpected condition: hash does not contain error or access_token parameter
-            handleAuthError("UnexpectedFailure", hashParams);
-          }
-        });
-        
-        // Parse hash parameters into key-value pairs
-        function getHashParameters() {
-          let hashParams = {};
-          location.hash
-            .substr(1)
-            .split("&")
-            .forEach(function (item) {
-              let s = item.split("="),
-                k = s[0],
-                v = s[1] && decodeURIComponent(s[1]);
-              hashParams[k] = v;
-            });
-          return hashParams;
-        }
-        // Show error information
-        function handleAuthError(errorType, errorMessage) {
-          const err = JSON.stringify({
-            error: errorType,
-            message: JSON.stringify(errorMessage),
-          });
-          let para = document.createElement("p");
-          let node = document.createTextNode(err);
-          para.appendChild(node);
-          let element = document.getElementById("divError");
-          element.appendChild(para);
+  <script src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
+    integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+    crossorigin="anonymous"></script>
+  <div id="divError"></div>
+  <script type="text/javascript">
+    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);
+        } else {
+          microsoftTeams.authentication.notifySuccess();
         }
-    </script>
+      } else {
+        // Unexpected condition: hash does not contain error or access_token parameter
+        handleAuthError("UnexpectedFailure", hashParams);
+      }
+    });
+
+    // Parse hash parameters into key-value pairs
+    function getHashParameters() {
+      let hashParams = {};
+      location.hash
+        .substr(1)
+        .split("&")
+        .forEach(function (item) {
+          let s = item.split("="),
+            k = s[0],
+            v = s[1] && decodeURIComponent(s[1]);
+          hashParams[k] = v;
+        });
+      return hashParams;
+    }
+    // Show error information
+    function handleAuthError(errorType, errorMessage) {
+      const err = JSON.stringify({
+        error: errorType,
+        message: JSON.stringify(errorMessage),
+      });
+      let para = document.createElement("p");
+      let node = document.createTextNode(err);
+      para.appendChild(node);
+      let element = document.getElementById("divError");
+      element.appendChild(para);
+    }
+  </script>
 </body>
+
 </html>

package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html

@@ -8,7 +8,11 @@
   </head>
 
   <body>
-    <script src="https://res.cdn.office.net/teams-js/2.7.1/js/MicrosoftTeams.min.js" integrity="sha384-4Gy2G+qxzDVdrdemcVqKVQvaSK1Ghg3x6xcsaMLPc/pw7KPtiogHGM97LTWF2PWg" crossorigin="anonymous"></script>
+    <script
+      src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+      crossorigin="anonymous"
+    ></script>
     <div id="divError"></div>
     <script type="text/javascript">
       microsoftTeams.app.initialize().then(() => {
@@ -31,7 +35,7 @@
           handleAuthError("UnexpectedFailure", hashParams);
         }
       });
-      
+
       // Parse hash parameters into key-value pairs
       function getHashParameters() {
         let hashParams = new Map();

package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html

@@ -8,7 +8,11 @@
   </head>
 
   <body>
-    <script src="https://res.cdn.office.net/teams-js/2.7.1/js/MicrosoftTeams.min.js" integrity="sha384-4Gy2G+qxzDVdrdemcVqKVQvaSK1Ghg3x6xcsaMLPc/pw7KPtiogHGM97LTWF2PWg" crossorigin="anonymous"></script>
+    <script
+      src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+      crossorigin="anonymous"
+    ></script>
     <div id="divError"></div>
     <script type="text/javascript">
       microsoftTeams.app.initialize().then(() => {

package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html

@@ -7,13 +7,17 @@
   </head>
 
   <body>
-  <script src="https://res.cdn.office.net/teams-js/2.7.1/js/MicrosoftTeams.min.js" integrity="sha384-4Gy2G+qxzDVdrdemcVqKVQvaSK1Ghg3x6xcsaMLPc/pw7KPtiogHGM97LTWF2PWg" crossorigin="anonymous"></script>
+    <script
+      src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+      crossorigin="anonymous"
+    ></script>
     <script
       type="text/javascript"
       src="https://alcdn.msauth.net/browser/2.21.0/js/msal-browser.min.js"
       integrity="sha384-s/NxjjAgw1QgpDhOlVjTceLl4axrp5nqpUbCPOEQy1PqbFit9On6uw2XmEF1eq0s"
-      crossorigin="anonymous">
-    </script>
+      crossorigin="anonymous"
+    ></script>
     <script type="text/javascript">
       var currentURL = new URL(window.location);
       var clientId = currentURL.searchParams.get("clientId");
@@ -24,20 +28,23 @@
             auth: {
               clientId: clientId,
               authority: `https://login.microsoftonline.com/${context.user.tenant.id}`,
-              navigateToLoginRequestUrl: false
+              navigateToLoginRequestUrl: false,
             },
             cache: {
               cacheLocation: "sessionStorage",
             },
-          }
+          };
 
           const msalInstance = new window.msal.PublicClientApplication(msalConfig);
-          msalInstance.handleRedirectPromise()
+          msalInstance
+            .handleRedirectPromise()
             .then((tokenResponse) => {
               if (tokenResponse !== null) {
-                microsoftTeams.authentication.notifySuccess(JSON.stringify({
-                  sessionStorage: sessionStorage
-                }));
+                microsoftTeams.authentication.notifySuccess(
+                  JSON.stringify({
+                    sessionStorage: sessionStorage,
+                  })
+                );
               } else {
                 microsoftTeams.authentication.notifyFailure("Get empty response.");
               }

package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html

@@ -7,13 +7,17 @@
   </head>
 
   <body>
-  <script src="https://res.cdn.office.net/teams-js/2.7.1/js/MicrosoftTeams.min.js" integrity="sha384-4Gy2G+qxzDVdrdemcVqKVQvaSK1Ghg3x6xcsaMLPc/pw7KPtiogHGM97LTWF2PWg" crossorigin="anonymous"></script>
+    <script
+      src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+      crossorigin="anonymous"
+    ></script>
     <script
       type="text/javascript"
       src="https://alcdn.msauth.net/browser/2.21.0/js/msal-browser.min.js"
       integrity="sha384-s/NxjjAgw1QgpDhOlVjTceLl4axrp5nqpUbCPOEQy1PqbFit9On6uw2XmEF1eq0s"
-      crossorigin="anonymous">
-    </script>
+      crossorigin="anonymous"
+    ></script>
     <script type="text/javascript">
       microsoftTeams.app.initialize().then(() => {
         microsoftTeams.app.getContext().then(async (context) => {
@@ -27,23 +31,23 @@
             auth: {
               clientId: clientId,
               authority: `https://login.microsoftonline.com/${context.user.tenant.id}`,
-              navigateToLoginRequestUrl: false
+              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
+            loginHint: loginHint,
           };
           await msalInstance.loginRedirect(scopesRequest);
         });
       });
-      </script>
+    </script>
   </body>
 </html>