@microsoft/teamsfx-core 1.13.0 → 1.13.1-alpha.ae549cb45.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/deps-checker/depsChecker.d.ts +15 -5
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js.map +1 -1
- package/build/common/deps-checker/depsManager.d.ts +1 -15
- package/build/common/deps-checker/depsManager.d.ts.map +1 -1
- package/build/common/deps-checker/depsManager.js +4 -17
- package/build/common/deps-checker/depsManager.js.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.d.ts +4 -5
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +22 -19
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts +11 -7
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +40 -28
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/ngrokChecker.d.ts +4 -6
- package/build/common/deps-checker/internal/ngrokChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/ngrokChecker.js +21 -13
- package/build/common/deps-checker/internal/ngrokChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts +8 -6
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +44 -48
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/component/bicep.d.ts +4 -4
- package/build/component/bicep.d.ts.map +1 -1
- package/build/component/bicep.js +29 -79
- package/build/component/bicep.js.map +1 -1
- package/build/component/code/apiCode.d.ts +4 -4
- package/build/component/code/apiCode.d.ts.map +1 -1
- package/build/component/code/apiCode.js +56 -70
- package/build/component/code/apiCode.js.map +1 -1
- package/build/component/code/botCode.d.ts +4 -4
- package/build/component/code/botCode.d.ts.map +1 -1
- package/build/component/code/botCode.js +127 -136
- package/build/component/code/botCode.js.map +1 -1
- package/build/component/code/spfxTabCode.d.ts +3 -3
- package/build/component/code/spfxTabCode.d.ts.map +1 -1
- package/build/component/code/spfxTabCode.js +25 -28
- package/build/component/code/spfxTabCode.js.map +1 -1
- package/build/component/code/tabCode.d.ts +5 -5
- package/build/component/code/tabCode.d.ts.map +1 -1
- package/build/component/code/tabCode.js +139 -160
- package/build/component/code/tabCode.js.map +1 -1
- package/build/component/connection/apimConfig.d.ts +0 -2
- package/build/component/connection/apimConfig.d.ts.map +1 -1
- package/build/component/connection/apimConfig.js +2 -16
- package/build/component/connection/apimConfig.js.map +1 -1
- package/build/component/connection/azureFunctionConfig.d.ts +0 -2
- package/build/component/connection/azureFunctionConfig.d.ts.map +1 -1
- package/build/component/connection/azureFunctionConfig.js +2 -15
- package/build/component/connection/azureFunctionConfig.js.map +1 -1
- package/build/component/connection/azureResourceConfig.d.ts +2 -2
- package/build/component/connection/azureResourceConfig.d.ts.map +1 -1
- package/build/component/connection/azureResourceConfig.js +43 -60
- package/build/component/connection/azureResourceConfig.js.map +1 -1
- package/build/component/connection/azureWebAppConfig.d.ts +0 -2
- package/build/component/connection/azureWebAppConfig.d.ts.map +1 -1
- package/build/component/connection/azureWebAppConfig.js +2 -14
- package/build/component/connection/azureWebAppConfig.js.map +1 -1
- package/build/component/constants.d.ts +1 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +6 -1
- package/build/component/constants.js.map +1 -1
- package/build/component/core.d.ts +22 -25
- package/build/component/core.d.ts.map +1 -1
- package/build/component/core.js +442 -449
- package/build/component/core.js.map +1 -1
- package/build/component/debug.d.ts +1 -7
- package/build/component/debug.d.ts.map +1 -1
- package/build/component/debug.js +1 -70
- package/build/component/debug.js.map +1 -1
- package/build/component/envManager.d.ts +2 -5
- package/build/component/envManager.d.ts.map +1 -1
- package/build/component/envManager.js +10 -129
- package/build/component/envManager.js.map +1 -1
- package/build/component/feature/api.d.ts +1 -7
- package/build/component/feature/api.d.ts.map +1 -1
- package/build/component/feature/api.js +112 -145
- package/build/component/feature/api.js.map +1 -1
- package/build/component/feature/apim.d.ts.map +1 -1
- package/build/component/feature/apim.js +64 -86
- package/build/component/feature/apim.js.map +1 -1
- package/build/component/feature/bot.d.ts +3 -12
- package/build/component/feature/bot.d.ts.map +1 -1
- package/build/component/feature/bot.js +221 -210
- package/build/component/feature/bot.js.map +1 -1
- package/build/component/feature/keyVault.d.ts.map +1 -1
- package/build/component/feature/keyVault.js +48 -101
- package/build/component/feature/keyVault.js.map +1 -1
- package/build/component/feature/spfx.d.ts.map +1 -1
- package/build/component/feature/spfx.js +52 -55
- package/build/component/feature/spfx.js.map +1 -1
- package/build/component/feature/sql.d.ts +0 -6
- package/build/component/feature/sql.d.ts.map +1 -1
- package/build/component/feature/sql.js +57 -113
- package/build/component/feature/sql.js.map +1 -1
- package/build/component/feature/sso.d.ts +5 -7
- package/build/component/feature/sso.d.ts.map +1 -1
- package/build/component/feature/sso.js +101 -175
- package/build/component/feature/sso.js.map +1 -1
- package/build/component/feature/tab.d.ts +1 -6
- package/build/component/feature/tab.d.ts.map +1 -1
- package/build/component/feature/tab.js +165 -197
- package/build/component/feature/tab.js.map +1 -1
- package/build/component/messages.d.ts +3 -0
- package/build/component/messages.d.ts.map +1 -1
- package/build/component/messages.js +3 -0
- package/build/component/messages.js.map +1 -1
- package/build/component/middleware/actionExecutionMW.d.ts +20 -0
- package/build/component/middleware/actionExecutionMW.d.ts.map +1 -0
- package/build/component/middleware/actionExecutionMW.js +100 -0
- package/build/component/middleware/actionExecutionMW.js.map +1 -0
- package/build/component/migrate.d.ts.map +1 -1
- package/build/component/migrate.js +2 -26
- package/build/component/migrate.js.map +1 -1
- package/build/component/questionV3.d.ts +1 -0
- package/build/component/questionV3.d.ts.map +1 -1
- package/build/component/questionV3.js +42 -10
- package/build/component/questionV3.js.map +1 -1
- package/build/component/resource/aadApp/aadApp.d.ts +7 -7
- package/build/component/resource/aadApp/aadApp.d.ts.map +1 -1
- package/build/component/resource/aadApp/aadApp.js +56 -18
- package/build/component/resource/aadApp/aadApp.js.map +1 -1
- package/build/component/resource/aadApp/actions/configure.js +2 -2
- package/build/component/resource/aadApp/actions/configure.js.map +1 -1
- package/build/component/resource/aadApp/actions/deploy.d.ts +3 -0
- package/build/component/resource/aadApp/actions/deploy.d.ts.map +1 -0
- package/build/component/resource/aadApp/actions/deploy.js +70 -0
- package/build/component/resource/aadApp/actions/deploy.js.map +1 -0
- package/build/component/resource/aadApp/actions/generateManifest.d.ts.map +1 -1
- package/build/component/resource/aadApp/actions/generateManifest.js +3 -1
- package/build/component/resource/aadApp/actions/generateManifest.js.map +1 -1
- package/build/component/resource/aadApp/actions/provision.d.ts +1 -2
- package/build/component/resource/aadApp/actions/provision.d.ts.map +1 -1
- package/build/component/resource/aadApp/actions/provision.js +3 -33
- package/build/component/resource/aadApp/actions/provision.js.map +1 -1
- package/build/component/resource/aadApp/actions/setApplication.js +2 -2
- package/build/component/resource/aadApp/actions/setApplication.js.map +1 -1
- package/build/component/resource/aadApp/actions/utils.d.ts +3 -0
- package/build/component/resource/aadApp/actions/utils.d.ts.map +1 -0
- package/build/component/resource/aadApp/actions/utils.js +38 -0
- package/build/component/resource/aadApp/actions/utils.js.map +1 -0
- package/build/component/resource/apim.d.ts +4 -5
- package/build/component/resource/apim.d.ts.map +1 -1
- package/build/component/resource/apim.js +21 -63
- package/build/component/resource/apim.js.map +1 -1
- package/build/component/resource/appManifest/appManifest.d.ts +5 -5
- package/build/component/resource/appManifest/appManifest.d.ts.map +1 -1
- package/build/component/resource/appManifest/appManifest.js +82 -117
- package/build/component/resource/appManifest/appManifest.js.map +1 -1
- package/build/component/resource/azureAppService/azureAppService.d.ts +3 -3
- package/build/component/resource/azureAppService/azureAppService.d.ts.map +1 -1
- package/build/component/resource/azureAppService/azureAppService.js +24 -36
- package/build/component/resource/azureAppService/azureAppService.js.map +1 -1
- package/build/component/resource/azureAppService/azureFunction.d.ts +2 -2
- package/build/component/resource/azureAppService/azureFunction.d.ts.map +1 -1
- package/build/component/resource/azureAppService/azureFunction.js +2 -25
- package/build/component/resource/azureAppService/azureFunction.js.map +1 -1
- package/build/component/resource/azureResource.d.ts +2 -2
- package/build/component/resource/azureResource.d.ts.map +1 -1
- package/build/component/resource/azureResource.js +29 -47
- package/build/component/resource/azureResource.js.map +1 -1
- package/build/component/resource/azureSql/actions/configure.d.ts.map +1 -1
- package/build/component/resource/azureSql/azureSql.d.ts +4 -4
- package/build/component/resource/azureSql/azureSql.d.ts.map +1 -1
- package/build/component/resource/azureSql/azureSql.js +41 -7
- package/build/component/resource/azureSql/azureSql.js.map +1 -1
- package/build/component/resource/azureStorage.d.ts +3 -3
- package/build/component/resource/azureStorage.d.ts.map +1 -1
- package/build/component/resource/azureStorage.js +45 -56
- package/build/component/resource/azureStorage.js.map +1 -1
- package/build/component/resource/botService.d.ts +4 -4
- package/build/component/resource/botService.d.ts.map +1 -1
- package/build/component/resource/botService.js +66 -74
- package/build/component/resource/botService.js.map +1 -1
- package/build/component/resource/identity.d.ts.map +1 -1
- package/build/component/resource/identity.js +9 -4
- package/build/component/resource/identity.js.map +1 -1
- package/build/component/resource/spfx.d.ts +2 -2
- package/build/component/resource/spfx.d.ts.map +1 -1
- package/build/component/resource/spfx.js +23 -34
- package/build/component/resource/spfx.js.map +1 -1
- package/build/component/utils.d.ts +12 -1
- package/build/component/utils.d.ts.map +1 -1
- package/build/component/utils.js +108 -45
- package/build/component/utils.js.map +1 -1
- package/build/component/workflow.d.ts +2 -1
- package/build/component/workflow.d.ts.map +1 -1
- package/build/component/workflow.js +41 -29
- package/build/component/workflow.js.map +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +9 -65
- package/build/core/FxCore.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +19 -5
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js +6 -3
- package/build/plugins/resource/frontend/dotnet/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/resources/templateInfo.d.ts +2 -1
- package/build/plugins/resource/frontend/dotnet/resources/templateInfo.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/resources/templateInfo.js +3 -2
- package/build/plugins/resource/frontend/dotnet/resources/templateInfo.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +1 -1
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts +2 -2
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +19 -6
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provision.js +41 -30
- package/build/plugins/solution/fx-solution/v3/provision.js.map +1 -1
- package/package.json +4 -4
- package/resource/package.nls.cs.json +20 -16
- package/resource/package.nls.de.json +20 -16
- package/resource/package.nls.es.json +21 -17
- package/resource/package.nls.fr.json +20 -16
- package/resource/package.nls.it.json +20 -16
- package/resource/package.nls.ja.json +21 -17
- package/resource/package.nls.json +3 -1
- package/resource/package.nls.ko.json +21 -17
- package/resource/package.nls.pl.json +21 -17
- package/resource/package.nls.pt-BR.json +21 -17
- package/resource/package.nls.ru.json +21 -17
- package/resource/package.nls.tr.json +21 -17
- package/resource/package.nls.zh-Hans.json +21 -17
- package/resource/package.nls.zh-Hant.json +21 -17
- package/templates/bicep/apim.config.module.bicep +2 -2
- package/templates/bicep/azureFunction.config.module.bicep +7 -4
- package/templates/bicep/azureFunction.config.orchestration.bicep +2 -2
- package/templates/bicep/azureFunction.provision.orchestration.bicep +5 -0
- package/templates/bicep/azureStorage.provision.orchestration.bicep +6 -0
- package/templates/bicep/azureWebApp.config.module.bicep +5 -5
- package/templates/bicep/azureWebApp.config.orchestration.bicep +1 -1
- package/templates/bicep/azureWebApp.provision.orchestration.bicep +5 -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/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/build/component/fx/preDeployAction.d.ts +0 -7
- package/build/component/fx/preDeployAction.d.ts.map +0 -1
- package/build/component/fx/preDeployAction.js +0 -28
- package/build/component/fx/preDeployAction.js.map +0 -1
- package/build/component/fx/preProvisionAction.d.ts +0 -7
- package/build/component/fx/preProvisionAction.d.ts.map +0 -1
- package/build/component/fx/preProvisionAction.js +0 -71
- package/build/component/fx/preProvisionAction.js.map +0 -1
|
@@ -7,199 +7,125 @@ const tslib_1 = require("tslib");
|
|
|
7
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
8
|
require("reflect-metadata");
|
|
9
9
|
const typedi_1 = require("typedi");
|
|
10
|
-
const
|
|
11
|
-
const workflow_1 = require("../workflow");
|
|
10
|
+
const utils_1 = require("../../common/utils");
|
|
12
11
|
require("../connection/azureWebAppConfig");
|
|
12
|
+
const constants_1 = require("../constants");
|
|
13
|
+
const debug_1 = require("../debug");
|
|
13
14
|
require("../resource/azureSql");
|
|
14
15
|
require("../resource/identity");
|
|
15
|
-
const
|
|
16
|
-
const
|
|
16
|
+
const utils_2 = require("../utils");
|
|
17
|
+
const workflow_1 = require("../workflow");
|
|
17
18
|
let SSO = class SSO {
|
|
18
19
|
constructor() {
|
|
19
20
|
this.name = "sso";
|
|
20
21
|
}
|
|
21
|
-
/**
|
|
22
|
-
* 1. config sso/aad
|
|
23
|
-
* 2. generate aad manifest
|
|
24
|
-
* 3. genearte aad bicep
|
|
25
|
-
* 4. genearte aad auth files
|
|
26
|
-
* 5. update app manifest
|
|
27
|
-
*/
|
|
28
22
|
add(context, inputs) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
let needsBotHostingConnection = false;
|
|
32
|
-
let needsTab = false;
|
|
33
|
-
let needsTabApiConnection = false;
|
|
34
|
-
const aadComponent = workflow_1.getComponent(context.projectSetting, constants_1.ComponentNames.AadApp);
|
|
35
|
-
const teamsBotComponent = workflow_1.getComponent(context.projectSetting, constants_1.ComponentNames.TeamsBot);
|
|
36
|
-
if (teamsBotComponent && !teamsBotComponent.sso) {
|
|
37
|
-
needsBot = teamsBotComponent.hosting !== constants_1.ComponentNames.Function;
|
|
38
|
-
}
|
|
39
|
-
if (needsBot) {
|
|
40
|
-
const botHosting = teamsBotComponent === null || teamsBotComponent === void 0 ? void 0 : teamsBotComponent.hosting;
|
|
41
|
-
if (botHosting) {
|
|
42
|
-
const botHostingComponent = utils_1.getHostingComponent(teamsBotComponent, context.projectSetting);
|
|
43
|
-
needsBotHostingConnection = !((_a = botHostingComponent === null || botHostingComponent === void 0 ? void 0 : botHostingComponent.connections) === null || _a === void 0 ? void 0 : _a.includes(constants_1.ComponentNames.AadApp));
|
|
44
|
-
}
|
|
23
|
+
if (inputs.platform == teamsfx_api_1.Platform.CLI_HELP) {
|
|
24
|
+
return teamsfx_api_1.ok(undefined);
|
|
45
25
|
}
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
if (needsBotHostingConnection) {
|
|
65
|
-
remarks.push(`connect 'aad-app' to component ${teamsBotComponent === null || teamsBotComponent === void 0 ? void 0 : teamsBotComponent.hosting} in projectSettings`);
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
if (needsTab) {
|
|
69
|
-
remarks.push("add feature 'SSO' to component 'teams-tab' in projectSettings");
|
|
70
|
-
if (needsTabApiConnection) {
|
|
71
|
-
remarks.push(`connect 'aad-app' to component 'azure-function' of teams-api in projectSettings`);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
return teamsfx_api_1.ok([
|
|
75
|
-
{
|
|
76
|
-
type: "file",
|
|
77
|
-
operate: "replace",
|
|
78
|
-
filePath: projectSettingsLoader_1.getProjectSettingsPath(inputs.projectPath),
|
|
79
|
-
remarks: remarks.join(";"),
|
|
80
|
-
},
|
|
81
|
-
]);
|
|
82
|
-
},
|
|
83
|
-
execute: async (context, inputs) => {
|
|
84
|
-
var _a, _b;
|
|
85
|
-
const remarks = [];
|
|
86
|
-
const projectSettings = context.projectSetting;
|
|
87
|
-
if (!aadComponent) {
|
|
88
|
-
remarks.push("add component 'aad-app' in projectSettings");
|
|
89
|
-
}
|
|
90
|
-
projectSettings.components.push({
|
|
91
|
-
name: "aad-app",
|
|
26
|
+
const action = {
|
|
27
|
+
type: "function",
|
|
28
|
+
name: "sso.add",
|
|
29
|
+
execute: async (context, inputs) => {
|
|
30
|
+
const updates = getUpdateComponents(context, inputs);
|
|
31
|
+
const effects = [];
|
|
32
|
+
// generate manifest
|
|
33
|
+
const aadApp = typedi_1.Container.get(constants_1.ComponentNames.AadApp);
|
|
34
|
+
{
|
|
35
|
+
const res = await aadApp.generateManifest(context, inputs);
|
|
36
|
+
if (res.isErr())
|
|
37
|
+
return teamsfx_api_1.err(res.error);
|
|
38
|
+
effects.push("generate aad manifest");
|
|
39
|
+
}
|
|
40
|
+
// config sso
|
|
41
|
+
if (updates.aad) {
|
|
42
|
+
context.projectSetting.components.push({
|
|
43
|
+
name: constants_1.ComponentNames.AadApp,
|
|
92
44
|
provision: true,
|
|
45
|
+
deploy: true,
|
|
93
46
|
});
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
47
|
+
}
|
|
48
|
+
if (updates.tab) {
|
|
49
|
+
const teamsTabComponent = workflow_1.getComponent(context.projectSetting, constants_1.ComponentNames.TeamsTab);
|
|
50
|
+
teamsTabComponent.sso = true;
|
|
51
|
+
}
|
|
52
|
+
if (updates.bot) {
|
|
53
|
+
const teamsBotComponent = workflow_1.getComponent(context.projectSetting, constants_1.ComponentNames.TeamsBot);
|
|
54
|
+
teamsBotComponent.sso = true;
|
|
55
|
+
}
|
|
56
|
+
effects.push("config sso");
|
|
57
|
+
// generate bicep
|
|
58
|
+
{
|
|
59
|
+
const res = await aadApp.generateBicep(context, inputs);
|
|
60
|
+
if (res.isErr())
|
|
61
|
+
return teamsfx_api_1.err(res.error);
|
|
62
|
+
const bicepRes = await utils_2.bicepUtils.persistBiceps(inputs.projectPath, utils_1.convertToAlphanumericOnly(context.projectSetting.appName), res.value);
|
|
63
|
+
if (bicepRes.isErr())
|
|
64
|
+
return bicepRes;
|
|
65
|
+
effects.push("generate aad bicep");
|
|
66
|
+
}
|
|
67
|
+
// generate auth files
|
|
68
|
+
{
|
|
69
|
+
const res = await aadApp.generateAuthFiles(context, inputs, updates.tab, updates.bot);
|
|
70
|
+
if (res.isErr())
|
|
71
|
+
return teamsfx_api_1.err(res.error);
|
|
72
|
+
effects.push("generate auth files");
|
|
73
|
+
}
|
|
74
|
+
// update app manifest
|
|
75
|
+
{
|
|
76
|
+
const capabilities = [{ name: "WebApplicationInfo" }];
|
|
77
|
+
const appManifest = typedi_1.Container.get(constants_1.ComponentNames.AppManifest);
|
|
78
|
+
const res = await appManifest.addCapability(inputs, capabilities);
|
|
79
|
+
if (res.isErr())
|
|
80
|
+
return teamsfx_api_1.err(res.error);
|
|
81
|
+
effects.push("update app manifest");
|
|
82
|
+
}
|
|
83
|
+
// local debug settings
|
|
84
|
+
{
|
|
85
|
+
const res = await debug_1.generateLocalDebugSettings(context, inputs);
|
|
86
|
+
if (res.isErr())
|
|
87
|
+
return teamsfx_api_1.err(res.error);
|
|
88
|
+
effects.push("generate local debug configs");
|
|
89
|
+
}
|
|
90
|
+
// generate config bicep
|
|
91
|
+
{
|
|
92
|
+
const res = await utils_2.generateConfigBiceps(context, inputs);
|
|
93
|
+
if (res.isErr())
|
|
94
|
+
return teamsfx_api_1.err(res.error);
|
|
95
|
+
effects.push("generate config biceps");
|
|
96
|
+
}
|
|
97
|
+
return teamsfx_api_1.ok(effects);
|
|
145
98
|
},
|
|
146
|
-
{
|
|
147
|
-
name: "call:app-manifest.addCapability",
|
|
148
|
-
type: "call",
|
|
149
|
-
required: true,
|
|
150
|
-
targetAction: "app-manifest.addCapability",
|
|
151
|
-
inputs: {
|
|
152
|
-
capabilities: [{ name: "WebApplicationInfo" }],
|
|
153
|
-
},
|
|
154
|
-
},
|
|
155
|
-
{
|
|
156
|
-
name: "call:debug.generateLocalDebugSettings",
|
|
157
|
-
type: "call",
|
|
158
|
-
required: true,
|
|
159
|
-
targetAction: "debug.generateLocalDebugSettings",
|
|
160
|
-
},
|
|
161
|
-
];
|
|
162
|
-
if (needsBotHostingConnection) {
|
|
163
|
-
const botHosting = teamsBotComponent === null || teamsBotComponent === void 0 ? void 0 : teamsBotComponent.hosting;
|
|
164
|
-
actions.push({
|
|
165
|
-
name: `call:${botHosting}-config.generateBicep`,
|
|
166
|
-
type: "call",
|
|
167
|
-
required: true,
|
|
168
|
-
targetAction: `${botHosting}-config.generateBicep`,
|
|
169
|
-
inputs: {
|
|
170
|
-
update: true,
|
|
171
|
-
scenario: constants_1.Scenarios.Bot,
|
|
172
|
-
},
|
|
173
|
-
});
|
|
174
|
-
}
|
|
175
|
-
if (needsTabApiConnection) {
|
|
176
|
-
const tabApi = getTabApiComponent(teamsTabComponent, context.projectSetting);
|
|
177
|
-
actions.push({
|
|
178
|
-
name: `call:${tabApi === null || tabApi === void 0 ? void 0 : tabApi.name}-config.generateBicep`,
|
|
179
|
-
type: "call",
|
|
180
|
-
required: true,
|
|
181
|
-
targetAction: `${tabApi === null || tabApi === void 0 ? void 0 : tabApi.name}-config.generateBicep`,
|
|
182
|
-
inputs: {
|
|
183
|
-
update: true,
|
|
184
|
-
scenario: constants_1.Scenarios.Api,
|
|
185
|
-
},
|
|
186
|
-
});
|
|
187
|
-
}
|
|
188
|
-
const group = {
|
|
189
|
-
type: "group",
|
|
190
|
-
name: "sso.add",
|
|
191
|
-
mode: "sequential",
|
|
192
|
-
actions: actions,
|
|
193
99
|
};
|
|
194
|
-
return teamsfx_api_1.ok(
|
|
100
|
+
return teamsfx_api_1.ok(action);
|
|
195
101
|
}
|
|
196
102
|
};
|
|
197
103
|
SSO = tslib_1.__decorate([
|
|
198
104
|
typedi_1.Service("sso")
|
|
199
105
|
], SSO);
|
|
200
106
|
exports.SSO = SSO;
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
107
|
+
function getUpdateComponents(context, inputs) {
|
|
108
|
+
if (inputs.stage === teamsfx_api_1.Stage.create) {
|
|
109
|
+
return {
|
|
110
|
+
tab: true,
|
|
111
|
+
aad: true,
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
let needsBot = false;
|
|
115
|
+
let needsTab = false;
|
|
116
|
+
const aadComponent = workflow_1.getComponent(context.projectSetting, constants_1.ComponentNames.AadApp);
|
|
117
|
+
const teamsBotComponent = workflow_1.getComponent(context.projectSetting, constants_1.ComponentNames.TeamsBot);
|
|
118
|
+
if (teamsBotComponent && !teamsBotComponent.sso) {
|
|
119
|
+
needsBot = teamsBotComponent.hosting !== constants_1.ComponentNames.Function;
|
|
120
|
+
}
|
|
121
|
+
const teamsTabComponent = workflow_1.getComponent(context.projectSetting, constants_1.ComponentNames.TeamsTab);
|
|
122
|
+
if (teamsTabComponent && !teamsTabComponent.sso) {
|
|
123
|
+
needsTab = true;
|
|
124
|
+
}
|
|
125
|
+
return {
|
|
126
|
+
bot: needsBot,
|
|
127
|
+
tab: needsTab,
|
|
128
|
+
aad: !aadComponent,
|
|
129
|
+
};
|
|
204
130
|
}
|
|
205
131
|
//# sourceMappingURL=sso.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../src/component/feature/sso.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,
|
|
1
|
+
{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../src/component/feature/sso.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,8 @@ import "reflect-metadata";
|
|
|
3
3
|
export declare class TeamsTab {
|
|
4
4
|
name: string;
|
|
5
5
|
add(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
|
|
6
|
+
provision(): MaybePromise<Result<Action | undefined, FxError>>;
|
|
6
7
|
configure(): MaybePromise<Result<Action | undefined, FxError>>;
|
|
7
8
|
build(): MaybePromise<Result<Action | undefined, FxError>>;
|
|
8
|
-
private addTabAction;
|
|
9
|
-
private hasTab;
|
|
10
|
-
private setupConfiguration;
|
|
11
|
-
private setupCode;
|
|
12
|
-
private setupBicep;
|
|
13
|
-
private setupCapabilities;
|
|
14
9
|
}
|
|
15
10
|
//# sourceMappingURL=tab.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab.d.ts","sourceRoot":"","sources":["../../../src/component/feature/tab.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,
|
|
1
|
+
{"version":3,"file":"tab.d.ts","sourceRoot":"","sources":["../../../src/component/feature/tab.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,SAAS,EAGT,OAAO,EACP,qBAAqB,EACrB,YAAY,EAIZ,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;AA0B1B,qBACa,QAAQ;IACnB,IAAI,SAAe;IACnB,GAAG,CACD,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAgJpD,SAAS,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAG9D,SAAS,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAG9D,KAAK,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CAG3D"}
|