@microsoft/teamsfx-core 2.0.8 → 2.0.9-alpha.20d61baa8.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/azureUtils.d.ts +3 -0
- package/build/common/azureUtils.d.ts.map +1 -0
- package/build/common/azureUtils.js +50 -0
- package/build/common/azureUtils.js.map +1 -0
- package/build/common/constants.d.ts +8 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +32 -1
- package/build/common/constants.js.map +1 -1
- package/build/common/globalState.js +3 -3
- package/build/common/local/taskDefinition.js +3 -3
- package/build/common/local/taskDefinition.js.map +1 -1
- package/build/common/m365/launchHelper.d.ts +1 -1
- package/build/common/m365/launchHelper.d.ts.map +1 -1
- package/build/common/m365/launchHelper.js +10 -10
- package/build/common/m365/launchHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +9 -9
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/requestUtils.d.ts +4 -0
- package/build/common/requestUtils.d.ts.map +1 -0
- package/build/common/requestUtils.js +52 -0
- package/build/common/requestUtils.js.map +1 -0
- package/build/common/samples.d.ts +6 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +3 -3
- package/build/common/samples.js.map +1 -1
- package/build/common/stringUtils.d.ts +5 -0
- package/build/common/stringUtils.d.ts.map +1 -1
- package/build/common/stringUtils.js +42 -1
- package/build/common/stringUtils.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts +1 -21
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +6 -190
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts +1 -1
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +5 -5
- package/build/common/utils.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constants.d.ts +3 -3
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +3 -3
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +61 -59
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts +0 -5
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +23 -52
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +17 -18
- package/build/component/driver/aad/create.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 -9
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.d.ts +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.d.ts.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js +11 -11
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/add/addWebPart.d.ts +2 -2
- package/build/component/driver/add/addWebPart.d.ts.map +1 -1
- package/build/component/driver/add/addWebPart.js +27 -27
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +14 -13
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.d.ts.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +20 -2
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/util/handleError.js +2 -2
- package/build/component/driver/arm/util/handleError.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts +4 -4
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +13 -13
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +19 -18
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/oauth/create.d.ts +1 -1
- package/build/component/driver/oauth/create.d.ts.map +1 -1
- package/build/component/driver/oauth/create.js +21 -21
- package/build/component/driver/oauth/create.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +19 -20
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +4 -4
- package/build/component/driver/teamsApp/configure.d.ts +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +13 -13
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/create.js +1 -2
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +13 -14
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.d.ts.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.js +2 -3
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +32 -32
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +2 -5
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +14 -15
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.js +3 -3
- package/build/component/driver/teamsApp/validateTestCases.js.map +1 -1
- package/build/component/driver/util/utils.d.ts +3 -0
- package/build/component/driver/util/utils.d.ts.map +1 -1
- package/build/component/driver/util/utils.js +16 -1
- package/build/component/driver/util/utils.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +10 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +234 -83
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +2 -2
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +37 -24
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +7 -7
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +1 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/generatorProvider.d.ts.map +1 -1
- package/build/component/generator/generatorProvider.js +6 -2
- package/build/component/generator/generatorProvider.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +2 -2
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +37 -36
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts +5 -0
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +37 -0
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts +9 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeXMLAddin/generator.js +74 -11
- package/build/component/generator/officeXMLAddin/generator.js.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts +2 -4
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.js +1 -11
- package/build/component/generator/officeXMLAddin/projectConfig.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts +2 -2
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +54 -55
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/templates/ssrTabGenerator.d.ts.map +1 -1
- package/build/component/generator/templates/ssrTabGenerator.js +5 -5
- package/build/component/generator/templates/ssrTabGenerator.js.map +1 -1
- package/build/component/generator/templates/templateGenerator.d.ts +3 -3
- package/build/component/generator/templates/templateGenerator.d.ts.map +1 -1
- package/build/component/generator/templates/templateGenerator.js +4 -6
- package/build/component/generator/templates/templateGenerator.js.map +1 -1
- package/build/component/generator/templates/templateNames.js +108 -109
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.js +9 -9
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/component/generator/utils.d.ts +1 -10
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +18 -61
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/middleware/envMW.js +2 -2
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/migrate.d.ts +8 -0
- package/build/component/migrate.d.ts.map +1 -1
- package/build/component/migrate.js +62 -8
- package/build/component/migrate.js.map +1 -1
- package/build/component/provisionUtils.js +2 -2
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js +5 -2
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts +10 -2
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +134 -41
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils.d.ts +1 -10
- package/build/component/utils.d.ts.map +1 -1
- package/build/component/utils.js +1 -120
- package/build/component/utils.js.map +1 -1
- package/build/core/FxCore.d.ts +2 -2
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +57 -56
- package/build/core/FxCore.js.map +1 -1
- package/build/core/callback.d.ts +2 -2
- package/build/core/callback.d.ts.map +1 -1
- package/build/core/callback.js.map +1 -1
- package/build/core/collaborator.js +19 -19
- package/build/core/collaborator.js.map +1 -1
- package/build/core/middleware/concurrentLocker.js +7 -7
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +1 -0
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +11 -3
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.d.ts +1 -0
- package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +10 -3
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/videoFilterAppBlocker.d.ts +2 -0
- package/build/core/middleware/videoFilterAppBlocker.d.ts.map +1 -1
- package/build/core/middleware/videoFilterAppBlocker.js +20 -3
- package/build/core/middleware/videoFilterAppBlocker.js.map +1 -1
- package/build/error/common.d.ts +1 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +9 -1
- package/build/error/common.js.map +1 -1
- package/build/index.d.ts +30 -21
- package/build/index.d.ts.map +1 -1
- package/build/index.js +41 -32
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +249 -0
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +1090 -1
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +9 -147
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +264 -1145
- package/build/question/create.js.map +1 -1
- package/build/question/index.d.ts +1 -3
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +2 -6
- package/build/question/index.js.map +1 -1
- package/build/question/other.d.ts +2 -28
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +65 -270
- package/build/question/other.js.map +1 -1
- package/package.json +5 -4
- package/resource/package.nls.json +4 -3
- package/resource/yaml-schema/v1.6/yaml.schema.json +1829 -0
- package/resource/yaml-schema/yaml.schema.json +46 -1
- package/templates/core/v3Migration/js.ts.app.local.yml +3 -3
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/aad.manifest.template.json +6 -0
- package/templates/plugins/resource/aad/manifest/aad.template.json +6 -0
- package/templates/plugins/resource/aad/manifest/bot/aad.manifest.template.json +6 -0
- package/templates/plugins/resource/aad/manifest/tab/aad.manifest.template.json +6 -0
- package/build/common/projectSettingsHelperV3.d.ts +0 -2
- package/build/common/projectSettingsHelperV3.d.ts.map +0 -1
- package/build/common/projectSettingsHelperV3.js +0 -15
- package/build/common/projectSettingsHelperV3.js.map +0 -1
- package/build/component/workflow.d.ts +0 -4
- package/build/component/workflow.d.ts.map +0 -1
- package/build/component/workflow.js +0 -18
- package/build/component/workflow.js.map +0 -1
- package/build/question/questionNames.d.ts +0 -78
- package/build/question/questionNames.d.ts.map +0 -1
- package/build/question/questionNames.js +0 -85
- package/build/question/questionNames.js.map +0 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.developerPortalScaffoldUtils = exports.
|
|
5
|
+
exports.developerPortalScaffoldUtils = exports.DeveloperPortalScaffoldUtils = exports.answerToReplaceMessageExtensionBotId = exports.answerToRepaceBotId = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
/**
|
|
8
8
|
* @author Yuqi Zhou <yuqzho@microsoft.com>
|
|
@@ -12,14 +12,13 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
|
12
12
|
const path = tslib_1.__importStar(require("path"));
|
|
13
13
|
const localizeUtils_1 = require("../common/localizeUtils");
|
|
14
14
|
const error_1 = require("../core/error");
|
|
15
|
+
const constants_1 = require("../question/constants");
|
|
15
16
|
const create_1 = require("../question/create");
|
|
16
|
-
const
|
|
17
|
+
const constants_2 = require("./constants");
|
|
17
18
|
const appStudio = tslib_1.__importStar(require("./driver/teamsApp/appStudio"));
|
|
18
|
-
const
|
|
19
|
+
const constants_3 = require("./driver/teamsApp/constants");
|
|
19
20
|
const ManifestUtils_1 = require("./driver/teamsApp/utils/ManifestUtils");
|
|
20
|
-
const utils_1 = require("./driver/teamsApp/utils/utils");
|
|
21
21
|
const envUtil_1 = require("./utils/envUtil");
|
|
22
|
-
const questionNames_1 = require("../question/questionNames");
|
|
23
22
|
const appPackageFolderName = "appPackage";
|
|
24
23
|
const colorFileName = "color.png";
|
|
25
24
|
const outlineFileName = "outline.png";
|
|
@@ -60,7 +59,7 @@ async function updateManifest(ctx, appDefinition, inputs) {
|
|
|
60
59
|
const appPackage = res.value;
|
|
61
60
|
if (!appPackage.manifest) {
|
|
62
61
|
const msg = localizeUtils_1.getLocalizedString("core.developerPortal.scaffold.CannotFindManifest", appDefinition.teamsAppId);
|
|
63
|
-
return teamsfx_api_1.err(new teamsfx_api_1.UserError(
|
|
62
|
+
return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.CoordinatorSource, "CouldNotFoundManifest", msg, msg));
|
|
64
63
|
}
|
|
65
64
|
const colorFilePath = path.join(ctx.projectPath, appPackageFolderName, colorFileName);
|
|
66
65
|
const outlineFilePath = path.join(ctx.projectPath, appPackageFolderName, outlineFileName);
|
|
@@ -118,15 +117,15 @@ async function updateManifest(ctx, appDefinition, inputs) {
|
|
|
118
117
|
// manifest: tab
|
|
119
118
|
const tabs = manifest.staticTabs;
|
|
120
119
|
let needUpdateStaticTabUrls = false;
|
|
121
|
-
if (inputs[
|
|
122
|
-
inputs[
|
|
120
|
+
if (inputs[constants_1.QuestionNames.ReplaceContentUrl] &&
|
|
121
|
+
inputs[constants_1.QuestionNames.ReplaceContentUrl].length != 0) {
|
|
123
122
|
needUpdateStaticTabUrls = true;
|
|
124
|
-
updateTabUrl(inputs[
|
|
123
|
+
updateTabUrl(inputs[constants_1.QuestionNames.ReplaceContentUrl], TabUrlType.ContentUrl, tabs, existingManifestTemplate.staticTabs);
|
|
125
124
|
}
|
|
126
|
-
if (inputs[
|
|
127
|
-
inputs[
|
|
125
|
+
if (inputs[constants_1.QuestionNames.ReplaceWebsiteUrl] &&
|
|
126
|
+
inputs[constants_1.QuestionNames.ReplaceWebsiteUrl].length != 0) {
|
|
128
127
|
needUpdateStaticTabUrls = true;
|
|
129
|
-
updateTabUrl(inputs[
|
|
128
|
+
updateTabUrl(inputs[constants_1.QuestionNames.ReplaceWebsiteUrl], TabUrlType.WebsiteUrl, tabs, existingManifestTemplate.staticTabs);
|
|
130
129
|
}
|
|
131
130
|
if (needUpdateStaticTabUrls) {
|
|
132
131
|
const validDomains = (_a = manifest.validDomains) !== null && _a !== void 0 ? _a : [];
|
|
@@ -134,29 +133,29 @@ async function updateManifest(ctx, appDefinition, inputs) {
|
|
|
134
133
|
manifest.validDomains = validDomains;
|
|
135
134
|
}
|
|
136
135
|
// manifest: bot
|
|
137
|
-
if (inputs[
|
|
138
|
-
if (inputs[
|
|
136
|
+
if (inputs[constants_1.QuestionNames.ReplaceBotIds]) {
|
|
137
|
+
if (inputs[constants_1.QuestionNames.ReplaceBotIds].includes(exports.answerToRepaceBotId)) {
|
|
139
138
|
if (existingManifestTemplate.bots && existingManifestTemplate.bots.length > 0) {
|
|
140
139
|
manifest.bots = existingManifestTemplate.bots;
|
|
141
140
|
}
|
|
142
141
|
else {
|
|
143
|
-
manifest.bots =
|
|
142
|
+
manifest.bots = constants_3.BOTS_TPL_V3;
|
|
144
143
|
manifest.bots[0].botId = "${{BOT_ID}}";
|
|
145
144
|
}
|
|
146
145
|
}
|
|
147
|
-
if (inputs[
|
|
146
|
+
if (inputs[constants_1.QuestionNames.ReplaceBotIds].includes(exports.answerToReplaceMessageExtensionBotId)) {
|
|
148
147
|
if (existingManifestTemplate.composeExtensions &&
|
|
149
148
|
existingManifestTemplate.composeExtensions.length > 0) {
|
|
150
149
|
manifest.composeExtensions = existingManifestTemplate.composeExtensions;
|
|
151
150
|
}
|
|
152
151
|
else {
|
|
153
|
-
manifest.composeExtensions =
|
|
152
|
+
manifest.composeExtensions = constants_3.COMPOSE_EXTENSIONS_TPL_V3;
|
|
154
153
|
manifest.composeExtensions[0].botId = "${{BOT_ID}}";
|
|
155
154
|
}
|
|
156
155
|
}
|
|
157
156
|
}
|
|
158
157
|
// manifest: no tab, bot or me selected on TDP before
|
|
159
|
-
if (!getProjectTypeAndCapability(appDefinition)) {
|
|
158
|
+
if (!create_1.getProjectTypeAndCapability(appDefinition)) {
|
|
160
159
|
// which means user selects a capability through TTK UI.
|
|
161
160
|
manifest.bots = existingManifestTemplate.bots;
|
|
162
161
|
manifest.composeExtensions = existingManifestTemplate.composeExtensions;
|
|
@@ -169,22 +168,22 @@ async function updateManifest(ctx, appDefinition, inputs) {
|
|
|
169
168
|
// manifest: developer
|
|
170
169
|
if (manifest.developer) {
|
|
171
170
|
if (!manifest.developer.websiteUrl) {
|
|
172
|
-
manifest.developer.websiteUrl =
|
|
171
|
+
manifest.developer.websiteUrl = constants_3.DEFAULT_DEVELOPER.websiteUrl;
|
|
173
172
|
}
|
|
174
173
|
if (!manifest.developer.privacyUrl) {
|
|
175
|
-
manifest.developer.privacyUrl =
|
|
174
|
+
manifest.developer.privacyUrl = constants_3.DEFAULT_DEVELOPER.privacyUrl;
|
|
176
175
|
}
|
|
177
176
|
if (!manifest.developer.termsOfUseUrl) {
|
|
178
|
-
manifest.developer.termsOfUseUrl =
|
|
177
|
+
manifest.developer.termsOfUseUrl = constants_3.DEFAULT_DEVELOPER.termsOfUseUrl;
|
|
179
178
|
}
|
|
180
179
|
if (!manifest.developer.name) {
|
|
181
|
-
manifest.developer.name =
|
|
180
|
+
manifest.developer.name = constants_3.DEFAULT_DEVELOPER.name;
|
|
182
181
|
}
|
|
183
182
|
if (!manifest.description.short) {
|
|
184
|
-
manifest.description.short =
|
|
183
|
+
manifest.description.short = constants_3.DEFAULT_DESCRIPTION.short;
|
|
185
184
|
}
|
|
186
185
|
if (!manifest.description.full) {
|
|
187
|
-
manifest.description.full =
|
|
186
|
+
manifest.description.full = constants_3.DEFAULT_DESCRIPTION.full;
|
|
188
187
|
}
|
|
189
188
|
}
|
|
190
189
|
await fs_extra_1.default.writeFile(manifestTemplatePath, JSON.stringify(manifest, null, "\t"), "utf-8");
|
|
@@ -230,36 +229,8 @@ function updateTabUrl(answers, tabUrlType, tabs, existingManifestStaticTabs) {
|
|
|
230
229
|
function findTabBasedOnName(name, tabs) {
|
|
231
230
|
return tabs.find((o) => o.name === name);
|
|
232
231
|
}
|
|
233
|
-
function getProjectTypeAndCapability(teamsApp) {
|
|
234
|
-
// tab with bot, tab with message extension, tab with bot and message extension
|
|
235
|
-
if (utils_1.needTabAndBotCode(teamsApp)) {
|
|
236
|
-
return { projectType: "tab-bot-type", templateId: create_1.CapabilityOptions.nonSsoTabAndBot().id };
|
|
237
|
-
}
|
|
238
|
-
// tab only
|
|
239
|
-
if (utils_1.needTabCode(teamsApp)) {
|
|
240
|
-
return { projectType: "tab-type", templateId: create_1.CapabilityOptions.nonSsoTab().id };
|
|
241
|
-
}
|
|
242
|
-
// bot and message extension
|
|
243
|
-
if (utils_1.isBotAndBotBasedMessageExtension(teamsApp)) {
|
|
244
|
-
return { projectType: "bot-me-type", templateId: create_1.CapabilityOptions.botAndMe().id };
|
|
245
|
-
}
|
|
246
|
-
// bot based message extension
|
|
247
|
-
if (utils_1.isBotBasedMessageExtension(teamsApp)) {
|
|
248
|
-
return { projectType: "me-type", templateId: create_1.CapabilityOptions.me().id };
|
|
249
|
-
}
|
|
250
|
-
// bot
|
|
251
|
-
if (utils_1.isBot(teamsApp)) {
|
|
252
|
-
return { projectType: "bot-type", templateId: create_1.CapabilityOptions.basicBot().id };
|
|
253
|
-
}
|
|
254
|
-
return undefined;
|
|
255
|
-
}
|
|
256
|
-
exports.getProjectTypeAndCapability = getProjectTypeAndCapability;
|
|
257
232
|
function decapitalizeScope(scopes) {
|
|
258
233
|
return scopes.map((o) => o.toLowerCase());
|
|
259
234
|
}
|
|
260
|
-
function isFromDevPortal(inputs) {
|
|
261
|
-
return !!(inputs === null || inputs === void 0 ? void 0 : inputs.teamsAppFromTdp);
|
|
262
|
-
}
|
|
263
|
-
exports.isFromDevPortal = isFromDevPortal;
|
|
264
235
|
exports.developerPortalScaffoldUtils = new DeveloperPortalScaffoldUtils();
|
|
265
236
|
//# sourceMappingURL=developerPortalScaffoldUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"developerPortalScaffoldUtils.js","sourceRoot":"","sources":["../../src/component/developerPortalScaffoldUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,wDAYgC;AAChC,gEAA0B;AAC1B,mDAA6B;AAC7B,2DAA6D;AAC7D,yCAAuD;AACvD,+
|
|
1
|
+
{"version":3,"file":"developerPortalScaffoldUtils.js","sourceRoot":"","sources":["../../src/component/developerPortalScaffoldUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAMtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAiBhE,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAAqD;IAChE,QAAQ,CAAC,aAAa,SAAqE;IAE9E,OAAO,CAClB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;YAMb,eAAe;IA+I7B,OAAO,CAAC,YAAY;YA+BN,kBAAkB;CAWjC"}
|
|
@@ -8,19 +8,18 @@ const lib_1 = require("@feathersjs/hooks/lib");
|
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
9
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
10
10
|
const typedi_1 = require("typedi");
|
|
11
|
+
const constants_1 = require("../../../common/constants");
|
|
11
12
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
12
|
-
const tools_1 = require("../../../common/tools");
|
|
13
13
|
const common_1 = require("../../../error/common");
|
|
14
14
|
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
15
15
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
16
16
|
const utils_1 = require("../util/utils");
|
|
17
|
+
const wrapUtil_1 = require("../util/wrapUtil");
|
|
17
18
|
const aadAppNameTooLongError_1 = require("./error/aadAppNameTooLongError");
|
|
18
19
|
const missingEnvError_1 = require("./error/missingEnvError");
|
|
19
20
|
const createAadAppOutput_1 = require("./interface/createAadAppOutput");
|
|
20
21
|
const signInAudience_1 = require("./interface/signInAudience");
|
|
21
22
|
const aadAppClient_1 = require("./utility/aadAppClient");
|
|
22
|
-
const constants_1 = require("./utility/constants");
|
|
23
|
-
const wrapUtil_1 = require("../util/wrapUtil");
|
|
24
23
|
const constants_2 = require("./utility/constants");
|
|
25
24
|
const actionName = "aadApp/create"; // DO NOT MODIFY the name
|
|
26
25
|
const helpLink = "https://aka.ms/teamsfx-actions/aadapp-create";
|
|
@@ -29,7 +28,7 @@ const driverConstants = {
|
|
|
29
28
|
};
|
|
30
29
|
let CreateAadAppDriver = class CreateAadAppDriver {
|
|
31
30
|
constructor() {
|
|
32
|
-
this.description = localizeUtils_1.getLocalizedString(
|
|
31
|
+
this.description = localizeUtils_1.getLocalizedString(constants_2.descriptionMessageKeys.create);
|
|
33
32
|
this.progressTitle = localizeUtils_1.getLocalizedString("driver.aadApp.progressBar.createAadAppTitle");
|
|
34
33
|
}
|
|
35
34
|
async execute(args, context, outputEnvVarNames) {
|
|
@@ -41,7 +40,7 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
41
40
|
const summaries = [];
|
|
42
41
|
let outputs = new Map();
|
|
43
42
|
try {
|
|
44
|
-
(_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.info(localizeUtils_1.getLocalizedString(
|
|
43
|
+
(_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.info(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.startExecuteDriver, actionName));
|
|
45
44
|
this.validateArgs(args);
|
|
46
45
|
if (!outputEnvVarNames) {
|
|
47
46
|
throw new outputEnvironmentVariableUndefinedError_1.OutputEnvironmentVariableUndefinedError(actionName);
|
|
@@ -49,7 +48,7 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
49
48
|
const aadAppClient = new aadAppClient_1.AadAppClient(context.m365TokenProvider, context.logProvider);
|
|
50
49
|
const aadAppState = utils_1.loadStateFromEnv(outputEnvVarNames);
|
|
51
50
|
if (!aadAppState.clientId) {
|
|
52
|
-
(_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.info(localizeUtils_1.getLocalizedString(
|
|
51
|
+
(_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.info(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.startCreateAadApp, outputEnvVarNames.get(createAadAppOutput_1.OutputKeys.clientId)));
|
|
53
52
|
context.addTelemetryProperties({ [constants_2.telemetryKeys.newAadApp]: "true" });
|
|
54
53
|
// Create new Microsoft Entra app if no client id exists
|
|
55
54
|
const signInAudience = args.signInAudience
|
|
@@ -60,17 +59,17 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
60
59
|
aadAppState.objectId = aadApp.id;
|
|
61
60
|
await this.setAadEndpointInfo(context.m365TokenProvider, aadAppState);
|
|
62
61
|
outputs = utils_1.mapStateToEnv(aadAppState, outputEnvVarNames, [createAadAppOutput_1.OutputKeys.clientSecret]);
|
|
63
|
-
const summary = localizeUtils_1.getLocalizedString(
|
|
62
|
+
const summary = localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.successCreateAadApp, aadApp.id);
|
|
64
63
|
(_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.info(summary);
|
|
65
64
|
summaries.push(summary);
|
|
66
65
|
}
|
|
67
66
|
else {
|
|
68
|
-
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.info(localizeUtils_1.getLocalizedString(
|
|
67
|
+
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.info(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.skipCreateAadApp, outputEnvVarNames.get(createAadAppOutput_1.OutputKeys.clientId)));
|
|
69
68
|
context.addTelemetryProperties({ [constants_2.telemetryKeys.newAadApp]: "false" });
|
|
70
69
|
}
|
|
71
70
|
if (args.generateClientSecret) {
|
|
72
71
|
if (!aadAppState.clientSecret) {
|
|
73
|
-
(_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.info(localizeUtils_1.getLocalizedString(
|
|
72
|
+
(_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.info(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.startGenerateClientSecret, outputEnvVarNames.get(createAadAppOutput_1.OutputKeys.clientSecret)));
|
|
74
73
|
// Create new client secret if no client secret exists
|
|
75
74
|
if (!aadAppState.objectId) {
|
|
76
75
|
throw new missingEnvError_1.MissingEnvUserError(actionName, outputEnvVarNames.get(createAadAppOutput_1.OutputKeys.objectId), helpLink, driverConstants.generateSecretErrorMessageKey);
|
|
@@ -79,15 +78,15 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
79
78
|
const clientSecretDescription = (_g = args.clientSecretDescription) !== null && _g !== void 0 ? _g : "default";
|
|
80
79
|
aadAppState.clientSecret = await aadAppClient.generateClientSecret(aadAppState.objectId, clientSecretExpireDays, clientSecretDescription);
|
|
81
80
|
outputs.set(outputEnvVarNames.get(createAadAppOutput_1.OutputKeys.clientSecret), aadAppState.clientSecret);
|
|
82
|
-
const summary = localizeUtils_1.getLocalizedString(
|
|
81
|
+
const summary = localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.successGenerateClientSecret, aadAppState.objectId);
|
|
83
82
|
(_h = context.logProvider) === null || _h === void 0 ? void 0 : _h.info(summary);
|
|
84
83
|
summaries.push(summary);
|
|
85
84
|
}
|
|
86
85
|
else {
|
|
87
|
-
(_j = context.logProvider) === null || _j === void 0 ? void 0 : _j.info(localizeUtils_1.getLocalizedString(
|
|
86
|
+
(_j = context.logProvider) === null || _j === void 0 ? void 0 : _j.info(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.skipCreateAadApp, outputEnvVarNames.get(createAadAppOutput_1.OutputKeys.clientSecret)));
|
|
88
87
|
}
|
|
89
88
|
}
|
|
90
|
-
(_k = context.logProvider) === null || _k === void 0 ? void 0 : _k.info(localizeUtils_1.getLocalizedString(
|
|
89
|
+
(_k = context.logProvider) === null || _k === void 0 ? void 0 : _k.info(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.successExecuteDriver, actionName));
|
|
91
90
|
return {
|
|
92
91
|
result: teamsfx_api_1.ok(outputs),
|
|
93
92
|
summaries: summaries,
|
|
@@ -95,7 +94,7 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
95
94
|
}
|
|
96
95
|
catch (error) {
|
|
97
96
|
if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
|
|
98
|
-
(_l = context.logProvider) === null || _l === void 0 ? void 0 : _l.error(localizeUtils_1.getLocalizedString(
|
|
97
|
+
(_l = context.logProvider) === null || _l === void 0 ? void 0 : _l.error(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
|
|
99
98
|
return {
|
|
100
99
|
result: teamsfx_api_1.err(error),
|
|
101
100
|
summaries: summaries,
|
|
@@ -103,7 +102,7 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
103
102
|
}
|
|
104
103
|
if (axios_1.default.isAxiosError(error)) {
|
|
105
104
|
const message = JSON.stringify(error.response.data);
|
|
106
|
-
(_m = context.logProvider) === null || _m === void 0 ? void 0 : _m.error(localizeUtils_1.getLocalizedString(
|
|
105
|
+
(_m = context.logProvider) === null || _m === void 0 ? void 0 : _m.error(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.failExecuteDriver, actionName, message));
|
|
107
106
|
if (error.response.status >= 400 && error.response.status < 500) {
|
|
108
107
|
return {
|
|
109
108
|
result: teamsfx_api_1.err(new common_1.HttpClientError(error, actionName, message, helpLink)),
|
|
@@ -118,7 +117,7 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
118
117
|
}
|
|
119
118
|
}
|
|
120
119
|
const message = JSON.stringify(error);
|
|
121
|
-
(_o = context.logProvider) === null || _o === void 0 ? void 0 : _o.error(localizeUtils_1.getLocalizedString(
|
|
120
|
+
(_o = context.logProvider) === null || _o === void 0 ? void 0 : _o.error(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.failExecuteDriver, actionName, message));
|
|
122
121
|
return {
|
|
123
122
|
result: teamsfx_api_1.err(common_1.assembleError(error, actionName)),
|
|
124
123
|
summaries: summaries,
|
|
@@ -150,14 +149,14 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
150
149
|
// src\component\resource\aadApp\utils\tokenProvider.ts
|
|
151
150
|
// src\component\resource\aadApp\utils\configs.ts
|
|
152
151
|
async setAadEndpointInfo(tokenProvider, state) {
|
|
153
|
-
const tokenObjectResponse = await tokenProvider.getJsonObject({ scopes:
|
|
152
|
+
const tokenObjectResponse = await tokenProvider.getJsonObject({ scopes: constants_1.GraphScopes });
|
|
154
153
|
if (tokenObjectResponse.isErr()) {
|
|
155
154
|
throw tokenObjectResponse.error;
|
|
156
155
|
}
|
|
157
156
|
const tenantId = tokenObjectResponse.value.tid; // The tid claim is AAD tenant id
|
|
158
157
|
state.tenantId = tenantId;
|
|
159
|
-
state.authorityHost =
|
|
160
|
-
state.authority = `${
|
|
158
|
+
state.authorityHost = constants_2.constants.oauthAuthorityPrefix;
|
|
159
|
+
state.authority = `${constants_2.constants.oauthAuthorityPrefix}/${tenantId}`;
|
|
161
160
|
}
|
|
162
161
|
};
|
|
163
162
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAA4F;AAC5F,0DAA0B;AAC1B,mCAAiC;AACjC,iEAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAmB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAmB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAG5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAQlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAO7D,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAiB,kBAAkB;QACjC,aAAa,CAAC,EAAE,iBAAiB,CAAC;KACnC;CACF;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;gBAE1D,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAAE,WAAW;IAwC9D,YAAY,CACvB,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,cAA4C,EAC5D,0BAA0B,CAAC,EAAE,MAAM,GAClC,OAAO,CAAC,cAAc,CAAC;IAab,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvC,oBAAoB,CAC/B,QAAQ,EAAE,MAAM,EAChB,sBAAsB,SAAM,EAAE,yCAAyC;IACvE,uBAAuB,SAAY,GAClC,OAAO,CAAC,MAAM,CAAC;IA2CL,YAAY,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BlD,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;IA0B5D,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5E,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,UAAU;CAGnB"}
|
|
@@ -7,15 +7,15 @@ const tslib_1 = require("tslib");
|
|
|
7
7
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
8
8
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
9
9
|
const axios_retry_1 = tslib_1.__importDefault(require("axios-retry"));
|
|
10
|
+
const constants_1 = require("../../../../common/constants");
|
|
10
11
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
11
|
-
const tools_1 = require("../../../../common/tools");
|
|
12
12
|
const globalVars_1 = require("../../../../core/globalVars");
|
|
13
13
|
const aadManifestError_1 = require("../error/aadManifestError");
|
|
14
|
+
const clientSecretNotAllowedError_1 = require("../error/clientSecretNotAllowedError");
|
|
15
|
+
const credentialInvalidLifetimeError_1 = require("../error/credentialInvalidLifetimeError");
|
|
14
16
|
const signInAudience_1 = require("../interface/signInAudience");
|
|
15
17
|
const aadManifestHelper_1 = require("./aadManifestHelper");
|
|
16
|
-
const
|
|
17
|
-
const credentialInvalidLifetimeError_1 = require("../error/credentialInvalidLifetimeError");
|
|
18
|
-
const clientSecretNotAllowedError_1 = require("../error/clientSecretNotAllowedError");
|
|
18
|
+
const constants_2 = require("./constants");
|
|
19
19
|
class AadAppClient {
|
|
20
20
|
constructor(m365TokenProvider, logProvider) {
|
|
21
21
|
this.retryNumber = 5;
|
|
@@ -29,7 +29,7 @@ class AadAppClient {
|
|
|
29
29
|
this.axios.interceptors.request.use(async (config) => {
|
|
30
30
|
var _a;
|
|
31
31
|
(_a = this.logProvider) === null || _a === void 0 ? void 0 : _a.debug(localizeUtils_1.getLocalizedString("core.common.SendingApiRequest", config.url, JSON.stringify(config.data)));
|
|
32
|
-
const tokenResponse = await this.tokenProvider.getAccessToken({ scopes:
|
|
32
|
+
const tokenResponse = await this.tokenProvider.getAccessToken({ scopes: constants_1.GraphScopes });
|
|
33
33
|
if (tokenResponse.isErr()) {
|
|
34
34
|
throw tokenResponse.error;
|
|
35
35
|
}
|
|
@@ -91,10 +91,10 @@ class AadAppClient {
|
|
|
91
91
|
}
|
|
92
92
|
catch (err) {
|
|
93
93
|
if (axios_1.default.isAxiosError(err) && err.response) {
|
|
94
|
-
if (((_b = (_a = err.response.data) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.code) ===
|
|
94
|
+
if (((_b = (_a = err.response.data) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.code) === constants_2.aadErrorCode.credentialInvalidLifetimeAsPerAppPolicy) {
|
|
95
95
|
throw new credentialInvalidLifetimeError_1.CredentialInvalidLifetimeError(AadAppClient.name);
|
|
96
96
|
}
|
|
97
|
-
if (((_d = (_c = err.response.data) === null || _c === void 0 ? void 0 : _c.error) === null || _d === void 0 ? void 0 : _d.code) ===
|
|
97
|
+
if (((_d = (_c = err.response.data) === null || _c === void 0 ? void 0 : _c.error) === null || _d === void 0 ? void 0 : _d.code) === constants_2.aadErrorCode.credentialTypeNotAllowedAsPerAppPolicy) {
|
|
98
98
|
throw new clientSecretNotAllowedError_1.ClientSecretNotAllowedError(AadAppClient.name);
|
|
99
99
|
}
|
|
100
100
|
}
|
|
@@ -119,10 +119,10 @@ class AadAppClient {
|
|
|
119
119
|
}
|
|
120
120
|
catch (err) {
|
|
121
121
|
if (axios_1.default.isAxiosError(err) && err.response && err.response.status === 400) {
|
|
122
|
-
if (((_a = err.response.data.error) === null || _a === void 0 ? void 0 : _a.code) ===
|
|
122
|
+
if (((_a = err.response.data.error) === null || _a === void 0 ? void 0 : _a.code) === constants_2.aadErrorCode.permissionErrorCode) {
|
|
123
123
|
throw new aadManifestError_1.DeleteOrUpdatePermissionFailedError(AadAppClient.name);
|
|
124
124
|
}
|
|
125
|
-
if (((_b = err.response.data.error) === null || _b === void 0 ? void 0 : _b.code) ===
|
|
125
|
+
if (((_b = err.response.data.error) === null || _b === void 0 ? void 0 : _b.code) === constants_2.aadErrorCode.hostNameNotOnVerifiedDomain) {
|
|
126
126
|
throw new aadManifestError_1.HostNameNotOnVerifiedDomainError(AadAppClient.name, err.response.data.error.message);
|
|
127
127
|
}
|
|
128
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAE9C,0DAA8E;AAC9E,sEAA4D;AAC5D,oEAAsE;AAEtE,
|
|
1
|
+
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { UpdateAadAppOutput } from "../interface/updateAadAppOutput";
|
|
2
1
|
import { DriverContext } from "../../interface/commonArgs";
|
|
3
2
|
import { AADManifest } from "../interface/AADManifest";
|
|
3
|
+
import { UpdateAadAppOutput } from "../interface/updateAadAppOutput";
|
|
4
4
|
export declare function buildAadManifest(context: DriverContext, manifestPath: string, outputFilePath: string, state?: UpdateAadAppOutput): Promise<AADManifest>;
|
|
5
5
|
//# sourceMappingURL=buildAadManifest.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildAadManifest.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildAadManifest.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAOrE,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,WAAW,CAAC,CA0BtB"}
|
|
@@ -6,21 +6,21 @@ exports.buildAadManifest = void 0;
|
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
8
8
|
const path = tslib_1.__importStar(require("path"));
|
|
9
|
-
const aadManifestHelper_1 = require("./aadManifestHelper");
|
|
10
|
-
const invalidFieldInManifestError_1 = require("../error/invalidFieldInManifestError");
|
|
11
9
|
const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
|
|
12
10
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
11
|
+
const stringUtils_1 = require("../../../../common/stringUtils");
|
|
12
|
+
const common_1 = require("../../../../error/common");
|
|
13
|
+
const common_2 = require("../../../utils/common");
|
|
14
|
+
const invalidFieldInManifestError_1 = require("../error/invalidFieldInManifestError");
|
|
13
15
|
const constants_1 = require("../utility/constants");
|
|
14
|
-
const
|
|
15
|
-
const tools_1 = require("../../../../common/tools");
|
|
16
|
-
const common_2 = require("../../../../error/common");
|
|
16
|
+
const aadManifestHelper_1 = require("./aadManifestHelper");
|
|
17
17
|
const actionName = "aadApp/update"; // DO NOT MODIFY the name
|
|
18
18
|
const helpLink = "https://aka.ms/teamsfx-actions/aadapp-update";
|
|
19
19
|
async function buildAadManifest(context, manifestPath, outputFilePath, state) {
|
|
20
20
|
var _a;
|
|
21
21
|
const manifestAbsolutePath = getAbsolutePath(manifestPath, context.projectPath);
|
|
22
22
|
if (!(await fs.pathExists(manifestAbsolutePath))) {
|
|
23
|
-
throw new
|
|
23
|
+
throw new common_1.FileNotFoundError(actionName, manifestAbsolutePath, helpLink);
|
|
24
24
|
}
|
|
25
25
|
const manifest = await loadManifest(manifestAbsolutePath, state);
|
|
26
26
|
const warningMessage = aadManifestHelper_1.AadManifestHelper.validateManifest(manifest);
|
|
@@ -55,7 +55,7 @@ async function loadManifest(manifestPath, state) {
|
|
|
55
55
|
if (!process.env.AAD_APP_ACCESS_AS_USER_PERMISSION_ID) {
|
|
56
56
|
const matches = permissionIdPlaceholderRegex.exec(manifestTemplate);
|
|
57
57
|
if (matches) {
|
|
58
|
-
const permissionId =
|
|
58
|
+
const permissionId = stringUtils_1.getUuid();
|
|
59
59
|
process.env.AAD_APP_ACCESS_AS_USER_PERMISSION_ID = permissionId;
|
|
60
60
|
if (state) {
|
|
61
61
|
state.AAD_APP_ACCESS_AS_USER_PERMISSION_ID = permissionId;
|
|
@@ -63,10 +63,10 @@ async function loadManifest(manifestPath, state) {
|
|
|
63
63
|
generatedNewPermissionId = true;
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
|
-
const manifestString =
|
|
67
|
-
const unresolvedEnvironmentVariable =
|
|
66
|
+
const manifestString = common_2.expandEnvironmentVariable(manifestTemplate);
|
|
67
|
+
const unresolvedEnvironmentVariable = common_2.getEnvironmentVariables(manifestString);
|
|
68
68
|
if (unresolvedEnvironmentVariable && unresolvedEnvironmentVariable.length > 0) {
|
|
69
|
-
const error = new
|
|
69
|
+
const error = new common_1.MissingEnvironmentVariablesError("aadAppUpdate", unresolvedEnvironmentVariable.join(", "), manifestPath, helpLink);
|
|
70
70
|
throw error;
|
|
71
71
|
}
|
|
72
72
|
let manifest;
|
|
@@ -75,7 +75,7 @@ async function loadManifest(manifestPath, state) {
|
|
|
75
75
|
}
|
|
76
76
|
catch (error) {
|
|
77
77
|
// JSON.parse only throws SyntaxError per doc, which is a subsclass of Error
|
|
78
|
-
throw new
|
|
78
|
+
throw new common_1.JSONSyntaxError(manifestPath, error, actionName);
|
|
79
79
|
}
|
|
80
80
|
aadManifestHelper_1.AadManifestHelper.processRequiredResourceAccessInManifest(manifest);
|
|
81
81
|
return manifest;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildAadManifest.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;
|
|
1
|
+
{"version":3,"file":"buildAadManifest.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { StepDriver, ExecutionResult } from "../interface/stepDriver";
|
|
1
|
+
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
3
2
|
import { DriverContext } from "../interface/commonArgs";
|
|
3
|
+
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
4
4
|
import { WrapDriverContext } from "../util/wrapUtil";
|
|
5
5
|
import { AddWebPartArgs } from "./interface/AddWebPartArgs";
|
|
6
6
|
export declare class AddWebPartDriver implements StepDriver {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addWebPart.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/add/addWebPart.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"addWebPart.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/add/addWebPart.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAsB,MAAM,EAAS,MAAM,wBAAwB,CAAC;AAWpF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,qBACa,gBAAiB,YAAW,UAAU;IACjD,WAAW,SAAqD;IAGnD,GAAG,CACd,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAKnC,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAS/E,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CA+EjG"}
|