@microsoft/teamsfx-core 2.0.6 → 2.0.7-alpha.a8fa2ab1d.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/constants.d.ts +1 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
- package/build/common/deps-checker/checkerFactory.js +3 -0
- package/build/common/deps-checker/checkerFactory.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +1 -0
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +1 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts +17 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts.map +1 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.js +47 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.js.map +1 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts +16 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts.map +1 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.js +53 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.js.map +1 -0
- package/build/common/deps-checker/depsChecker.d.ts +6 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js +6 -1
- package/build/common/deps-checker/depsChecker.js.map +1 -1
- package/build/common/deps-checker/index.d.ts +2 -0
- package/build/common/deps-checker/index.d.ts.map +1 -1
- package/build/common/deps-checker/index.js +2 -0
- package/build/common/deps-checker/index.js.map +1 -1
- package/build/common/deps-checker/internal/testToolChecker.d.ts +14 -3
- package/build/common/deps-checker/internal/testToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/testToolChecker.js +175 -73
- package/build/common/deps-checker/internal/testToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +3 -45
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/common/deps-checker/util/downloadHelper.d.ts +15 -0
- package/build/common/deps-checker/util/downloadHelper.d.ts.map +1 -0
- package/build/common/deps-checker/util/downloadHelper.js +59 -0
- package/build/common/deps-checker/util/downloadHelper.js.map +1 -0
- package/build/common/featureFlags.d.ts +1 -2
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +5 -9
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts +0 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +1 -29
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +16 -7
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectTypeChecker.d.ts +38 -0
- package/build/common/projectTypeChecker.d.ts.map +1 -0
- package/build/common/projectTypeChecker.js +217 -0
- package/build/common/projectTypeChecker.js.map +1 -0
- package/build/common/samples.d.ts +6 -4
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +64 -29
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +14 -1
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +2 -2
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +33 -19
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specFilter.d.ts +1 -1
- package/build/common/spec-parser/specFilter.d.ts.map +1 -1
- package/build/common/spec-parser/specFilter.js +2 -2
- package/build/common/spec-parser/specFilter.js.map +1 -1
- package/build/common/spec-parser/specParser.browser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.browser.js +5 -3
- package/build/common/spec-parser/specParser.browser.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +36 -37
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +12 -8
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +97 -34
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/common/telemetry.d.ts +17 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +35 -1
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +1 -1
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/constant/commonConstant.d.ts +1 -0
- package/build/component/constant/commonConstant.d.ts.map +1 -1
- package/build/component/constant/commonConstant.js +2 -0
- package/build/component/constant/commonConstant.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +1 -1
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.d.ts +9 -0
- package/build/component/driver/aad/error/aadManifestError.d.ts.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +37 -1
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +9 -6
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +6 -0
- package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +1 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +1 -0
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +7 -3
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts +12 -0
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts.map +1 -0
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js +71 -0
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js.map +1 -0
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts +3 -2
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +5 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts +5 -0
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +21 -0
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts +2 -1
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +5 -2
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/index.d.ts +1 -0
- package/build/component/driver/index.d.ts.map +1 -1
- package/build/component/driver/index.js +1 -0
- package/build/component/driver/index.js.map +1 -1
- package/build/component/driver/interface/provisionArgs.d.ts +3 -0
- package/build/component/driver/interface/provisionArgs.d.ts.map +1 -1
- package/build/component/driver/interface/stepDriver.d.ts +2 -1
- package/build/component/driver/interface/stepDriver.d.ts.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.d.ts +7 -0
- package/build/component/driver/middleware/addSWADeployTelemetry.d.ts.map +1 -0
- package/build/component/driver/middleware/addSWADeployTelemetry.js +52 -0
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -0
- package/build/component/driver/middleware/addStartAndEndTelemetry.d.ts +3 -0
- package/build/component/driver/middleware/addStartAndEndTelemetry.d.ts.map +1 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.js +2 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.js.map +1 -1
- package/build/component/driver/script/npxBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/npxBuildDriver.js +5 -1
- package/build/component/driver/script/npxBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +12 -8
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +54 -36
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +52 -33
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +7 -0
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +3 -2
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +14 -8
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +5 -4
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +6 -2
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +5 -8
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +16 -16
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +16 -25
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +4 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +24 -6
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +21 -20
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/dependencyChecker.d.ts +1 -1
- package/build/component/generator/spfx/depsChecker/dependencyChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts +4 -3
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +30 -20
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts +3 -2
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +27 -18
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/error.d.ts +2 -0
- package/build/component/generator/spfx/error.d.ts.map +1 -1
- package/build/component/generator/spfx/error.js +16 -1
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts +3 -0
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +149 -20
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +3 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +3 -0
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts +7 -8
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.js +5 -6
- package/build/component/generator/spfx/utils/telemetryEvents.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +1 -1
- package/build/component/generator/utils.d.ts +5 -2
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +32 -12
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/utils/common.d.ts +4 -1
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +21 -17
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/envUtil.d.ts +1 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +14 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/fileOperation.d.ts +1 -1
- package/build/component/utils/fileOperation.d.ts.map +1 -1
- package/build/component/utils/fileOperation.js +34 -48
- package/build/component/utils/fileOperation.js.map +1 -1
- package/build/core/FxCore.d.ts +5 -0
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +48 -24
- package/build/core/FxCore.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +10 -9
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +4 -4
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/error/deploy.d.ts +6 -0
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +25 -1
- package/build/error/deploy.js.map +1 -1
- package/build/index.d.ts +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -0
- package/build/index.js.map +1 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +14 -5
- package/build/question/create.js.map +1 -1
- package/build/question/generator.js +1 -3
- package/build/question/generator.js.map +1 -1
- package/build/question/options/CreateProjectOptions.js +1 -1
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.js +5 -1
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -1
- package/build/question/options/DeployAadManifestOptions.js +1 -1
- package/build/question/options/DeployAadManifestOptions.js.map +1 -1
- package/build/question/options/PermissionGrantOptions.js +1 -1
- package/build/question/options/PermissionGrantOptions.js.map +1 -1
- package/build/question/options/PermissionListOptions.js +1 -1
- package/build/question/options/PermissionListOptions.js.map +1 -1
- package/build/question/other.d.ts +2 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +22 -8
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +1 -0
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +1 -0
- package/build/question/questionNames.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +11 -2
- package/build/ui/visitor.js.map +1 -1
- package/package.json +14 -22
- package/resource/package.nls.json +27 -7
- package/resource/yaml-schema/v1.3/yaml.schema.json +42 -5
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Bot/Pages/BotAuthorizeEndPage.cshtml +55 -51
- package/templates/plugins/resource/aad/auth/bot/csharp/Pages/BotAuthorizeEndPage.cshtml +55 -51
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +6 -2
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +5 -1
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +16 -9
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +11 -7
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +16 -9
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +11 -7
|
@@ -1,61 +1,65 @@
|
|
|
1
1
|
@page "/bot-auth-end.html"
|
|
2
2
|
|
|
3
3
|
<html>
|
|
4
|
+
|
|
4
5
|
<head>
|
|
5
|
-
|
|
6
|
-
|
|
6
|
+
<title>Login End Page</title>
|
|
7
|
+
<meta charset="utf-8" />
|
|
7
8
|
</head>
|
|
8
9
|
|
|
9
10
|
<body>
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
// Unexpected condition: hash does not contain error or access_token parameter
|
|
29
|
-
handleAuthError("UnexpectedFailure", hashParams);
|
|
30
|
-
}
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
// Parse hash parameters into key-value pairs
|
|
34
|
-
function getHashParameters() {
|
|
35
|
-
let hashParams = {};
|
|
36
|
-
location.hash
|
|
37
|
-
.substr(1)
|
|
38
|
-
.split("&")
|
|
39
|
-
.forEach(function (item) {
|
|
40
|
-
let s = item.split("="),
|
|
41
|
-
k = s[0],
|
|
42
|
-
v = s[1] && decodeURIComponent(s[1]);
|
|
43
|
-
hashParams[k] = v;
|
|
44
|
-
});
|
|
45
|
-
return hashParams;
|
|
46
|
-
}
|
|
47
|
-
// Show error information
|
|
48
|
-
function handleAuthError(errorType, errorMessage) {
|
|
49
|
-
const err = JSON.stringify({
|
|
50
|
-
error: errorType,
|
|
51
|
-
message: JSON.stringify(errorMessage),
|
|
52
|
-
});
|
|
53
|
-
let para = document.createElement("p");
|
|
54
|
-
let node = document.createTextNode(err);
|
|
55
|
-
para.appendChild(node);
|
|
56
|
-
let element = document.getElementById("divError");
|
|
57
|
-
element.appendChild(para);
|
|
11
|
+
<script src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
|
|
12
|
+
integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
|
|
13
|
+
crossorigin="anonymous"></script>
|
|
14
|
+
<div id="divError"></div>
|
|
15
|
+
<script type="text/javascript">
|
|
16
|
+
microsoftTeams.app.initialize().then(() => {
|
|
17
|
+
let hashParams = getHashParameters();
|
|
18
|
+
if (hashParams["error"]) {
|
|
19
|
+
// Authentication failed
|
|
20
|
+
handleAuthError(hashParams["error"], hashParams);
|
|
21
|
+
} else if (hashParams["code"]) {
|
|
22
|
+
// Get the stored state parameter and compare with incoming state
|
|
23
|
+
let expectedState = localStorage.getItem("state");
|
|
24
|
+
if (expectedState !== hashParams["state"]) {
|
|
25
|
+
// State does not match, report error
|
|
26
|
+
handleAuthError("StateDoesNotMatch", hashParams);
|
|
27
|
+
} else {
|
|
28
|
+
microsoftTeams.authentication.notifySuccess();
|
|
58
29
|
}
|
|
59
|
-
|
|
30
|
+
} else {
|
|
31
|
+
// Unexpected condition: hash does not contain error or access_token parameter
|
|
32
|
+
handleAuthError("UnexpectedFailure", hashParams);
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
// Parse hash parameters into key-value pairs
|
|
37
|
+
function getHashParameters() {
|
|
38
|
+
let hashParams = {};
|
|
39
|
+
location.hash
|
|
40
|
+
.substr(1)
|
|
41
|
+
.split("&")
|
|
42
|
+
.forEach(function (item) {
|
|
43
|
+
let s = item.split("="),
|
|
44
|
+
k = s[0],
|
|
45
|
+
v = s[1] && decodeURIComponent(s[1]);
|
|
46
|
+
hashParams[k] = v;
|
|
47
|
+
});
|
|
48
|
+
return hashParams;
|
|
49
|
+
}
|
|
50
|
+
// Show error information
|
|
51
|
+
function handleAuthError(errorType, errorMessage) {
|
|
52
|
+
const err = JSON.stringify({
|
|
53
|
+
error: errorType,
|
|
54
|
+
message: JSON.stringify(errorMessage),
|
|
55
|
+
});
|
|
56
|
+
let para = document.createElement("p");
|
|
57
|
+
let node = document.createTextNode(err);
|
|
58
|
+
para.appendChild(node);
|
|
59
|
+
let element = document.getElementById("divError");
|
|
60
|
+
element.appendChild(para);
|
|
61
|
+
}
|
|
62
|
+
</script>
|
|
60
63
|
</body>
|
|
64
|
+
|
|
61
65
|
</html>
|
|
@@ -1,61 +1,65 @@
|
|
|
1
1
|
@page "/bot-auth-end.html"
|
|
2
2
|
|
|
3
3
|
<html>
|
|
4
|
+
|
|
4
5
|
<head>
|
|
5
|
-
|
|
6
|
-
|
|
6
|
+
<title>Login End Page</title>
|
|
7
|
+
<meta charset="utf-8" />
|
|
7
8
|
</head>
|
|
8
9
|
|
|
9
10
|
<body>
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
// Unexpected condition: hash does not contain error or access_token parameter
|
|
29
|
-
handleAuthError("UnexpectedFailure", hashParams);
|
|
30
|
-
}
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
// Parse hash parameters into key-value pairs
|
|
34
|
-
function getHashParameters() {
|
|
35
|
-
let hashParams = {};
|
|
36
|
-
location.hash
|
|
37
|
-
.substr(1)
|
|
38
|
-
.split("&")
|
|
39
|
-
.forEach(function (item) {
|
|
40
|
-
let s = item.split("="),
|
|
41
|
-
k = s[0],
|
|
42
|
-
v = s[1] && decodeURIComponent(s[1]);
|
|
43
|
-
hashParams[k] = v;
|
|
44
|
-
});
|
|
45
|
-
return hashParams;
|
|
46
|
-
}
|
|
47
|
-
// Show error information
|
|
48
|
-
function handleAuthError(errorType, errorMessage) {
|
|
49
|
-
const err = JSON.stringify({
|
|
50
|
-
error: errorType,
|
|
51
|
-
message: JSON.stringify(errorMessage),
|
|
52
|
-
});
|
|
53
|
-
let para = document.createElement("p");
|
|
54
|
-
let node = document.createTextNode(err);
|
|
55
|
-
para.appendChild(node);
|
|
56
|
-
let element = document.getElementById("divError");
|
|
57
|
-
element.appendChild(para);
|
|
11
|
+
<script src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
|
|
12
|
+
integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
|
|
13
|
+
crossorigin="anonymous"></script>
|
|
14
|
+
<div id="divError"></div>
|
|
15
|
+
<script type="text/javascript">
|
|
16
|
+
microsoftTeams.app.initialize().then(() => {
|
|
17
|
+
let hashParams = getHashParameters();
|
|
18
|
+
if (hashParams["error"]) {
|
|
19
|
+
// Authentication failed
|
|
20
|
+
handleAuthError(hashParams["error"], hashParams);
|
|
21
|
+
} else if (hashParams["code"]) {
|
|
22
|
+
// Get the stored state parameter and compare with incoming state
|
|
23
|
+
let expectedState = localStorage.getItem("state");
|
|
24
|
+
if (expectedState !== hashParams["state"]) {
|
|
25
|
+
// State does not match, report error
|
|
26
|
+
handleAuthError("StateDoesNotMatch", hashParams);
|
|
27
|
+
} else {
|
|
28
|
+
microsoftTeams.authentication.notifySuccess();
|
|
58
29
|
}
|
|
59
|
-
|
|
30
|
+
} else {
|
|
31
|
+
// Unexpected condition: hash does not contain error or access_token parameter
|
|
32
|
+
handleAuthError("UnexpectedFailure", hashParams);
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
// Parse hash parameters into key-value pairs
|
|
37
|
+
function getHashParameters() {
|
|
38
|
+
let hashParams = {};
|
|
39
|
+
location.hash
|
|
40
|
+
.substr(1)
|
|
41
|
+
.split("&")
|
|
42
|
+
.forEach(function (item) {
|
|
43
|
+
let s = item.split("="),
|
|
44
|
+
k = s[0],
|
|
45
|
+
v = s[1] && decodeURIComponent(s[1]);
|
|
46
|
+
hashParams[k] = v;
|
|
47
|
+
});
|
|
48
|
+
return hashParams;
|
|
49
|
+
}
|
|
50
|
+
// Show error information
|
|
51
|
+
function handleAuthError(errorType, errorMessage) {
|
|
52
|
+
const err = JSON.stringify({
|
|
53
|
+
error: errorType,
|
|
54
|
+
message: JSON.stringify(errorMessage),
|
|
55
|
+
});
|
|
56
|
+
let para = document.createElement("p");
|
|
57
|
+
let node = document.createTextNode(err);
|
|
58
|
+
para.appendChild(node);
|
|
59
|
+
let element = document.getElementById("divError");
|
|
60
|
+
element.appendChild(para);
|
|
61
|
+
}
|
|
62
|
+
</script>
|
|
60
63
|
</body>
|
|
64
|
+
|
|
61
65
|
</html>
|
|
@@ -8,7 +8,11 @@
|
|
|
8
8
|
</head>
|
|
9
9
|
|
|
10
10
|
<body>
|
|
11
|
-
<script
|
|
11
|
+
<script
|
|
12
|
+
src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
|
|
13
|
+
integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
|
|
14
|
+
crossorigin="anonymous"
|
|
15
|
+
></script>
|
|
12
16
|
<div id="divError"></div>
|
|
13
17
|
<script type="text/javascript">
|
|
14
18
|
microsoftTeams.app.initialize().then(() => {
|
|
@@ -31,7 +35,7 @@
|
|
|
31
35
|
handleAuthError("UnexpectedFailure", hashParams);
|
|
32
36
|
}
|
|
33
37
|
});
|
|
34
|
-
|
|
38
|
+
|
|
35
39
|
// Parse hash parameters into key-value pairs
|
|
36
40
|
function getHashParameters() {
|
|
37
41
|
let hashParams = new Map();
|
|
@@ -8,7 +8,11 @@
|
|
|
8
8
|
</head>
|
|
9
9
|
|
|
10
10
|
<body>
|
|
11
|
-
<script
|
|
11
|
+
<script
|
|
12
|
+
src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
|
|
13
|
+
integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
|
|
14
|
+
crossorigin="anonymous"
|
|
15
|
+
></script>
|
|
12
16
|
<div id="divError"></div>
|
|
13
17
|
<script type="text/javascript">
|
|
14
18
|
microsoftTeams.app.initialize().then(() => {
|
|
@@ -7,13 +7,17 @@
|
|
|
7
7
|
</head>
|
|
8
8
|
|
|
9
9
|
<body>
|
|
10
|
-
|
|
10
|
+
<script
|
|
11
|
+
src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
|
|
12
|
+
integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
|
|
13
|
+
crossorigin="anonymous"
|
|
14
|
+
></script>
|
|
11
15
|
<script
|
|
12
16
|
type="text/javascript"
|
|
13
17
|
src="https://alcdn.msauth.net/browser/2.21.0/js/msal-browser.min.js"
|
|
14
18
|
integrity="sha384-s/NxjjAgw1QgpDhOlVjTceLl4axrp5nqpUbCPOEQy1PqbFit9On6uw2XmEF1eq0s"
|
|
15
|
-
crossorigin="anonymous"
|
|
16
|
-
|
|
19
|
+
crossorigin="anonymous"
|
|
20
|
+
></script>
|
|
17
21
|
<script type="text/javascript">
|
|
18
22
|
var currentURL = new URL(window.location);
|
|
19
23
|
var clientId = currentURL.searchParams.get("clientId");
|
|
@@ -24,20 +28,23 @@
|
|
|
24
28
|
auth: {
|
|
25
29
|
clientId: clientId,
|
|
26
30
|
authority: `https://login.microsoftonline.com/${context.user.tenant.id}`,
|
|
27
|
-
navigateToLoginRequestUrl: false
|
|
31
|
+
navigateToLoginRequestUrl: false,
|
|
28
32
|
},
|
|
29
33
|
cache: {
|
|
30
34
|
cacheLocation: "sessionStorage",
|
|
31
35
|
},
|
|
32
|
-
}
|
|
36
|
+
};
|
|
33
37
|
|
|
34
38
|
const msalInstance = new window.msal.PublicClientApplication(msalConfig);
|
|
35
|
-
msalInstance
|
|
39
|
+
msalInstance
|
|
40
|
+
.handleRedirectPromise()
|
|
36
41
|
.then((tokenResponse) => {
|
|
37
42
|
if (tokenResponse !== null) {
|
|
38
|
-
microsoftTeams.authentication.notifySuccess(
|
|
39
|
-
|
|
40
|
-
|
|
43
|
+
microsoftTeams.authentication.notifySuccess(
|
|
44
|
+
JSON.stringify({
|
|
45
|
+
sessionStorage: sessionStorage,
|
|
46
|
+
})
|
|
47
|
+
);
|
|
41
48
|
} else {
|
|
42
49
|
microsoftTeams.authentication.notifyFailure("Get empty response.");
|
|
43
50
|
}
|
|
@@ -7,13 +7,17 @@
|
|
|
7
7
|
</head>
|
|
8
8
|
|
|
9
9
|
<body>
|
|
10
|
-
|
|
10
|
+
<script
|
|
11
|
+
src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
|
|
12
|
+
integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
|
|
13
|
+
crossorigin="anonymous"
|
|
14
|
+
></script>
|
|
11
15
|
<script
|
|
12
16
|
type="text/javascript"
|
|
13
17
|
src="https://alcdn.msauth.net/browser/2.21.0/js/msal-browser.min.js"
|
|
14
18
|
integrity="sha384-s/NxjjAgw1QgpDhOlVjTceLl4axrp5nqpUbCPOEQy1PqbFit9On6uw2XmEF1eq0s"
|
|
15
|
-
crossorigin="anonymous"
|
|
16
|
-
|
|
19
|
+
crossorigin="anonymous"
|
|
20
|
+
></script>
|
|
17
21
|
<script type="text/javascript">
|
|
18
22
|
microsoftTeams.app.initialize().then(() => {
|
|
19
23
|
microsoftTeams.app.getContext().then(async (context) => {
|
|
@@ -27,23 +31,23 @@
|
|
|
27
31
|
auth: {
|
|
28
32
|
clientId: clientId,
|
|
29
33
|
authority: `https://login.microsoftonline.com/${context.user.tenant.id}`,
|
|
30
|
-
navigateToLoginRequestUrl: false
|
|
34
|
+
navigateToLoginRequestUrl: false,
|
|
31
35
|
},
|
|
32
36
|
cache: {
|
|
33
37
|
cacheLocation: "sessionStorage",
|
|
34
38
|
},
|
|
35
|
-
}
|
|
39
|
+
};
|
|
36
40
|
|
|
37
41
|
const msalInstance = new msal.PublicClientApplication(msalConfig);
|
|
38
42
|
const scopesArray = scope.split(" ");
|
|
39
43
|
const scopesRequest = {
|
|
40
44
|
scopes: scopesArray,
|
|
41
45
|
redirectUri: window.location.origin + `/auth-end.html?clientId=${clientId}`,
|
|
42
|
-
loginHint: loginHint
|
|
46
|
+
loginHint: loginHint,
|
|
43
47
|
};
|
|
44
48
|
await msalInstance.loginRedirect(scopesRequest);
|
|
45
49
|
});
|
|
46
50
|
});
|
|
47
|
-
|
|
51
|
+
</script>
|
|
48
52
|
</body>
|
|
49
53
|
</html>
|
|
@@ -7,13 +7,17 @@
|
|
|
7
7
|
</head>
|
|
8
8
|
|
|
9
9
|
<body>
|
|
10
|
-
|
|
10
|
+
<script
|
|
11
|
+
src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
|
|
12
|
+
integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
|
|
13
|
+
crossorigin="anonymous"
|
|
14
|
+
></script>
|
|
11
15
|
<script
|
|
12
16
|
type="text/javascript"
|
|
13
17
|
src="https://alcdn.msauth.net/browser/2.21.0/js/msal-browser.min.js"
|
|
14
18
|
integrity="sha384-s/NxjjAgw1QgpDhOlVjTceLl4axrp5nqpUbCPOEQy1PqbFit9On6uw2XmEF1eq0s"
|
|
15
|
-
crossorigin="anonymous"
|
|
16
|
-
|
|
19
|
+
crossorigin="anonymous"
|
|
20
|
+
></script>
|
|
17
21
|
<script type="text/javascript">
|
|
18
22
|
var currentURL = new URL(window.location);
|
|
19
23
|
var clientId = currentURL.searchParams.get("clientId");
|
|
@@ -24,20 +28,23 @@
|
|
|
24
28
|
auth: {
|
|
25
29
|
clientId: clientId,
|
|
26
30
|
authority: `https://login.microsoftonline.com/${context.user.tenant.id}`,
|
|
27
|
-
navigateToLoginRequestUrl: false
|
|
31
|
+
navigateToLoginRequestUrl: false,
|
|
28
32
|
},
|
|
29
33
|
cache: {
|
|
30
34
|
cacheLocation: "sessionStorage",
|
|
31
35
|
},
|
|
32
|
-
}
|
|
36
|
+
};
|
|
33
37
|
|
|
34
38
|
const msalInstance = new window.msal.PublicClientApplication(msalConfig);
|
|
35
|
-
msalInstance
|
|
39
|
+
msalInstance
|
|
40
|
+
.handleRedirectPromise()
|
|
36
41
|
.then((tokenResponse) => {
|
|
37
42
|
if (tokenResponse !== null) {
|
|
38
|
-
microsoftTeams.authentication.notifySuccess(
|
|
39
|
-
|
|
40
|
-
|
|
43
|
+
microsoftTeams.authentication.notifySuccess(
|
|
44
|
+
JSON.stringify({
|
|
45
|
+
sessionStorage: sessionStorage,
|
|
46
|
+
})
|
|
47
|
+
);
|
|
41
48
|
} else {
|
|
42
49
|
microsoftTeams.authentication.notifyFailure("Get empty response.");
|
|
43
50
|
}
|
|
@@ -7,13 +7,17 @@
|
|
|
7
7
|
</head>
|
|
8
8
|
|
|
9
9
|
<body>
|
|
10
|
-
|
|
10
|
+
<script
|
|
11
|
+
src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
|
|
12
|
+
integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
|
|
13
|
+
crossorigin="anonymous"
|
|
14
|
+
></script>
|
|
11
15
|
<script
|
|
12
16
|
type="text/javascript"
|
|
13
17
|
src="https://alcdn.msauth.net/browser/2.21.0/js/msal-browser.min.js"
|
|
14
18
|
integrity="sha384-s/NxjjAgw1QgpDhOlVjTceLl4axrp5nqpUbCPOEQy1PqbFit9On6uw2XmEF1eq0s"
|
|
15
|
-
crossorigin="anonymous"
|
|
16
|
-
|
|
19
|
+
crossorigin="anonymous"
|
|
20
|
+
></script>
|
|
17
21
|
<script type="text/javascript">
|
|
18
22
|
microsoftTeams.app.initialize().then(() => {
|
|
19
23
|
microsoftTeams.app.getContext().then(async (context) => {
|
|
@@ -27,23 +31,23 @@
|
|
|
27
31
|
auth: {
|
|
28
32
|
clientId: clientId,
|
|
29
33
|
authority: `https://login.microsoftonline.com/${context.user.tenant.id}`,
|
|
30
|
-
navigateToLoginRequestUrl: false
|
|
34
|
+
navigateToLoginRequestUrl: false,
|
|
31
35
|
},
|
|
32
36
|
cache: {
|
|
33
37
|
cacheLocation: "sessionStorage",
|
|
34
38
|
},
|
|
35
|
-
}
|
|
39
|
+
};
|
|
36
40
|
|
|
37
41
|
const msalInstance = new msal.PublicClientApplication(msalConfig);
|
|
38
42
|
const scopesArray = scope.split(" ");
|
|
39
43
|
const scopesRequest = {
|
|
40
44
|
scopes: scopesArray,
|
|
41
45
|
redirectUri: window.location.origin + `/auth-end.html?clientId=${clientId}`,
|
|
42
|
-
loginHint: loginHint
|
|
46
|
+
loginHint: loginHint,
|
|
43
47
|
};
|
|
44
48
|
await msalInstance.loginRedirect(scopesRequest);
|
|
45
49
|
});
|
|
46
50
|
});
|
|
47
|
-
|
|
51
|
+
</script>
|
|
48
52
|
</body>
|
|
49
53
|
</html>
|