@microsoft/teamsfx-core 1.15.2-alpha.ba6ffae53.0 → 1.15.2-alpha.efe3d972e.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/featureFlags.d.ts +1 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +5 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/local/constants.d.ts +3 -1
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +4 -2
- package/build/common/local/constants.js.map +1 -1
- package/build/common/telemetry.d.ts +11 -2
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +12 -2
- package/build/common/telemetry.js.map +1 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +7 -3
- package/build/common/tools.js.map +1 -1
- package/build/component/code/spfxTabCode.d.ts.map +1 -1
- package/build/component/code/spfxTabCode.js +10 -10
- package/build/component/code/spfxTabCode.js.map +1 -1
- package/build/component/core.d.ts +14 -2
- package/build/component/core.d.ts.map +1 -1
- package/build/component/core.js +38 -18
- package/build/component/core.js.map +1 -1
- package/build/component/debug.d.ts.map +1 -1
- package/build/component/debug.js +4 -0
- package/build/component/debug.js.map +1 -1
- package/build/component/debugHandler/appManifest.d.ts +16 -0
- package/build/component/debugHandler/appManifest.d.ts.map +1 -0
- package/build/component/debugHandler/appManifest.js +80 -0
- package/build/component/debugHandler/appManifest.js.map +1 -0
- package/build/component/debugHandler/bot.d.ts +19 -0
- package/build/component/debugHandler/bot.d.ts.map +1 -0
- package/build/component/debugHandler/bot.js +132 -0
- package/build/component/debugHandler/bot.js.map +1 -0
- package/build/component/debugHandler/constants.d.ts +2 -0
- package/build/component/debugHandler/constants.d.ts.map +1 -0
- package/build/component/debugHandler/constants.js +7 -0
- package/build/component/debugHandler/constants.js.map +1 -0
- package/build/component/debugHandler/error.d.ts +3 -0
- package/build/component/debugHandler/error.d.ts.map +1 -1
- package/build/component/debugHandler/error.js +13 -1
- package/build/component/debugHandler/error.js.map +1 -1
- package/build/component/debugHandler/index.d.ts +3 -0
- package/build/component/debugHandler/index.d.ts.map +1 -1
- package/build/component/debugHandler/index.js +3 -0
- package/build/component/debugHandler/index.js.map +1 -1
- package/build/component/debugHandler/localEnvProvider.d.ts +76 -0
- package/build/component/debugHandler/localEnvProvider.d.ts.map +1 -0
- package/build/component/debugHandler/localEnvProvider.js +157 -0
- package/build/component/debugHandler/localEnvProvider.js.map +1 -0
- package/build/component/debugHandler/sso.d.ts +1 -1
- package/build/component/debugHandler/sso.d.ts.map +1 -1
- package/build/component/debugHandler/sso.js +118 -46
- package/build/component/debugHandler/sso.js.map +1 -1
- package/build/component/debugHandler/tab.d.ts +13 -0
- package/build/component/debugHandler/tab.d.ts.map +1 -0
- package/build/component/debugHandler/tab.js +73 -0
- package/build/component/debugHandler/tab.js.map +1 -0
- package/build/component/feature/{apiConnector.d.ts → apiconnector/apiConnector.d.ts} +3 -3
- package/build/component/feature/apiconnector/apiConnector.d.ts.map +1 -0
- package/build/component/feature/{apiConnector.js → apiconnector/apiConnector.js} +7 -7
- package/build/component/feature/apiconnector/apiConnector.js.map +1 -0
- package/build/component/feature/bot.d.ts.map +1 -1
- package/build/component/feature/bot.js +2 -1
- package/build/component/feature/bot.js.map +1 -1
- package/build/component/feature/cicd/CICDImpl.d.ts +9 -0
- package/build/component/feature/cicd/CICDImpl.d.ts.map +1 -0
- package/build/component/feature/cicd/CICDImpl.js +112 -0
- package/build/component/feature/cicd/CICDImpl.js.map +1 -0
- package/build/component/feature/{cicd.d.ts → cicd/cicd.d.ts} +0 -0
- package/build/component/feature/cicd/cicd.d.ts.map +1 -0
- package/build/component/feature/{cicd.js → cicd/cicd.js} +12 -16
- package/build/component/feature/cicd/cicd.js.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/constants.d.ts +0 -0
- package/build/component/feature/cicd/constants.d.ts.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/constants.js +0 -0
- package/build/component/feature/cicd/constants.js.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/errors.d.ts +0 -0
- package/build/component/feature/cicd/errors.d.ts.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/errors.js +0 -0
- package/build/component/feature/cicd/errors.js.map +1 -0
- package/build/{plugins/resource/cicd/utils → component/feature/cicd}/existingTemplatesStat.d.ts +0 -0
- package/build/component/feature/cicd/existingTemplatesStat.d.ts.map +1 -0
- package/build/{plugins/resource/cicd/utils → component/feature/cicd}/existingTemplatesStat.js +2 -2
- package/build/component/feature/cicd/existingTemplatesStat.js.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/logger.d.ts +0 -0
- package/build/component/feature/cicd/logger.d.ts.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/logger.js +0 -0
- package/build/component/feature/cicd/logger.js.map +1 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/azdoProvider.d.ts +0 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/azdoProvider.d.ts.map +1 -1
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/azdoProvider.js +0 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/azdoProvider.js.map +1 -1
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/enums.d.ts +0 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/enums.d.ts.map +1 -1
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/enums.js +0 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/enums.js.map +1 -1
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/factory.d.ts +0 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/factory.d.ts.map +1 -1
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/factory.js +0 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/factory.js.map +1 -1
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/githubProvider.d.ts +0 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/githubProvider.d.ts.map +1 -1
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/githubProvider.js +0 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/githubProvider.js.map +1 -1
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/jenkinsProvider.d.ts +0 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/jenkinsProvider.d.ts.map +1 -1
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/jenkinsProvider.js +0 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/jenkinsProvider.js.map +1 -1
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/provider.d.ts +2 -2
- package/build/component/feature/cicd/provider/provider.d.ts.map +1 -0
- package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/provider.js +10 -27
- package/build/component/feature/cicd/provider/provider.js.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/questions.d.ts +0 -0
- package/build/component/feature/cicd/questions.d.ts.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/questions.js +0 -0
- package/build/component/feature/cicd/questions.js.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/result.d.ts +0 -0
- package/build/component/feature/cicd/result.d.ts.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/result.js +0 -0
- package/build/component/feature/cicd/result.js.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/utils/buildScripts.d.ts +0 -0
- package/build/component/feature/cicd/utils/buildScripts.d.ts.map +1 -0
- package/build/component/feature/cicd/utils/buildScripts.js +29 -0
- package/build/component/feature/cicd/utils/buildScripts.js.map +1 -0
- package/build/component/feature/cicd/utils/telemetry-helper.d.ts +29 -0
- package/build/component/feature/cicd/utils/telemetry-helper.d.ts.map +1 -0
- package/build/{plugins/resource → component/feature}/cicd/utils/telemetry-helper.js +1 -1
- package/build/component/feature/cicd/utils/telemetry-helper.js.map +1 -0
- package/build/component/feature/spfx.d.ts +1 -0
- package/build/component/feature/spfx.d.ts.map +1 -1
- package/build/component/feature/spfx.js +32 -1
- package/build/component/feature/spfx.js.map +1 -1
- package/build/component/feature/sql.d.ts.map +1 -1
- package/build/component/feature/sql.js +8 -5
- package/build/component/feature/sql.js.map +1 -1
- package/build/component/provisionUtils.d.ts +3 -2
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +41 -24
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/questionV3.d.ts +2 -1
- package/build/component/questionV3.d.ts.map +1 -1
- package/build/component/questionV3.js +22 -22
- package/build/component/questionV3.js.map +1 -1
- package/build/component/resource/aadApp/utils.d.ts.map +1 -1
- package/build/component/resource/aadApp/utils.js +2 -8
- package/build/component/resource/aadApp/utils.js.map +1 -1
- package/build/component/resource/appManifest/appManifest.d.ts.map +1 -1
- package/build/component/resource/appManifest/appManifest.js +2 -2
- package/build/component/resource/appManifest/appManifest.js.map +1 -1
- package/build/component/resource/appManifest/appStudio.d.ts +2 -2
- package/build/component/resource/appManifest/appStudio.d.ts.map +1 -1
- package/build/component/resource/appManifest/appStudio.js +27 -7
- package/build/component/resource/appManifest/appStudio.js.map +1 -1
- package/build/component/resource/appManifest/utils.js +1 -1
- package/build/component/resource/appManifest/utils.js.map +1 -1
- package/build/component/telemetry.d.ts.map +1 -1
- package/build/component/telemetry.js +1 -0
- package/build/component/telemetry.js.map +1 -1
- package/build/core/FxCore.js +1 -1
- package/build/core/FxCore.js.map +1 -1
- package/build/core/downloadSample.d.ts +2 -2
- package/build/core/downloadSample.d.ts.map +1 -1
- package/build/core/downloadSample.js +3 -1
- package/build/core/downloadSample.js.map +1 -1
- package/build/core/middleware/envInfoWriter.d.ts.map +1 -1
- package/build/core/middleware/envInfoWriter.js +1 -0
- package/build/core/middleware/envInfoWriter.js.map +1 -1
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +9 -5
- package/build/core/question.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +3 -1
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/utils/utils.d.ts +0 -6
- package/build/plugins/resource/appstudio/utils/utils.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/utils/utils.js +1 -35
- package/build/plugins/resource/appstudio/utils/utils.js.map +1 -1
- package/build/plugins/resource/bot/appStudio/appStudio.d.ts.map +1 -1
- package/build/plugins/resource/bot/appStudio/appStudio.js +3 -0
- package/build/plugins/resource/bot/appStudio/appStudio.js.map +1 -1
- package/build/plugins/resource/bot/utils/telemetry-helper.d.ts.map +1 -1
- package/build/plugins/resource/bot/utils/telemetry-helper.js +6 -10
- package/build/plugins/resource/bot/utils/telemetry-helper.js.map +1 -1
- package/build/plugins/resource/index.d.ts +0 -1
- package/build/plugins/resource/index.d.ts.map +1 -1
- package/build/plugins/resource/index.js +0 -1
- package/build/plugins/resource/index.js.map +1 -1
- package/build/plugins/resource/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/plugins/resource/spfx/depsChecker/yoChecker.js +13 -13
- package/build/plugins/resource/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts +0 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js +0 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +2 -1
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +1 -0
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts +0 -1
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +0 -1
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +0 -3
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/package.json +6 -6
- package/resource/package.nls.json +5 -1
- package/templates/bicep/azureFunction.provision.module.bicep +2 -1
- package/templates/bicep/azureWebApp.config.module.bicep +7 -2
- package/templates/bicep/azureWebApp.provision.module.bicep +9 -0
- package/templates/fallback/bot.csharp.command-and-response.zip +0 -0
- package/templates/fallback/bot.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.notification-function-base.zip +0 -0
- package/templates/fallback/bot.csharp.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.csharp.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.csharp.notification-webapi.zip +0 -0
- package/templates/fallback/bot.js.command-and-response.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/bot.js.m365.zip +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/bot.ts.m365.zip +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.workflow.zip +0 -0
- package/templates/fallback/function-base.js.default.zip +0 -0
- package/templates/fallback/function-base.ts.default.zip +0 -0
- package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/fallback/tab.csharp.default.zip +0 -0
- package/templates/fallback/tab.csharp.non-sso.zip +0 -0
- package/templates/fallback/tab.js.default.zip +0 -0
- package/templates/fallback/tab.js.m365.zip +0 -0
- package/templates/fallback/tab.js.non-sso.zip +0 -0
- package/templates/fallback/tab.ts.default.zip +0 -0
- package/templates/fallback/tab.ts.m365.zip +0 -0
- package/templates/fallback/tab.ts.non-sso.zip +0 -0
- package/templates/plugins/resource/aad/auth/bot/README.md +2 -2
- package/templates/plugins/resource/aad/auth/tab/README.md +1 -1
- package/build/component/feature/apiConnector.d.ts.map +0 -1
- package/build/component/feature/apiConnector.js.map +0 -1
- package/build/component/feature/cicd.d.ts.map +0 -1
- package/build/component/feature/cicd.js.map +0 -1
- package/build/core/pvm/broker.d.ts +0 -24
- package/build/core/pvm/broker.d.ts.map +0 -1
- package/build/core/pvm/broker.js +0 -93
- package/build/core/pvm/broker.js.map +0 -1
- package/build/core/pvm/constant.d.ts +0 -11
- package/build/core/pvm/constant.d.ts.map +0 -1
- package/build/core/pvm/constant.js +0 -14
- package/build/core/pvm/constant.js.map +0 -1
- package/build/core/pvm/depot.d.ts +0 -43
- package/build/core/pvm/depot.d.ts.map +0 -1
- package/build/core/pvm/depot.js +0 -243
- package/build/core/pvm/depot.js.map +0 -1
- package/build/core/pvm/pvm.d.ts +0 -49
- package/build/core/pvm/pvm.d.ts.map +0 -1
- package/build/core/pvm/pvm.js +0 -82
- package/build/core/pvm/pvm.js.map +0 -1
- package/build/core/pvm/type.d.ts +0 -11
- package/build/core/pvm/type.d.ts.map +0 -1
- package/build/core/pvm/type.js +0 -3
- package/build/core/pvm/type.js.map +0 -1
- package/build/core/pvm/utility.d.ts +0 -2
- package/build/core/pvm/utility.d.ts.map +0 -1
- package/build/core/pvm/utility.js +0 -10
- package/build/core/pvm/utility.js.map +0 -1
- package/build/plugins/resource/cicd/constants.d.ts.map +0 -1
- package/build/plugins/resource/cicd/constants.js.map +0 -1
- package/build/plugins/resource/cicd/errors.d.ts.map +0 -1
- package/build/plugins/resource/cicd/errors.js.map +0 -1
- package/build/plugins/resource/cicd/index.d.ts +0 -17
- package/build/plugins/resource/cicd/index.d.ts.map +0 -1
- package/build/plugins/resource/cicd/index.js +0 -86
- package/build/plugins/resource/cicd/index.js.map +0 -1
- package/build/plugins/resource/cicd/logger.d.ts.map +0 -1
- package/build/plugins/resource/cicd/logger.js.map +0 -1
- package/build/plugins/resource/cicd/plugin.d.ts +0 -9
- package/build/plugins/resource/cicd/plugin.d.ts.map +0 -1
- package/build/plugins/resource/cicd/plugin.js +0 -84
- package/build/plugins/resource/cicd/plugin.js.map +0 -1
- package/build/plugins/resource/cicd/providers/provider.d.ts.map +0 -1
- package/build/plugins/resource/cicd/providers/provider.js.map +0 -1
- package/build/plugins/resource/cicd/questions.d.ts.map +0 -1
- package/build/plugins/resource/cicd/questions.js.map +0 -1
- package/build/plugins/resource/cicd/result.d.ts.map +0 -1
- package/build/plugins/resource/cicd/result.js.map +0 -1
- package/build/plugins/resource/cicd/utils/buildScripts.d.ts.map +0 -1
- package/build/plugins/resource/cicd/utils/buildScripts.js +0 -56
- package/build/plugins/resource/cicd/utils/buildScripts.js.map +0 -1
- package/build/plugins/resource/cicd/utils/existingTemplatesStat.d.ts.map +0 -1
- package/build/plugins/resource/cicd/utils/existingTemplatesStat.js.map +0 -1
- package/build/plugins/resource/cicd/utils/telemetry-helper.d.ts +0 -29
- package/build/plugins/resource/cicd/utils/telemetry-helper.d.ts.map +0 -1
- package/build/plugins/resource/cicd/utils/telemetry-helper.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/component/debugHandler/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,4BAA4B,iCAAiC,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
// Copyright (c) Microsoft Corporation.
|
|
2
|
+
// Licensed under the MIT license.
|
|
3
|
+
"use strict";
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.botTunnelEndpointPlaceholder = void 0;
|
|
6
|
+
exports.botTunnelEndpointPlaceholder = "${teamsfx:botTunnelEndpoint}";
|
|
7
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/component/debugHandler/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEA,QAAA,4BAA4B,GAAG,8BAA8B,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { UserError } from "@microsoft/teamsfx-api";
|
|
2
2
|
export declare const errorSource = "debugHandler";
|
|
3
3
|
export declare function InvalidSSODebugArgsError(): UserError;
|
|
4
|
+
export declare function InvalidExistingBotArgsError(): UserError;
|
|
5
|
+
export declare function BotMessagingEndpointMissingError(): UserError;
|
|
6
|
+
export declare function InvalidTabDebugArgsError(): UserError;
|
|
4
7
|
//# sourceMappingURL=error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../src/component/debugHandler/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGnD,eAAO,MAAM,WAAW,iBAAiB,CAAC;AAE1C,wBAAgB,wBAAwB,IAAI,SAAS,CAOpD"}
|
|
1
|
+
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../src/component/debugHandler/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGnD,eAAO,MAAM,WAAW,iBAAiB,CAAC;AAE1C,wBAAgB,wBAAwB,IAAI,SAAS,CAOpD;AAED,wBAAgB,2BAA2B,IAAI,SAAS,CAOvD;AAED,wBAAgB,gCAAgC,IAAI,SAAS,CAO5D;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAOpD"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.InvalidSSODebugArgsError = exports.errorSource = void 0;
|
|
5
|
+
exports.InvalidTabDebugArgsError = exports.BotMessagingEndpointMissingError = exports.InvalidExistingBotArgsError = exports.InvalidSSODebugArgsError = exports.errorSource = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
8
8
|
exports.errorSource = "debugHandler";
|
|
@@ -10,4 +10,16 @@ function InvalidSSODebugArgsError() {
|
|
|
10
10
|
return new teamsfx_api_1.UserError(exports.errorSource, "InvalidSSODebugArgsError", localizeUtils_1.getDefaultString("error.debugHandler.InvalidSSODebugArgsError"), localizeUtils_1.getLocalizedString("error.debugHandler.InvalidSSODebugArgsError"));
|
|
11
11
|
}
|
|
12
12
|
exports.InvalidSSODebugArgsError = InvalidSSODebugArgsError;
|
|
13
|
+
function InvalidExistingBotArgsError() {
|
|
14
|
+
return new teamsfx_api_1.UserError(exports.errorSource, "InvalidBotDebugArgsError", localizeUtils_1.getDefaultString("error.debugHandler.InvalidExistingBotArgsError"), localizeUtils_1.getLocalizedString("error.debugHandler.InvalidExistingBotArgsError"));
|
|
15
|
+
}
|
|
16
|
+
exports.InvalidExistingBotArgsError = InvalidExistingBotArgsError;
|
|
17
|
+
function BotMessagingEndpointMissingError() {
|
|
18
|
+
return new teamsfx_api_1.UserError(exports.errorSource, "InvalidBotDebugArgsError", localizeUtils_1.getDefaultString("error.debugHandler.BotMessagingEndpointMissingError"), localizeUtils_1.getLocalizedString("error.debugHandler.BotMessagingEndpointMissingError"));
|
|
19
|
+
}
|
|
20
|
+
exports.BotMessagingEndpointMissingError = BotMessagingEndpointMissingError;
|
|
21
|
+
function InvalidTabDebugArgsError() {
|
|
22
|
+
return new teamsfx_api_1.UserError(exports.errorSource, "InvalidTabDebugArgsError", localizeUtils_1.getDefaultString("error.debugHandler.InvalidTabDebugArgsError"), localizeUtils_1.getLocalizedString("error.debugHandler.InvalidTabDebugArgsError"));
|
|
23
|
+
}
|
|
24
|
+
exports.InvalidTabDebugArgsError = InvalidTabDebugArgsError;
|
|
13
25
|
//# sourceMappingURL=error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/component/debugHandler/error.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,wDAAmD;AACnD,8DAAkF;AAErE,QAAA,WAAW,GAAG,cAAc,CAAC;AAE1C,SAAgB,wBAAwB;IACtC,OAAO,IAAI,uBAAS,CAClB,mBAAW,EACX,0BAA0B,EAC1B,gCAAgB,CAAC,6CAA6C,CAAC,EAC/D,kCAAkB,CAAC,6CAA6C,CAAC,CAClE,CAAC;AACJ,CAAC;AAPD,4DAOC"}
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/component/debugHandler/error.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,wDAAmD;AACnD,8DAAkF;AAErE,QAAA,WAAW,GAAG,cAAc,CAAC;AAE1C,SAAgB,wBAAwB;IACtC,OAAO,IAAI,uBAAS,CAClB,mBAAW,EACX,0BAA0B,EAC1B,gCAAgB,CAAC,6CAA6C,CAAC,EAC/D,kCAAkB,CAAC,6CAA6C,CAAC,CAClE,CAAC;AACJ,CAAC;AAPD,4DAOC;AAED,SAAgB,2BAA2B;IACzC,OAAO,IAAI,uBAAS,CAClB,mBAAW,EACX,0BAA0B,EAC1B,gCAAgB,CAAC,gDAAgD,CAAC,EAClE,kCAAkB,CAAC,gDAAgD,CAAC,CACrE,CAAC;AACJ,CAAC;AAPD,kEAOC;AAED,SAAgB,gCAAgC;IAC9C,OAAO,IAAI,uBAAS,CAClB,mBAAW,EACX,0BAA0B,EAC1B,gCAAgB,CAAC,qDAAqD,CAAC,EACvE,kCAAkB,CAAC,qDAAqD,CAAC,CAC1E,CAAC;AACJ,CAAC;AAPD,4EAOC;AAED,SAAgB,wBAAwB;IACtC,OAAO,IAAI,uBAAS,CAClB,mBAAW,EACX,0BAA0B,EAC1B,gCAAgB,CAAC,6CAA6C,CAAC,EAC/D,kCAAkB,CAAC,6CAA6C,CAAC,CAClE,CAAC;AACJ,CAAC;AAPD,4DAOC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/debugHandler/index.ts"],"names":[],"mappings":"AAIA,cAAc,OAAO,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/debugHandler/index.ts"],"names":[],"mappings":"AAIA,cAAc,eAAe,CAAC;AAC9B,cAAc,OAAO,CAAC;AACtB,cAAc,OAAO,CAAC;AACtB,cAAc,OAAO,CAAC"}
|
|
@@ -3,5 +3,8 @@
|
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
|
+
tslib_1.__exportStar(require("./appManifest"), exports);
|
|
7
|
+
tslib_1.__exportStar(require("./bot"), exports);
|
|
6
8
|
tslib_1.__exportStar(require("./sso"), exports);
|
|
9
|
+
tslib_1.__exportStar(require("./tab"), exports);
|
|
7
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/component/debugHandler/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,gDAAsB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/component/debugHandler/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,wDAA8B;AAC9B,gDAAsB;AACtB,gDAAsB;AACtB,gDAAsB"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
export interface LocalEnvs {
|
|
2
|
+
template: {
|
|
3
|
+
[key: string]: string;
|
|
4
|
+
};
|
|
5
|
+
teamsfx: {
|
|
6
|
+
[key: string]: string;
|
|
7
|
+
};
|
|
8
|
+
customized: {
|
|
9
|
+
[key: string]: string;
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
export declare const LocalEnvKeys: Readonly<{
|
|
13
|
+
frontend: {
|
|
14
|
+
template: {
|
|
15
|
+
Browser: string;
|
|
16
|
+
Https: string;
|
|
17
|
+
Port: string;
|
|
18
|
+
SslCrtFile: string;
|
|
19
|
+
SslKeyFile: string;
|
|
20
|
+
};
|
|
21
|
+
teamsfx: {
|
|
22
|
+
ClientId: string;
|
|
23
|
+
LoginUrl: string;
|
|
24
|
+
FuncEndpoint: string;
|
|
25
|
+
FuncName: string;
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
backend: {
|
|
29
|
+
teamsfx: {
|
|
30
|
+
ClientId: string;
|
|
31
|
+
ClientSecret: string;
|
|
32
|
+
TenantId: string;
|
|
33
|
+
AuthorityHost: string;
|
|
34
|
+
AllowedAppIds: string;
|
|
35
|
+
SqlEndpoint: string;
|
|
36
|
+
SqlDbName: string;
|
|
37
|
+
SqlUserName: string;
|
|
38
|
+
SqlPassword: string;
|
|
39
|
+
SqlIdentityId: string;
|
|
40
|
+
};
|
|
41
|
+
};
|
|
42
|
+
bot: {
|
|
43
|
+
template: {
|
|
44
|
+
BotId: string;
|
|
45
|
+
BotPassword: string;
|
|
46
|
+
};
|
|
47
|
+
teamsfx: {
|
|
48
|
+
ClientId: string;
|
|
49
|
+
ClientSecret: string;
|
|
50
|
+
TenantId: string;
|
|
51
|
+
AuthorityHost: string;
|
|
52
|
+
LoginEndpoint: string;
|
|
53
|
+
ApplicationIdUri: string;
|
|
54
|
+
ApiEndpoint: string;
|
|
55
|
+
SqlEndpoint: string;
|
|
56
|
+
SqlDbName: string;
|
|
57
|
+
SqlUserName: string;
|
|
58
|
+
SqlPassword: string;
|
|
59
|
+
SqlIdentityId: string;
|
|
60
|
+
};
|
|
61
|
+
};
|
|
62
|
+
}>;
|
|
63
|
+
export declare class LocalEnvProvider {
|
|
64
|
+
static readonly LocalEnvFileName: string;
|
|
65
|
+
private readonly projectPath;
|
|
66
|
+
constructor(projectPath: string);
|
|
67
|
+
loadFrontendLocalEnvs(): Promise<LocalEnvs>;
|
|
68
|
+
loadBackendLocalEnvs(): Promise<LocalEnvs>;
|
|
69
|
+
loadBotLocalEnvs(): Promise<LocalEnvs>;
|
|
70
|
+
saveFrontendLocalEnvs(envs: LocalEnvs): Promise<void>;
|
|
71
|
+
saveBackendLocalEnvs(envs: LocalEnvs): Promise<void>;
|
|
72
|
+
saveBotLocalEnvs(envs: LocalEnvs): Promise<void>;
|
|
73
|
+
private loadLocalEnvFile;
|
|
74
|
+
private saveLocalEnvFile;
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=localEnvProvider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"localEnvProvider.d.ts","sourceRoot":"","sources":["../../../src/component/debugHandler/localEnvProvider.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACpC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACvC;AAED,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkDvB,CAAC;AAUH,qBAAa,gBAAgB;IAC3B,gBAAuB,gBAAgB,EAAE,MAAM,CAAwB;IAEvE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,WAAW,EAAE,MAAM;IAIlB,qBAAqB,IAAI,OAAO,CAAC,SAAS,CAAC;IAQ3C,oBAAoB,IAAI,OAAO,CAAC,SAAS,CAAC;IAQ1C,gBAAgB,IAAI,OAAO,CAAC,SAAS,CAAC;IAQtC,qBAAqB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrD,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpD,gBAAgB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;YAU/C,gBAAgB;YA2BhB,gBAAgB;CAoD/B"}
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
// Copyright (c) Microsoft Corporation.
|
|
2
|
+
// Licensed under the MIT license.
|
|
3
|
+
"use strict";
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.LocalEnvProvider = exports.LocalEnvKeys = void 0;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
7
|
+
const dotenv = tslib_1.__importStar(require("dotenv"));
|
|
8
|
+
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
9
|
+
const os = tslib_1.__importStar(require("os"));
|
|
10
|
+
const path = tslib_1.__importStar(require("path"));
|
|
11
|
+
const constants_1 = require("../../common/local/constants");
|
|
12
|
+
exports.LocalEnvKeys = Object.freeze({
|
|
13
|
+
frontend: {
|
|
14
|
+
template: {
|
|
15
|
+
Browser: "BROWSER",
|
|
16
|
+
Https: "HTTPS",
|
|
17
|
+
Port: "PORT",
|
|
18
|
+
SslCrtFile: "SSL_CRT_FILE",
|
|
19
|
+
SslKeyFile: "SSL_KEY_FILE",
|
|
20
|
+
},
|
|
21
|
+
teamsfx: {
|
|
22
|
+
ClientId: "REACT_APP_CLIENT_ID",
|
|
23
|
+
LoginUrl: "REACT_APP_START_LOGIN_PAGE_URL",
|
|
24
|
+
FuncEndpoint: "REACT_APP_FUNC_ENDPOINT",
|
|
25
|
+
FuncName: "REACT_APP_FUNC_NAME",
|
|
26
|
+
},
|
|
27
|
+
},
|
|
28
|
+
backend: {
|
|
29
|
+
teamsfx: {
|
|
30
|
+
ClientId: "M365_CLIENT_ID",
|
|
31
|
+
ClientSecret: "M365_CLIENT_SECRET",
|
|
32
|
+
TenantId: "M365_TENANT_ID",
|
|
33
|
+
AuthorityHost: "M365_AUTHORITY_HOST",
|
|
34
|
+
AllowedAppIds: "ALLOWED_APP_IDS",
|
|
35
|
+
SqlEndpoint: "SQL_ENDPOINT",
|
|
36
|
+
SqlDbName: "SQL_DATABASE_NAME",
|
|
37
|
+
SqlUserName: "SQL_USER_NAME",
|
|
38
|
+
SqlPassword: "SQL_PASSWORD",
|
|
39
|
+
SqlIdentityId: "IDENTITY_ID",
|
|
40
|
+
},
|
|
41
|
+
},
|
|
42
|
+
bot: {
|
|
43
|
+
template: {
|
|
44
|
+
BotId: "BOT_ID",
|
|
45
|
+
BotPassword: "BOT_PASSWORD",
|
|
46
|
+
},
|
|
47
|
+
teamsfx: {
|
|
48
|
+
ClientId: "M365_CLIENT_ID",
|
|
49
|
+
ClientSecret: "M365_CLIENT_SECRET",
|
|
50
|
+
TenantId: "M365_TENANT_ID",
|
|
51
|
+
AuthorityHost: "M365_AUTHORITY_HOST",
|
|
52
|
+
LoginEndpoint: "INITIATE_LOGIN_ENDPOINT",
|
|
53
|
+
ApplicationIdUri: "M365_APPLICATION_ID_URI",
|
|
54
|
+
ApiEndpoint: "API_ENDPOINT",
|
|
55
|
+
SqlEndpoint: "SQL_ENDPOINT",
|
|
56
|
+
SqlDbName: "SQL_DATABASE_NAME",
|
|
57
|
+
SqlUserName: "SQL_USER_NAME",
|
|
58
|
+
SqlPassword: "SQL_PASSWORD",
|
|
59
|
+
SqlIdentityId: "IDENTITY_ID",
|
|
60
|
+
},
|
|
61
|
+
},
|
|
62
|
+
});
|
|
63
|
+
const frontendTemplateComment = "# Following environment variables are generated by Teams Toolkit. They are used by create-react-app.";
|
|
64
|
+
const botTemplateComment = "# Following environment variables are generated by Teams Toolkit. They are used by the bot code.";
|
|
65
|
+
const teamsfxComment = "# Following environment variables are generated by Teams Toolkit. They are used by TeamsFx SDK.";
|
|
66
|
+
const customizedComment = "Following environment variables can be customized per your needs.";
|
|
67
|
+
class LocalEnvProvider {
|
|
68
|
+
constructor(projectPath) {
|
|
69
|
+
this.projectPath = projectPath;
|
|
70
|
+
}
|
|
71
|
+
async loadFrontendLocalEnvs() {
|
|
72
|
+
return await this.loadLocalEnvFile(path.join(this.projectPath, constants_1.FolderName.Frontend, LocalEnvProvider.LocalEnvFileName), Object.values(exports.LocalEnvKeys.frontend.template), Object.values(exports.LocalEnvKeys.frontend.teamsfx));
|
|
73
|
+
}
|
|
74
|
+
async loadBackendLocalEnvs() {
|
|
75
|
+
return await this.loadLocalEnvFile(path.join(this.projectPath, constants_1.FolderName.Function, LocalEnvProvider.LocalEnvFileName), [], Object.values(exports.LocalEnvKeys.backend.teamsfx));
|
|
76
|
+
}
|
|
77
|
+
async loadBotLocalEnvs() {
|
|
78
|
+
return await this.loadLocalEnvFile(path.join(this.projectPath, constants_1.FolderName.Bot, LocalEnvProvider.LocalEnvFileName), Object.values(exports.LocalEnvKeys.bot.template), Object.values(exports.LocalEnvKeys.bot.teamsfx));
|
|
79
|
+
}
|
|
80
|
+
async saveFrontendLocalEnvs(envs) {
|
|
81
|
+
await this.saveLocalEnvFile(path.join(this.projectPath, constants_1.FolderName.Frontend), envs, frontendTemplateComment, teamsfxComment, customizedComment);
|
|
82
|
+
}
|
|
83
|
+
async saveBackendLocalEnvs(envs) {
|
|
84
|
+
await this.saveLocalEnvFile(path.join(this.projectPath, constants_1.FolderName.Function), envs, undefined, teamsfxComment, customizedComment);
|
|
85
|
+
}
|
|
86
|
+
async saveBotLocalEnvs(envs) {
|
|
87
|
+
await this.saveLocalEnvFile(path.join(this.projectPath, constants_1.FolderName.Bot), envs, botTemplateComment, teamsfxComment, customizedComment);
|
|
88
|
+
}
|
|
89
|
+
async loadLocalEnvFile(path, templateKeys, teamsfxKeys) {
|
|
90
|
+
const result = {
|
|
91
|
+
template: {},
|
|
92
|
+
teamsfx: {},
|
|
93
|
+
customized: {},
|
|
94
|
+
};
|
|
95
|
+
if (await fs.pathExists(path)) {
|
|
96
|
+
const envs = dotenv.parse(await fs.readFile(path));
|
|
97
|
+
const entries = Object.entries(envs);
|
|
98
|
+
for (const [key, value] of entries) {
|
|
99
|
+
if (templateKeys.includes(key)) {
|
|
100
|
+
result.template[key] = value;
|
|
101
|
+
}
|
|
102
|
+
else if (teamsfxKeys.includes(key)) {
|
|
103
|
+
result.teamsfx[key] = value;
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
result.customized[key] = value;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
return result;
|
|
111
|
+
}
|
|
112
|
+
async saveLocalEnvFile(folder, envs, templateComment, teamsfxComment, customizedComment) {
|
|
113
|
+
await fs.ensureDir(folder);
|
|
114
|
+
const envPath = path.join(folder, LocalEnvProvider.LocalEnvFileName);
|
|
115
|
+
await fs.createFile(envPath);
|
|
116
|
+
await fs.writeFile(envPath, "");
|
|
117
|
+
let needEOL = false;
|
|
118
|
+
if (Object.keys(envs.template).length > 0) {
|
|
119
|
+
if (templateComment) {
|
|
120
|
+
await fs.appendFile(envPath, `${templateComment}${os.EOL}`);
|
|
121
|
+
}
|
|
122
|
+
const templateEntries = Object.entries(envs.template);
|
|
123
|
+
for (const [key, value] of templateEntries) {
|
|
124
|
+
await fs.appendFile(envPath, `${key}=${value}${os.EOL}`);
|
|
125
|
+
}
|
|
126
|
+
needEOL = true;
|
|
127
|
+
}
|
|
128
|
+
if (Object.keys(envs.teamsfx).length > 0) {
|
|
129
|
+
if (needEOL) {
|
|
130
|
+
await fs.appendFile(envPath, os.EOL);
|
|
131
|
+
}
|
|
132
|
+
if (teamsfxComment) {
|
|
133
|
+
await fs.appendFile(envPath, `${teamsfxComment}${os.EOL}`);
|
|
134
|
+
}
|
|
135
|
+
const teamsfxEntries = Object.entries(envs.teamsfx);
|
|
136
|
+
for (const [key, value] of teamsfxEntries) {
|
|
137
|
+
await fs.appendFile(envPath, `${key}=${value}${os.EOL}`);
|
|
138
|
+
}
|
|
139
|
+
needEOL = true;
|
|
140
|
+
}
|
|
141
|
+
if (Object.keys(envs.customized).length > 0) {
|
|
142
|
+
if (needEOL) {
|
|
143
|
+
await fs.appendFile(envPath, os.EOL);
|
|
144
|
+
}
|
|
145
|
+
if (customizedComment) {
|
|
146
|
+
await fs.appendFile(envPath, `${customizedComment}${os.EOL}`);
|
|
147
|
+
}
|
|
148
|
+
const customizedEntries = Object.entries(envs.customized);
|
|
149
|
+
for (const [key, value] of customizedEntries) {
|
|
150
|
+
await fs.appendFile(envPath, `${key}=${value}${os.EOL}`);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
exports.LocalEnvProvider = LocalEnvProvider;
|
|
156
|
+
LocalEnvProvider.LocalEnvFileName = ".env.teamsfx.local";
|
|
157
|
+
//# sourceMappingURL=localEnvProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"localEnvProvider.js","sourceRoot":"","sources":["../../../src/component/debugHandler/localEnvProvider.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,uDAAiC;AACjC,qDAA+B;AAC/B,+CAAyB;AACzB,mDAA6B;AAE7B,4DAA0D;AAQ7C,QAAA,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;IACxC,QAAQ,EAAE;QACR,QAAQ,EAAE;YACR,OAAO,EAAE,SAAS;YAClB,KAAK,EAAE,OAAO;YACd,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,cAAc;YAC1B,UAAU,EAAE,cAAc;SAC3B;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,qBAAqB;YAC/B,QAAQ,EAAE,gCAAgC;YAC1C,YAAY,EAAE,yBAAyB;YACvC,QAAQ,EAAE,qBAAqB;SAChC;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE;YACP,QAAQ,EAAE,gBAAgB;YAC1B,YAAY,EAAE,oBAAoB;YAClC,QAAQ,EAAE,gBAAgB;YAC1B,aAAa,EAAE,qBAAqB;YACpC,aAAa,EAAE,iBAAiB;YAChC,WAAW,EAAE,cAAc;YAC3B,SAAS,EAAE,mBAAmB;YAC9B,WAAW,EAAE,eAAe;YAC5B,WAAW,EAAE,cAAc;YAC3B,aAAa,EAAE,aAAa;SAC7B;KACF;IACD,GAAG,EAAE;QACH,QAAQ,EAAE;YACR,KAAK,EAAE,QAAQ;YACf,WAAW,EAAE,cAAc;SAC5B;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,gBAAgB;YAC1B,YAAY,EAAE,oBAAoB;YAClC,QAAQ,EAAE,gBAAgB;YAC1B,aAAa,EAAE,qBAAqB;YACpC,aAAa,EAAE,yBAAyB;YACxC,gBAAgB,EAAE,yBAAyB;YAC3C,WAAW,EAAE,cAAc;YAC3B,WAAW,EAAE,cAAc;YAC3B,SAAS,EAAE,mBAAmB;YAC9B,WAAW,EAAE,eAAe;YAC5B,WAAW,EAAE,cAAc;YAC3B,aAAa,EAAE,aAAa;SAC7B;KACF;CACF,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAC3B,sGAAsG,CAAC;AACzG,MAAM,kBAAkB,GACtB,kGAAkG,CAAC;AACrG,MAAM,cAAc,GAClB,iGAAiG,CAAC;AACpG,MAAM,iBAAiB,GAAG,mEAAmE,CAAC;AAE9F,MAAa,gBAAgB;IAK3B,YAAY,WAAmB;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAChC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,QAAQ,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EACnF,MAAM,CAAC,MAAM,CAAC,oBAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAC7C,MAAM,CAAC,MAAM,CAAC,oBAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAC7C,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC/B,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAChC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,QAAQ,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EACnF,EAAE,EACF,MAAM,CAAC,MAAM,CAAC,oBAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAC5C,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,gBAAgB;QAC3B,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAChC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,GAAG,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EAC9E,MAAM,CAAC,MAAM,CAAC,oBAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EACxC,MAAM,CAAC,MAAM,CAAC,oBAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CACxC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,IAAe;QAChD,MAAM,IAAI,CAAC,gBAAgB,CACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,QAAQ,CAAC,EAChD,IAAI,EACJ,uBAAuB,EACvB,cAAc,EACd,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,IAAe;QAC/C,MAAM,IAAI,CAAC,gBAAgB,CACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,QAAQ,CAAC,EAChD,IAAI,EACJ,SAAS,EACT,cAAc,EACd,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,IAAe;QAC3C,MAAM,IAAI,CAAC,gBAAgB,CACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,GAAG,CAAC,EAC3C,IAAI,EACJ,kBAAkB,EAClB,cAAc,EACd,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,IAAY,EACZ,YAAsB,EACtB,WAAqB;QAErB,MAAM,MAAM,GAAc;YACxB,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;SACf,CAAC;QACF,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YAEnD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE;gBAClC,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBAC9B,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBAC9B;qBAAM,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACpC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBAC7B;qBAAM;oBACL,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBAChC;aACF;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,MAAc,EACd,IAAe,EACf,eAAwB,EACxB,cAAuB,EACvB,iBAA0B;QAE1B,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QACrE,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEhC,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACzC,IAAI,eAAe,EAAE;gBACnB,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,eAAe,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;aAC7D;YACD,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACtD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,eAAe,EAAE;gBAC1C,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,KAAK,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;aAC1D;YACD,OAAO,GAAG,IAAI,CAAC;SAChB;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACxC,IAAI,OAAO,EAAE;gBACX,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;aACtC;YACD,IAAI,cAAc,EAAE;gBAClB,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,cAAc,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;aAC5D;YACD,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,cAAc,EAAE;gBACzC,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,KAAK,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;aAC1D;YACD,OAAO,GAAG,IAAI,CAAC;SAChB;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3C,IAAI,OAAO,EAAE;gBACX,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;aACtC;YACD,IAAI,iBAAiB,EAAE;gBACrB,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,iBAAiB,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;aAC/D;YACD,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,iBAAiB,EAAE;gBAC5C,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,KAAK,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;aAC1D;SACF;IACH,CAAC;;AA7IH,4CA8IC;AA7IwB,iCAAgB,GAAW,oBAAoB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FxError,
|
|
1
|
+
import { FxError, LogProvider, M365TokenProvider, Result, TelemetryReporter, UserInteraction, Void } from "@microsoft/teamsfx-api";
|
|
2
2
|
export interface SSODebugArgs {
|
|
3
3
|
objectId?: string;
|
|
4
4
|
clientId?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.d.ts","sourceRoot":"","sources":["../../../src/component/debugHandler/sso.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sso.d.ts","sourceRoot":"","sources":["../../../src/component/debugHandler/sso.ts"],"names":[],"mappings":"AAOA,OAAO,EAML,OAAO,EACP,WAAW,EACX,iBAAiB,EAIjB,MAAM,EACN,iBAAiB,EACjB,eAAe,EAEf,IAAI,EACL,MAAM,wBAAwB,CAAC;AAoBhC,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAoB;IAC/C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAkB;gBAGpC,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,YAAY,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,CAAC,EAAE,WAAW,EACpB,SAAS,CAAC,EAAE,iBAAiB,EAC7B,EAAE,CAAC,EAAE,eAAe;IAWT,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAuHtC,OAAO;YA6FP,SAAS;IAWvB,OAAO,CAAC,sBAAsB;CAqB/B"}
|
|
@@ -3,21 +3,26 @@
|
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.SSODebugHandler = void 0;
|
|
6
|
+
const lodash_1 = require("lodash");
|
|
7
|
+
const uuid_1 = require("uuid");
|
|
6
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
+
const projectSettingsHelper_1 = require("../../common/local/projectSettingsHelper");
|
|
10
|
+
const projectSettingsHelperV3_1 = require("../../common/projectSettingsHelperV3");
|
|
11
|
+
const telemetry_1 = require("../../common/telemetry");
|
|
12
|
+
const tools_1 = require("../../common/tools");
|
|
7
13
|
const crypto_1 = require("../../core/crypto");
|
|
8
|
-
const constants_1 = require("../constants");
|
|
9
|
-
const aadAppManifestManager_1 = require("../../plugins/resource/aad/aadAppManifestManager");
|
|
10
|
-
const aadAppClient_1 = require("../../plugins/resource/aad/aadAppClient");
|
|
11
|
-
const constants_2 = require("../../plugins/resource/aad/constants");
|
|
12
14
|
const environment_1 = require("../../core/environment");
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const
|
|
15
|
+
const projectSettingsLoader_1 = require("../../core/middleware/projectSettingsLoader");
|
|
16
|
+
const aadAppClient_1 = require("../../plugins/resource/aad/aadAppClient");
|
|
17
|
+
const aadAppManifestManager_1 = require("../../plugins/resource/aad/aadAppManifestManager");
|
|
18
|
+
const constants_1 = require("../../plugins/resource/aad/constants");
|
|
16
19
|
const configs_1 = require("../../plugins/resource/aad/utils/configs");
|
|
17
20
|
const tokenProvider_1 = require("../../plugins/resource/aad/utils/tokenProvider");
|
|
18
|
-
const
|
|
21
|
+
const constants_2 = require("../constants");
|
|
22
|
+
const migrate_1 = require("../migrate");
|
|
19
23
|
const error_1 = require("./error");
|
|
20
|
-
const
|
|
24
|
+
const localEnvProvider_1 = require("./localEnvProvider");
|
|
25
|
+
const tools_2 = require("../../common/tools");
|
|
21
26
|
class SSODebugHandler {
|
|
22
27
|
constructor(projectPath, args, m365TokenProvider, logger, telemetry, ui) {
|
|
23
28
|
this.projectPath = projectPath;
|
|
@@ -34,7 +39,7 @@ class SSODebugHandler {
|
|
|
34
39
|
if (checkArgsResult.isErr()) {
|
|
35
40
|
return teamsfx_api_1.err(checkArgsResult.error);
|
|
36
41
|
}
|
|
37
|
-
const projectSettingsResult = await
|
|
42
|
+
const projectSettingsResult = await projectSettingsLoader_1.loadProjectSettingsByProjectPath(this.projectPath, true);
|
|
38
43
|
if (projectSettingsResult.isErr()) {
|
|
39
44
|
return teamsfx_api_1.err(projectSettingsResult.error);
|
|
40
45
|
}
|
|
@@ -45,69 +50,66 @@ class SSODebugHandler {
|
|
|
45
50
|
return teamsfx_api_1.err(envInfoResult.error);
|
|
46
51
|
}
|
|
47
52
|
const envInfoV3 = envInfoResult.value;
|
|
48
|
-
envInfoV3.state[
|
|
53
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp] = envInfoV3.state[constants_2.ComponentNames.AadApp] || {};
|
|
49
54
|
// set objectId, clientId, clientSecret, oauth2PermissionScopeId from args to state
|
|
50
55
|
if (checkArgsResult.value) {
|
|
51
|
-
envInfoV3.state[
|
|
52
|
-
envInfoV3.state[
|
|
53
|
-
envInfoV3.state[
|
|
54
|
-
envInfoV3.state[
|
|
56
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].objectId = this.args.objectId;
|
|
57
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].clientId = this.args.clientId;
|
|
58
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].clientSecret = this.args.clientSecret;
|
|
59
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].oauth2PermissionScopeId =
|
|
55
60
|
this.args.accessAsUserScopeId || uuid_1.v4();
|
|
56
61
|
}
|
|
57
|
-
tokenProvider_1.TokenProvider.init({
|
|
62
|
+
await tokenProvider_1.TokenProvider.init({
|
|
58
63
|
m365: this.m365TokenProvider,
|
|
59
64
|
});
|
|
60
65
|
// set oauth2PermissionScopeId to state
|
|
61
|
-
envInfoV3.state[
|
|
62
|
-
envInfoV3.state[
|
|
66
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].oauth2PermissionScopeId =
|
|
67
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].oauth2PermissionScopeId || uuid_1.v4();
|
|
63
68
|
// not using exsting AAD app and not yet created
|
|
64
|
-
if (!envInfoV3.state[
|
|
69
|
+
if (!envInfoV3.state[constants_2.ComponentNames.AadApp].objectId) {
|
|
65
70
|
const context = this.constructPluginContext(envInfoV3, cryptoProvider);
|
|
66
71
|
const manifest = await aadAppManifestManager_1.AadAppManifestManager.loadAadManifest(context);
|
|
67
72
|
const config = new configs_1.ProvisionConfig(true, false);
|
|
68
73
|
await aadAppClient_1.AadAppClient.createAadAppUsingManifest(telemetry_1.TelemetryEvent.DebugSetUpSSO, manifest, config);
|
|
69
74
|
await aadAppClient_1.AadAppClient.createAadAppSecret(telemetry_1.TelemetryEvent.DebugSetUpSSO, config);
|
|
70
75
|
// set objectId, clientId, clientSecret to state
|
|
71
|
-
envInfoV3.state[
|
|
72
|
-
envInfoV3.state[
|
|
73
|
-
envInfoV3.state[
|
|
76
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].objectId = config.objectId;
|
|
77
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].clientId = config.clientId;
|
|
78
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].clientSecret = config.password;
|
|
74
79
|
}
|
|
75
80
|
// set applicationIdUris to state
|
|
76
81
|
let applicationIdUri = "api://";
|
|
77
|
-
if (
|
|
82
|
+
if (projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettingsV3)) {
|
|
78
83
|
applicationIdUri += "localhost/";
|
|
79
|
-
if (!
|
|
80
|
-
applicationIdUri += envInfoV3.state[
|
|
84
|
+
if (!projectSettingsHelper_1.ProjectSettingsHelper.includeBot(projectSettingsV3)) {
|
|
85
|
+
applicationIdUri += envInfoV3.state[constants_2.ComponentNames.AadApp].clientId;
|
|
81
86
|
}
|
|
82
87
|
}
|
|
83
|
-
if (
|
|
84
|
-
applicationIdUri += `botid-${envInfoV3.state[
|
|
88
|
+
if (projectSettingsHelper_1.ProjectSettingsHelper.includeBot(projectSettingsV3)) {
|
|
89
|
+
applicationIdUri += `botid-${envInfoV3.state[constants_2.ComponentNames.TeamsBot].botId}`;
|
|
85
90
|
}
|
|
86
|
-
envInfoV3.state[
|
|
91
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].applicationIdUris = applicationIdUri;
|
|
87
92
|
// set frontendEndpoint to state
|
|
88
|
-
if (
|
|
89
|
-
envInfoV3.state[
|
|
93
|
+
if (projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettingsV3)) {
|
|
94
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].frontendEndpoint = "https://localhost";
|
|
90
95
|
}
|
|
91
96
|
// set botId, botEndpoint to state
|
|
92
|
-
if (
|
|
93
|
-
envInfoV3.state[
|
|
94
|
-
envInfoV3.state[
|
|
95
|
-
envInfoV3.state[
|
|
96
|
-
envInfoV3.state[
|
|
97
|
+
if (projectSettingsHelper_1.ProjectSettingsHelper.includeBot(projectSettingsV3)) {
|
|
98
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].botId =
|
|
99
|
+
envInfoV3.state[constants_2.ComponentNames.TeamsBot].botId;
|
|
100
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].botEndpoint =
|
|
101
|
+
envInfoV3.state[constants_2.ComponentNames.TeamsBot].siteEndpoint;
|
|
97
102
|
}
|
|
98
103
|
// set tenantId, oauthHost, oauthAuthority to state
|
|
99
|
-
envInfoV3.state[
|
|
100
|
-
envInfoV3.state[
|
|
101
|
-
envInfoV3.state[
|
|
104
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].tenantId = tokenProvider_1.TokenProvider.tenantId;
|
|
105
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].oauthHost = constants_1.Constants.oauthAuthorityPrefix;
|
|
106
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].oauthAuthority = `${constants_1.Constants.oauthAuthorityPrefix}/${tokenProvider_1.TokenProvider.tenantId}`;
|
|
102
107
|
const context = this.constructPluginContext(envInfoV3, cryptoProvider);
|
|
103
108
|
const manifest = await aadAppManifestManager_1.AadAppManifestManager.loadAadManifest(context);
|
|
104
109
|
await aadAppClient_1.AadAppClient.updateAadAppUsingManifest(telemetry_1.TelemetryEvent.DebugSetUpSSO, manifest, false);
|
|
105
|
-
await environment_1.environmentManager.writeEnvState(envInfoV3.state, this.projectPath, cryptoProvider, environment_1.environmentManager.getLocalEnvName(), true);
|
|
110
|
+
await environment_1.environmentManager.writeEnvState(lodash_1.cloneDeep(envInfoV3.state), this.projectPath, cryptoProvider, environment_1.environmentManager.getLocalEnvName(), true);
|
|
106
111
|
await aadAppManifestManager_1.AadAppManifestManager.writeManifestFileToBuildFolder(manifest, context);
|
|
107
|
-
|
|
108
|
-
if (result.isErr()) {
|
|
109
|
-
return teamsfx_api_1.err(result.error);
|
|
110
|
-
}
|
|
112
|
+
await this.setEnvs(projectSettingsV3, envInfoV3);
|
|
111
113
|
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
112
114
|
}
|
|
113
115
|
catch (error) {
|
|
@@ -115,8 +117,78 @@ class SSODebugHandler {
|
|
|
115
117
|
}
|
|
116
118
|
}
|
|
117
119
|
async setEnvs(projectSettingsV3, envInfoV3) {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
+
const localEnvProvider = new localEnvProvider_1.LocalEnvProvider(this.projectPath);
|
|
121
|
+
if (projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettingsV3)) {
|
|
122
|
+
const frontendEnvs = await localEnvProvider.loadFrontendLocalEnvs();
|
|
123
|
+
frontendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.frontend.teamsfx.ClientId] =
|
|
124
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].clientId;
|
|
125
|
+
frontendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.frontend.teamsfx.LoginUrl] = `${envInfoV3.state[constants_2.ComponentNames.TeamsTab].endpoint}/auth-start.html`;
|
|
126
|
+
if (projectSettingsHelper_1.ProjectSettingsHelper.includeBackend(projectSettingsV3)) {
|
|
127
|
+
frontendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.frontend.teamsfx.FuncEndpoint] =
|
|
128
|
+
frontendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.frontend.teamsfx.FuncEndpoint] ||
|
|
129
|
+
"http://localhost:7071";
|
|
130
|
+
frontendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.frontend.teamsfx.FuncName] =
|
|
131
|
+
projectSettingsV3.defaultFunctionName;
|
|
132
|
+
}
|
|
133
|
+
await localEnvProvider.saveFrontendLocalEnvs(frontendEnvs);
|
|
134
|
+
}
|
|
135
|
+
if (projectSettingsHelper_1.ProjectSettingsHelper.includeBackend(projectSettingsV3)) {
|
|
136
|
+
const backendEnvs = await localEnvProvider.loadBackendLocalEnvs();
|
|
137
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.ClientId] =
|
|
138
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].clientId;
|
|
139
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.ClientSecret] =
|
|
140
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].clientSecret;
|
|
141
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.TenantId] =
|
|
142
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].tenantId;
|
|
143
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.AuthorityHost] =
|
|
144
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].oauthHost;
|
|
145
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.AllowedAppIds] =
|
|
146
|
+
tools_2.getAllowedAppIds().join(";");
|
|
147
|
+
if (projectSettingsHelperV3_1.hasSQL(projectSettingsV3)) {
|
|
148
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.SqlEndpoint] =
|
|
149
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.SqlEndpoint] || "";
|
|
150
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.SqlUserName] =
|
|
151
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.SqlUserName] || "";
|
|
152
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.SqlPassword] =
|
|
153
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.SqlPassword] || "";
|
|
154
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.SqlDbName] =
|
|
155
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.SqlDbName] || "";
|
|
156
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.SqlIdentityId] =
|
|
157
|
+
backendEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.backend.teamsfx.SqlIdentityId] || "";
|
|
158
|
+
}
|
|
159
|
+
await localEnvProvider.saveBackendLocalEnvs(backendEnvs);
|
|
160
|
+
}
|
|
161
|
+
if (projectSettingsHelper_1.ProjectSettingsHelper.includeBot(projectSettingsV3)) {
|
|
162
|
+
const botEnvs = await localEnvProvider.loadBotLocalEnvs();
|
|
163
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.ClientId] =
|
|
164
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].clientId;
|
|
165
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.ClientSecret] =
|
|
166
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].clientSecret;
|
|
167
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.TenantId] =
|
|
168
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].tenantId;
|
|
169
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.AuthorityHost] =
|
|
170
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].oauthHost;
|
|
171
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.LoginEndpoint] = `${envInfoV3.state[constants_2.ComponentNames.AadApp].botEndpoint}/auth-start.html`;
|
|
172
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.ApplicationIdUri] =
|
|
173
|
+
envInfoV3.state[constants_2.ComponentNames.AadApp].applicationIdUris;
|
|
174
|
+
if (projectSettingsHelper_1.ProjectSettingsHelper.includeBackend(projectSettingsV3)) {
|
|
175
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.ApiEndpoint] =
|
|
176
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.ApiEndpoint] || "http://localhost:7071";
|
|
177
|
+
}
|
|
178
|
+
if (projectSettingsHelperV3_1.hasSQL(projectSettingsV3)) {
|
|
179
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.SqlEndpoint] =
|
|
180
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.SqlEndpoint] || "";
|
|
181
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.SqlUserName] =
|
|
182
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.SqlUserName] || "";
|
|
183
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.SqlPassword] =
|
|
184
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.SqlPassword] || "";
|
|
185
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.SqlDbName] =
|
|
186
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.SqlDbName] || "";
|
|
187
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.SqlIdentityId] =
|
|
188
|
+
botEnvs.teamsfx[localEnvProvider_1.LocalEnvKeys.bot.teamsfx.SqlIdentityId] || "";
|
|
189
|
+
}
|
|
190
|
+
await localEnvProvider.saveBotLocalEnvs(botEnvs);
|
|
191
|
+
}
|
|
120
192
|
}
|
|
121
193
|
// return true if using existing AAD app
|
|
122
194
|
async checkArgs() {
|
|
@@ -135,7 +207,7 @@ class SSODebugHandler {
|
|
|
135
207
|
const envInfo = {
|
|
136
208
|
envName: envInfoV3.envName,
|
|
137
209
|
config: envInfoV3.config,
|
|
138
|
-
state:
|
|
210
|
+
state: tools_1.objectToMap(migrate_1.convertEnvStateV3ToV2(envInfoV3.state)),
|
|
139
211
|
};
|
|
140
212
|
const context = {
|
|
141
213
|
root: this.projectPath,
|