@microsoft/teamsfx-core 1.2.2-alpha.01a113d2.0 → 1.2.2-alpha.4ce002ea.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/local/constants.d.ts +0 -1
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +0 -1
- package/build/common/local/constants.js.map +1 -1
- package/build/common/local/localEnvManager.js +1 -1
- package/build/common/local/localEnvManager.js.map +1 -1
- package/build/common/local/portChecker.d.ts +2 -2
- package/build/common/local/portChecker.d.ts.map +1 -1
- package/build/common/local/portChecker.js +18 -5
- package/build/common/local/portChecker.js.map +1 -1
- package/build/common/local/taskDefinition.d.ts +0 -7
- package/build/common/local/taskDefinition.d.ts.map +1 -1
- package/build/common/local/taskDefinition.js +1 -51
- package/build/common/local/taskDefinition.js.map +1 -1
- package/build/common/localSettingsConstants.d.ts +2 -1
- package/build/common/localSettingsConstants.d.ts.map +1 -1
- package/build/common/localSettingsConstants.js +3 -2
- package/build/common/localSettingsConstants.js.map +1 -1
- package/build/common/localSettingsProvider.d.ts +3 -3
- package/build/common/localSettingsProvider.d.ts.map +1 -1
- package/build/common/localSettingsProvider.js +13 -11
- package/build/common/localSettingsProvider.js.map +1 -1
- package/build/common/permissionInterface.d.ts +1 -3
- package/build/common/permissionInterface.d.ts.map +1 -1
- package/build/common/permissionInterface.js +0 -2
- package/build/common/permissionInterface.js.map +1 -1
- package/build/common/projectSettingsValidator.d.ts +4 -0
- package/build/common/projectSettingsValidator.d.ts.map +1 -0
- package/build/common/projectSettingsValidator.js +65 -0
- package/build/common/projectSettingsValidator.js.map +1 -0
- package/build/common/telemetry.d.ts +3 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +2 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/template-utils/templatesActions.js +2 -2
- package/build/common/template-utils/templatesUtils.d.ts +2 -1
- package/build/common/template-utils/templatesUtils.d.ts.map +1 -1
- package/build/common/template-utils/templatesUtils.js +25 -7
- package/build/common/template-utils/templatesUtils.js.map +1 -1
- package/build/common/tools.d.ts +0 -4
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +1 -8
- package/build/common/tools.js.map +1 -1
- package/build/core/error.d.ts +2 -0
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +10 -2
- package/build/core/error.js.map +1 -1
- package/build/core/index.d.ts +0 -1
- package/build/core/index.d.ts.map +1 -1
- package/build/core/index.js +5 -25
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/CommonErrorHandlerMW.d.ts +14 -0
- package/build/core/middleware/CommonErrorHandlerMW.d.ts.map +1 -0
- package/build/core/middleware/CommonErrorHandlerMW.js +55 -0
- package/build/core/middleware/CommonErrorHandlerMW.js.map +1 -0
- package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoader.js +2 -1
- package/build/core/middleware/envInfoLoader.js.map +1 -1
- package/build/core/middleware/localSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/localSettingsLoader.js +4 -2
- package/build/core/middleware/localSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts.map +1 -1
- package/build/core/middleware/projectMigrator.js +1 -5
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +1 -1
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/pvm/broker.d.ts +24 -0
- package/build/core/pvm/broker.d.ts.map +1 -0
- package/build/core/pvm/broker.js +93 -0
- package/build/core/pvm/broker.js.map +1 -0
- package/build/core/pvm/constant.d.ts +9 -0
- package/build/core/pvm/constant.d.ts.map +1 -0
- package/build/core/pvm/constant.js +12 -0
- package/build/core/pvm/constant.js.map +1 -0
- package/build/core/pvm/depot.d.ts +43 -0
- package/build/core/pvm/depot.d.ts.map +1 -0
- package/build/core/pvm/depot.js +242 -0
- package/build/core/pvm/depot.js.map +1 -0
- package/build/core/pvm/pvm.d.ts +50 -0
- package/build/core/pvm/pvm.d.ts.map +1 -0
- package/build/core/pvm/pvm.js +92 -0
- package/build/core/pvm/pvm.js.map +1 -0
- package/build/core/pvm/type.d.ts +11 -0
- package/build/core/pvm/type.d.ts.map +1 -0
- package/build/core/pvm/type.js +3 -0
- package/build/core/pvm/type.js.map +1 -0
- package/build/core/pvm/utility.d.ts +2 -0
- package/build/core/pvm/utility.d.ts.map +1 -0
- package/build/core/pvm/utility.js +10 -0
- package/build/core/pvm/utility.js.map +1 -0
- package/build/core/tools.d.ts.map +1 -1
- package/build/core/tools.js +2 -6
- package/build/core/tools.js.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.d.ts +8 -8
- package/build/plugins/resource/aad/aadAppClient.d.ts.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.js +29 -29
- package/build/plugins/resource/aad/aadAppClient.js.map +1 -1
- package/build/plugins/resource/aad/index.d.ts +1 -0
- package/build/plugins/resource/aad/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/index.js +1 -0
- package/build/plugins/resource/aad/index.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts +4 -3
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +13 -13
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/aad/utils/common.d.ts +6 -4
- package/build/plugins/resource/aad/utils/common.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/common.js +60 -21
- package/build/plugins/resource/aad/utils/common.js.map +1 -1
- package/build/plugins/resource/aad/utils/configs.d.ts +9 -1
- package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/configs.js +232 -0
- package/build/plugins/resource/aad/utils/configs.js.map +1 -1
- package/build/plugins/resource/aad/utils/telemetry.d.ts +0 -1
- package/build/plugins/resource/aad/utils/telemetry.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/telemetry.js +10 -17
- package/build/plugins/resource/aad/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/aad/utils/tokenProvider.d.ts +6 -2
- package/build/plugins/resource/aad/utils/tokenProvider.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/tokenProvider.js +11 -11
- package/build/plugins/resource/aad/utils/tokenProvider.js.map +1 -1
- package/build/plugins/resource/aad/v2/index.d.ts +10 -11
- package/build/plugins/resource/aad/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/v2/index.js.map +1 -1
- package/build/plugins/resource/aad/v3/index.d.ts +24 -0
- package/build/plugins/resource/aad/v3/index.d.ts.map +1 -0
- package/build/plugins/resource/aad/v3/index.js +248 -0
- package/build/plugins/resource/aad/v3/index.js.map +1 -0
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.js +11 -3
- package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +2 -2
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts +8 -4
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.js +13 -12
- package/build/plugins/resource/appstudio/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.d.ts +10 -1
- package/build/plugins/resource/appstudio/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.js +36 -2
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -1
- package/build/plugins/resource/bot/aadRegistration.d.ts.map +1 -1
- package/build/plugins/resource/bot/aadRegistration.js +5 -4
- package/build/plugins/resource/bot/aadRegistration.js.map +1 -1
- package/build/plugins/resource/bot/enums/programmingLanguage.d.ts +2 -1
- package/build/plugins/resource/bot/enums/programmingLanguage.d.ts.map +1 -1
- package/build/plugins/resource/bot/enums/programmingLanguage.js +1 -0
- package/build/plugins/resource/bot/enums/programmingLanguage.js.map +1 -1
- package/build/plugins/resource/bot/index.js +3 -2
- package/build/plugins/resource/bot/index.js.map +1 -1
- package/build/plugins/resource/frontend/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/index.js +3 -2
- package/build/plugins/resource/frontend/index.js.map +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.d.ts +4 -3
- package/build/plugins/resource/frontend/resources/templateInfo.d.ts.map +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js +8 -7
- package/build/plugins/resource/frontend/resources/templateInfo.js.map +1 -1
- package/build/plugins/resource/localdebug/constants.d.ts +0 -1
- package/build/plugins/resource/localdebug/constants.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/constants.js +0 -1
- package/build/plugins/resource/localdebug/constants.js.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.js +1 -4
- package/build/plugins/resource/localdebug/v2/index.js.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.js +2 -2
- package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
- package/build/plugins/resource/utils4v2.d.ts +15 -16
- package/build/plugins/resource/utils4v2.d.ts.map +1 -1
- package/build/plugins/resource/utils4v2.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +25 -13
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +2 -4
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +3 -5
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js +12 -4
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/tasks.js +1 -4
- package/build/plugins/solution/fx-solution/debug/util/tasks.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 -10
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/checkPermission.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/checkPermission.js +25 -13
- package/build/plugins/solution/fx-solution/v2/checkPermission.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/grantPermission.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/grantPermission.js +26 -14
- package/build/plugins/solution/fx-solution/v2/grantPermission.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.js +20 -10
- package/build/plugins/solution/fx-solution/v2/listCollaborator.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts +0 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.js +0 -2
- package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addResource.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addResource.js +13 -10
- package/build/plugins/solution/fx-solution/v3/addResource.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/constants.js +1 -1
- package/build/plugins/solution/fx-solution/v3/constants.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 +5 -0
- package/build/plugins/solution/fx-solution/v3/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provisionLocal.js +17 -36
- package/build/plugins/solution/fx-solution/v3/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.d.ts +5 -0
- package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.js +10 -0
- package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.js.map +1 -0
- package/package.json +7 -3
- package/resource/strings.json +28 -1
- package/templates/plugins/solution/{main.bicep → mainConfig.bicep} +0 -12
- package/templates/plugins/solution/mainProvision.bicep +10 -0
- package/build/plugins/solution/fx-solution/v2/listAllCollaborators.d.ts +0 -5
- package/build/plugins/solution/fx-solution/v2/listAllCollaborators.d.ts.map +0 -1
- package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js +0 -118
- package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js.map +0 -1
|
@@ -3,7 +3,8 @@
|
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.Utils = void 0;
|
|
6
|
-
const constants_1 = require("
|
|
6
|
+
const constants_1 = require("../../../solution/fx-solution/v3/constants");
|
|
7
|
+
const constants_2 = require("../constants");
|
|
7
8
|
const errors_1 = require("../errors");
|
|
8
9
|
const results_1 = require("../results");
|
|
9
10
|
const configs_1 = require("./configs");
|
|
@@ -24,55 +25,93 @@ class Utils {
|
|
|
24
25
|
telemetry_1.TelemetryUtils.sendSuccessEvent(message.telemetry);
|
|
25
26
|
}
|
|
26
27
|
static addLocalDebugPrefix(isLocalDebug, key) {
|
|
27
|
-
return isLocalDebug ?
|
|
28
|
+
return isLocalDebug ? constants_2.Constants.localDebugPrefix + key : key;
|
|
28
29
|
}
|
|
29
30
|
static getPermissionErrorMessage(message, isGrantPermission = false, objectId) {
|
|
30
31
|
return isGrantPermission
|
|
31
|
-
? `${
|
|
32
|
+
? `${constants_2.Constants.permissions.name}: ${objectId}. Error: ${message}`
|
|
32
33
|
: message;
|
|
33
34
|
}
|
|
34
|
-
static getConfigFileName(
|
|
35
|
-
if (
|
|
36
|
-
return
|
|
35
|
+
static getConfigFileName(envName) {
|
|
36
|
+
if (!envName) {
|
|
37
|
+
return constants_2.ConfigFilePath.LocalSettings;
|
|
37
38
|
}
|
|
38
39
|
else {
|
|
39
|
-
return
|
|
40
|
+
return constants_2.ConfigFilePath.State(envName);
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
|
-
static getInputFileName(
|
|
43
|
-
return
|
|
43
|
+
static getInputFileName(envName) {
|
|
44
|
+
return constants_2.ConfigFilePath.Input(envName);
|
|
44
45
|
}
|
|
45
|
-
static async getCurrentTenantId(
|
|
46
|
+
static async getCurrentTenantId(graphTokenProvider) {
|
|
46
47
|
var _a;
|
|
47
|
-
const tokenObject = await (
|
|
48
|
-
const tenantId = tokenObject.tid;
|
|
48
|
+
const tokenObject = await (graphTokenProvider === null || graphTokenProvider === void 0 ? void 0 : graphTokenProvider.getJsonObject());
|
|
49
|
+
const tenantId = (_a = tokenObject) === null || _a === void 0 ? void 0 : _a.tid;
|
|
49
50
|
return tenantId;
|
|
50
51
|
}
|
|
52
|
+
static skipCreateAadForProvision(envInfo) {
|
|
53
|
+
var _a, _b, _c, _d;
|
|
54
|
+
const envConfig = envInfo.config;
|
|
55
|
+
const envState = envInfo.state[constants_1.BuiltInResourcePluginNames.aad];
|
|
56
|
+
const objectId = (_a = envConfig.auth) === null || _a === void 0 ? void 0 : _a.objectId;
|
|
57
|
+
const clientId = (_b = envConfig.auth) === null || _b === void 0 ? void 0 : _b.clientId;
|
|
58
|
+
const clientSecret = (_c = envConfig.auth) === null || _c === void 0 ? void 0 : _c.clientSecret;
|
|
59
|
+
const oauth2PermissionScopeId = (_d = envConfig.auth) === null || _d === void 0 ? void 0 : _d.accessAsUserScopeId;
|
|
60
|
+
if (objectId && clientId && oauth2PermissionScopeId && clientSecret) {
|
|
61
|
+
envState.objectId = objectId;
|
|
62
|
+
envState.clientId = clientId;
|
|
63
|
+
envState.clientSecret = clientSecret;
|
|
64
|
+
envState.oauth2PermissionScopeId = oauth2PermissionScopeId;
|
|
65
|
+
return true;
|
|
66
|
+
}
|
|
67
|
+
else if (objectId || clientId || oauth2PermissionScopeId || clientSecret) {
|
|
68
|
+
throw results_1.ResultFactory.UserError(errors_1.GetSkipAppConfigError.name, errors_1.GetSkipAppConfigError.message(Utils.getInputFileName(envInfo.envName)));
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
return false;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
static skipCreateAadForLocalProvision(localSettings) {
|
|
75
|
+
var _a, _b, _c, _d;
|
|
76
|
+
const objectId = (_a = localSettings.auth) === null || _a === void 0 ? void 0 : _a.objectId;
|
|
77
|
+
const clientId = (_b = localSettings.auth) === null || _b === void 0 ? void 0 : _b.clientId;
|
|
78
|
+
const clientSecret = (_c = localSettings.auth) === null || _c === void 0 ? void 0 : _c.clientSecret;
|
|
79
|
+
const oauth2PermissionScopeId = (_d = localSettings.auth) === null || _d === void 0 ? void 0 : _d.oauth2PermissionScopeId;
|
|
80
|
+
if (objectId && clientId && oauth2PermissionScopeId && clientSecret) {
|
|
81
|
+
return true;
|
|
82
|
+
}
|
|
83
|
+
else if (objectId || clientId || oauth2PermissionScopeId || clientSecret) {
|
|
84
|
+
throw results_1.ResultFactory.UserError(errors_1.GetSkipAppConfigError.name, errors_1.GetSkipAppConfigError.message(constants_2.ConfigFilePath.LocalSettings));
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
51
90
|
static skipAADProvision(ctx, isLocalDebug = false) {
|
|
52
91
|
var _a, _b, _c, _d;
|
|
53
92
|
const objectId = isLocalDebug
|
|
54
|
-
? configs_1.ConfigUtils.getAadConfig(ctx,
|
|
93
|
+
? configs_1.ConfigUtils.getAadConfig(ctx, constants_2.ConfigKeys.objectId, true)
|
|
55
94
|
: (_a = ctx.envInfo.config.auth) === null || _a === void 0 ? void 0 : _a.objectId;
|
|
56
95
|
const clientId = isLocalDebug
|
|
57
|
-
? configs_1.ConfigUtils.getAadConfig(ctx,
|
|
96
|
+
? configs_1.ConfigUtils.getAadConfig(ctx, constants_2.ConfigKeys.clientId, true)
|
|
58
97
|
: (_b = ctx.envInfo.config.auth) === null || _b === void 0 ? void 0 : _b.clientId;
|
|
59
98
|
const oauth2PermissionScopeId = isLocalDebug
|
|
60
|
-
? configs_1.ConfigUtils.getAadConfig(ctx,
|
|
99
|
+
? configs_1.ConfigUtils.getAadConfig(ctx, constants_2.ConfigKeys.oauth2PermissionScopeId, true)
|
|
61
100
|
: (_c = ctx.envInfo.config.auth) === null || _c === void 0 ? void 0 : _c.accessAsUserScopeId;
|
|
62
101
|
const clientSecret = isLocalDebug
|
|
63
|
-
? configs_1.ConfigUtils.getAadConfig(ctx,
|
|
102
|
+
? configs_1.ConfigUtils.getAadConfig(ctx, constants_2.ConfigKeys.clientSecret, true)
|
|
64
103
|
: (_d = ctx.envInfo.config.auth) === null || _d === void 0 ? void 0 : _d.clientSecret;
|
|
65
104
|
if (objectId && clientId && oauth2PermissionScopeId && clientSecret) {
|
|
66
105
|
if (!isLocalDebug) {
|
|
67
|
-
configs_1.ConfigUtils.checkAndSaveConfig(ctx,
|
|
68
|
-
configs_1.ConfigUtils.checkAndSaveConfig(ctx,
|
|
69
|
-
configs_1.ConfigUtils.checkAndSaveConfig(ctx,
|
|
70
|
-
configs_1.ConfigUtils.checkAndSaveConfig(ctx,
|
|
106
|
+
configs_1.ConfigUtils.checkAndSaveConfig(ctx, constants_2.ConfigKeys.objectId, objectId);
|
|
107
|
+
configs_1.ConfigUtils.checkAndSaveConfig(ctx, constants_2.ConfigKeys.clientId, clientId);
|
|
108
|
+
configs_1.ConfigUtils.checkAndSaveConfig(ctx, constants_2.ConfigKeys.clientSecret, clientSecret);
|
|
109
|
+
configs_1.ConfigUtils.checkAndSaveConfig(ctx, constants_2.ConfigKeys.oauth2PermissionScopeId, oauth2PermissionScopeId);
|
|
71
110
|
}
|
|
72
111
|
return true;
|
|
73
112
|
}
|
|
74
113
|
else if (objectId || clientId || oauth2PermissionScopeId || clientSecret) {
|
|
75
|
-
throw results_1.ResultFactory.UserError(errors_1.GetSkipAppConfigError.name, errors_1.GetSkipAppConfigError.message(Utils.getInputFileName(ctx)));
|
|
114
|
+
throw results_1.ResultFactory.UserError(errors_1.GetSkipAppConfigError.name, errors_1.GetSkipAppConfigError.message(Utils.getInputFileName(ctx.envInfo.envName)));
|
|
76
115
|
}
|
|
77
116
|
else {
|
|
78
117
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PluginContext, ConfigValue } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { PluginContext, ConfigValue, v2, Result, FxError, v3 } from "@microsoft/teamsfx-api";
|
|
2
2
|
export declare class ConfigUtils {
|
|
3
3
|
static getAadConfig(ctx: PluginContext, key: string, isLocalDebug?: boolean): string | undefined;
|
|
4
4
|
static getLocalDebugConfigOfOtherPlugins(ctx: PluginContext, key: string): string | undefined;
|
|
@@ -14,8 +14,12 @@ export declare class ProvisionConfig {
|
|
|
14
14
|
oauth2PermissionScopeId?: string;
|
|
15
15
|
private isLocalDebug;
|
|
16
16
|
constructor(isLocalDebug?: boolean);
|
|
17
|
+
restoreConfigFromLocalSettings(ctx: v2.Context, inputs: v2.InputsWithProjectPath, localSettings: v2.LocalSettings): Promise<Result<any, FxError>>;
|
|
18
|
+
restoreConfigFromEnvInfo(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v3.EnvInfoV3): Promise<Result<any, FxError>>;
|
|
17
19
|
restoreConfigFromContext(ctx: PluginContext): Promise<void>;
|
|
18
20
|
saveConfigIntoContext(ctx: PluginContext, tenantId: string): void;
|
|
21
|
+
saveConfigIntoLocalSettings(localSettings: v2.LocalSettings, tenantId: string): void;
|
|
22
|
+
saveConfigIntoEnvInfo(envInfo: v3.EnvInfoV3, tenantId: string): void;
|
|
19
23
|
private static getOauthAuthority;
|
|
20
24
|
}
|
|
21
25
|
export declare class SetApplicationInContextConfig {
|
|
@@ -26,6 +30,8 @@ export declare class SetApplicationInContextConfig {
|
|
|
26
30
|
private isLocalDebug;
|
|
27
31
|
constructor(isLocalDebug?: boolean);
|
|
28
32
|
restoreConfigFromContext(ctx: PluginContext): void;
|
|
33
|
+
restoreConfigFromLocalSettings(localSettings: v2.LocalSettings): void;
|
|
34
|
+
restoreConfigFromEnvInfo(ctx: v2.Context, envInfo: v3.EnvInfoV3): void;
|
|
29
35
|
saveConfigIntoContext(ctx: PluginContext): void;
|
|
30
36
|
}
|
|
31
37
|
export declare class PostProvisionConfig {
|
|
@@ -36,6 +42,8 @@ export declare class PostProvisionConfig {
|
|
|
36
42
|
applicationIdUri?: string;
|
|
37
43
|
private isLocalDebug;
|
|
38
44
|
constructor(isLocalDebug?: boolean);
|
|
45
|
+
restoreConfigFromLocalSettings(localSettings: v2.LocalSettings): void;
|
|
46
|
+
restoreConfigFromEnvInfo(ctx: v2.Context, envInfo: v3.EnvInfoV3): void;
|
|
39
47
|
restoreConfigFromContext(ctx: PluginContext): Promise<void>;
|
|
40
48
|
}
|
|
41
49
|
export declare class UpdatePermissionConfig {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configs.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/configs.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"configs.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/configs.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EACb,WAAW,EAGX,EAAE,EAEF,MAAM,EACN,OAAO,EAEP,EAAE,EACH,MAAM,wBAAwB,CAAC;AAmBhC,qBAAa,WAAW;WACR,YAAY,CACxB,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,MAAM,EACX,YAAY,UAAQ,GACnB,MAAM,GAAG,SAAS;WAQP,iCAAiC,CAC7C,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS;WAeP,kBAAkB,CAC9B,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW,EAClB,YAAY,UAAQ;WAaF,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;CAe9E;AAED,qBAAa,eAAe;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACxC,OAAO,CAAC,YAAY,CAAU;gBAElB,YAAY,UAAQ;IAInB,8BAA8B,CACzC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,aAAa,EAAE,EAAE,CAAC,aAAa,GAC9B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAyBnB,wBAAwB,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,GACpB,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IA0BnB,wBAAwB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCjE,qBAAqB,CAAC,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IA2BjE,2BAA2B,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAgBpF,qBAAqB,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAgB3E,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAGjC;AAED,qBAAa,6BAA6B;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,YAAY,CAAU;gBAElB,YAAY,UAAQ;IAIzB,wBAAwB,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI;IAyClD,8BAA8B,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,GAAG,IAAI;IAoBrE,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,SAAS,GAAG,IAAI;IA2CtE,qBAAqB,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI;CAQvD;AAED,qBAAa,mBAAmB;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,YAAY,CAAU;gBAElB,YAAY,UAAQ;IAGzB,8BAA8B,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,GAAG,IAAI;IA0CrE,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,SAAS,GAAG,IAAI;IAkEhE,wBAAwB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CA0EzE;AAED,qBAAa,sBAAsB;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAClC,OAAO,CAAC,YAAY,CAAU;gBAElB,YAAY,UAAQ;IAInB,wBAAwB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBzE;AAED,qBAAa,0BAA0B;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,OAAO,CAAC;gBAEtB,iBAAiB,UAAQ;IAIxB,wBAAwB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAczE"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.CheckGrantPermissionConfig = exports.UpdatePermissionConfig = exports.PostProvisionConfig = exports.SetApplicationInContextConfig = exports.ProvisionConfig = exports.ConfigUtils = void 0;
|
|
6
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
6
7
|
const constants_1 = require("../constants");
|
|
7
8
|
const errors_1 = require("../errors");
|
|
8
9
|
const format_1 = require("./format");
|
|
@@ -10,6 +11,9 @@ const common_1 = require("./common");
|
|
|
10
11
|
const results_1 = require("../results");
|
|
11
12
|
const uuid_1 = require("uuid");
|
|
12
13
|
const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
|
|
14
|
+
const v3_1 = require("../v3");
|
|
15
|
+
const constants_2 = require("../../../solution/fx-solution/v3/constants");
|
|
16
|
+
const question_1 = require("../../../solution/fx-solution/question");
|
|
13
17
|
class ConfigUtils {
|
|
14
18
|
static getAadConfig(ctx, key, isLocalDebug = false) {
|
|
15
19
|
var _a, _b, _c;
|
|
@@ -66,6 +70,54 @@ class ProvisionConfig {
|
|
|
66
70
|
this.isLocalDebug = isLocalDebug;
|
|
67
71
|
this.oauth2PermissionScopeId = uuid_1.v4();
|
|
68
72
|
}
|
|
73
|
+
async restoreConfigFromLocalSettings(ctx, inputs, localSettings) {
|
|
74
|
+
var _a, _b;
|
|
75
|
+
const displayName = ctx.projectSetting.appName;
|
|
76
|
+
if (displayName) {
|
|
77
|
+
this.displayName = displayName.substr(0, constants_1.Constants.aadAppMaxLength);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetDisplayNameError));
|
|
81
|
+
}
|
|
82
|
+
const permissionRes = await v3_1.getPermissionRequest(inputs.projectPath);
|
|
83
|
+
if (permissionRes.isErr()) {
|
|
84
|
+
return teamsfx_api_1.err(permissionRes.error);
|
|
85
|
+
}
|
|
86
|
+
this.permissionRequest = permissionRes.value;
|
|
87
|
+
const objectId = (_a = localSettings.auth) === null || _a === void 0 ? void 0 : _a.objectId;
|
|
88
|
+
if (objectId) {
|
|
89
|
+
this.objectId = objectId;
|
|
90
|
+
}
|
|
91
|
+
const clientSecret = (_b = localSettings.auth) === null || _b === void 0 ? void 0 : _b.clientSecret;
|
|
92
|
+
if (clientSecret) {
|
|
93
|
+
this.password = clientSecret;
|
|
94
|
+
}
|
|
95
|
+
return teamsfx_api_1.ok(undefined);
|
|
96
|
+
}
|
|
97
|
+
async restoreConfigFromEnvInfo(ctx, inputs, envInfo) {
|
|
98
|
+
const displayName = ctx.projectSetting.appName;
|
|
99
|
+
if (displayName) {
|
|
100
|
+
this.displayName = displayName.substr(0, constants_1.Constants.aadAppMaxLength);
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetDisplayNameError));
|
|
104
|
+
}
|
|
105
|
+
const permissionRes = await v3_1.getPermissionRequest(inputs.projectPath);
|
|
106
|
+
if (permissionRes.isErr()) {
|
|
107
|
+
return teamsfx_api_1.err(permissionRes.error);
|
|
108
|
+
}
|
|
109
|
+
this.permissionRequest = permissionRes.value;
|
|
110
|
+
const aadResource = envInfo.state[constants_2.BuiltInResourcePluginNames.aad];
|
|
111
|
+
const objectId = aadResource === null || aadResource === void 0 ? void 0 : aadResource.objectId;
|
|
112
|
+
if (objectId) {
|
|
113
|
+
this.objectId = objectId;
|
|
114
|
+
}
|
|
115
|
+
const clientSecret = aadResource === null || aadResource === void 0 ? void 0 : aadResource.clientSecret;
|
|
116
|
+
if (clientSecret) {
|
|
117
|
+
this.password = clientSecret;
|
|
118
|
+
}
|
|
119
|
+
return teamsfx_api_1.ok(undefined);
|
|
120
|
+
}
|
|
69
121
|
async restoreConfigFromContext(ctx) {
|
|
70
122
|
const displayName = ctx.projectSettings.appName;
|
|
71
123
|
if (displayName) {
|
|
@@ -94,6 +146,44 @@ class ProvisionConfig {
|
|
|
94
146
|
ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.oauthHost, constants_1.Constants.oauthAuthorityPrefix, this.isLocalDebug);
|
|
95
147
|
ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.oauthAuthority, oauthAuthority, this.isLocalDebug);
|
|
96
148
|
}
|
|
149
|
+
saveConfigIntoLocalSettings(localSettings, tenantId) {
|
|
150
|
+
const oauthAuthority = ProvisionConfig.getOauthAuthority(tenantId);
|
|
151
|
+
if (!localSettings.auth) {
|
|
152
|
+
localSettings.auth = {};
|
|
153
|
+
}
|
|
154
|
+
if (localSettings.auth) {
|
|
155
|
+
if (this.clientId)
|
|
156
|
+
localSettings.auth.clientId = this.clientId;
|
|
157
|
+
if (this.password)
|
|
158
|
+
localSettings.auth.clientSecret = this.password;
|
|
159
|
+
if (this.objectId)
|
|
160
|
+
localSettings.auth.objectId = this.objectId;
|
|
161
|
+
if (this.oauth2PermissionScopeId)
|
|
162
|
+
localSettings.auth.oauth2PermissionScopeId = this.oauth2PermissionScopeId;
|
|
163
|
+
localSettings.auth.tenantId = tenantId;
|
|
164
|
+
localSettings.auth.oauthHost = constants_1.Constants.oauthAuthorityPrefix;
|
|
165
|
+
localSettings.auth.oauthAuthority = oauthAuthority;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
saveConfigIntoEnvInfo(envInfo, tenantId) {
|
|
169
|
+
if (!envInfo.state[constants_2.BuiltInResourcePluginNames.aad]) {
|
|
170
|
+
envInfo.state[constants_2.BuiltInResourcePluginNames.aad] = {};
|
|
171
|
+
envInfo.state[constants_2.BuiltInResourcePluginNames.aad].secretFields = ["clientSecret"];
|
|
172
|
+
}
|
|
173
|
+
const envState = envInfo.state[constants_2.BuiltInResourcePluginNames.aad];
|
|
174
|
+
const oauthAuthority = ProvisionConfig.getOauthAuthority(tenantId);
|
|
175
|
+
if (this.clientId)
|
|
176
|
+
envState.clientId = this.clientId;
|
|
177
|
+
if (this.password)
|
|
178
|
+
envState.clientSecret = this.password;
|
|
179
|
+
if (this.objectId)
|
|
180
|
+
envState.objectId = this.objectId;
|
|
181
|
+
if (this.oauth2PermissionScopeId)
|
|
182
|
+
envState.oauth2PermissionScopeId = this.oauth2PermissionScopeId;
|
|
183
|
+
envState.tenantId = tenantId;
|
|
184
|
+
envState.oauthHost = constants_1.Constants.oauthAuthorityPrefix;
|
|
185
|
+
envState.oauthAuthority = oauthAuthority;
|
|
186
|
+
}
|
|
97
187
|
static getOauthAuthority(tenantId) {
|
|
98
188
|
return `${constants_1.Constants.oauthAuthorityPrefix}/${tenantId}`;
|
|
99
189
|
}
|
|
@@ -133,6 +223,60 @@ class SetApplicationInContextConfig {
|
|
|
133
223
|
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetConfigError(constants_1.ConfigKeys.clientId, constants_1.Plugins.pluginName)));
|
|
134
224
|
}
|
|
135
225
|
}
|
|
226
|
+
restoreConfigFromLocalSettings(localSettings) {
|
|
227
|
+
var _a, _b, _c;
|
|
228
|
+
const frontendDomain = (_a = localSettings.frontend) === null || _a === void 0 ? void 0 : _a.tabDomain;
|
|
229
|
+
if (frontendDomain) {
|
|
230
|
+
this.frontendDomain = format_1.format(frontendDomain, format_1.Formats.Domain);
|
|
231
|
+
}
|
|
232
|
+
const botId = (_b = localSettings.bot) === null || _b === void 0 ? void 0 : _b.botId;
|
|
233
|
+
if (botId) {
|
|
234
|
+
this.botId = format_1.format(botId, format_1.Formats.UUID);
|
|
235
|
+
}
|
|
236
|
+
const clientId = (_c = localSettings.auth) === null || _c === void 0 ? void 0 : _c.clientId;
|
|
237
|
+
if (clientId) {
|
|
238
|
+
this.clientId = clientId;
|
|
239
|
+
}
|
|
240
|
+
else {
|
|
241
|
+
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetConfigError(constants_1.ConfigKeys.clientId, constants_1.Plugins.pluginName)));
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
restoreConfigFromEnvInfo(ctx, envInfo) {
|
|
245
|
+
var _a, _b;
|
|
246
|
+
const solutionSettings = ctx.projectSetting.solutionSettings;
|
|
247
|
+
const aadResource = envInfo.state[constants_2.BuiltInResourcePluginNames.aad];
|
|
248
|
+
let frontendDomain = aadResource === null || aadResource === void 0 ? void 0 : aadResource.domain;
|
|
249
|
+
if (!frontendDomain) {
|
|
250
|
+
const tabModules = solutionSettings.modules.filter((m) => m.capabilities.includes(question_1.TabOptionItem.id));
|
|
251
|
+
if (tabModules.length > 0) {
|
|
252
|
+
const hostingPlugin = tabModules[0].hostingPlugin;
|
|
253
|
+
if (hostingPlugin) {
|
|
254
|
+
frontendDomain = (_a = envInfo.state[hostingPlugin]) === null || _a === void 0 ? void 0 : _a.domain;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
if (frontendDomain) {
|
|
259
|
+
this.frontendDomain = format_1.format(frontendDomain, format_1.Formats.Domain);
|
|
260
|
+
}
|
|
261
|
+
const botModules = solutionSettings.modules.filter((m) => m.capabilities.includes(question_1.BotOptionItem.id));
|
|
262
|
+
let botId;
|
|
263
|
+
if (botModules.length > 0) {
|
|
264
|
+
const hostingPlugin = botModules[0].hostingPlugin;
|
|
265
|
+
if (hostingPlugin) {
|
|
266
|
+
botId = (_b = envInfo.state[hostingPlugin]) === null || _b === void 0 ? void 0 : _b.botId;
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
if (botId) {
|
|
270
|
+
this.botId = format_1.format(botId, format_1.Formats.UUID);
|
|
271
|
+
}
|
|
272
|
+
const clientId = aadResource === null || aadResource === void 0 ? void 0 : aadResource.clientId;
|
|
273
|
+
if (clientId) {
|
|
274
|
+
this.clientId = clientId;
|
|
275
|
+
}
|
|
276
|
+
else {
|
|
277
|
+
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetConfigError(constants_1.ConfigKeys.clientId, constants_1.Plugins.pluginName)));
|
|
278
|
+
}
|
|
279
|
+
}
|
|
136
280
|
saveConfigIntoContext(ctx) {
|
|
137
281
|
ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.applicationIdUri, this.applicationIdUri, this.isLocalDebug);
|
|
138
282
|
}
|
|
@@ -142,6 +286,94 @@ class PostProvisionConfig {
|
|
|
142
286
|
constructor(isLocalDebug = false) {
|
|
143
287
|
this.isLocalDebug = isLocalDebug;
|
|
144
288
|
}
|
|
289
|
+
restoreConfigFromLocalSettings(localSettings) {
|
|
290
|
+
var _a, _b, _c, _d, _e;
|
|
291
|
+
const frontendEndpoint = (_a = localSettings.frontend) === null || _a === void 0 ? void 0 : _a.tabEndpoint;
|
|
292
|
+
if (frontendEndpoint) {
|
|
293
|
+
this.frontendEndpoint = format_1.format(frontendEndpoint, format_1.Formats.Endpoint);
|
|
294
|
+
}
|
|
295
|
+
const botEndpoint = (_b = localSettings.bot) === null || _b === void 0 ? void 0 : _b.botEndpoint;
|
|
296
|
+
if (botEndpoint) {
|
|
297
|
+
this.botEndpoint = format_1.format(botEndpoint, format_1.Formats.Endpoint);
|
|
298
|
+
}
|
|
299
|
+
const objectId = (_c = localSettings.auth) === null || _c === void 0 ? void 0 : _c.objectId;
|
|
300
|
+
if (objectId) {
|
|
301
|
+
this.objectId = objectId;
|
|
302
|
+
}
|
|
303
|
+
if (objectId) {
|
|
304
|
+
this.objectId = objectId;
|
|
305
|
+
}
|
|
306
|
+
else {
|
|
307
|
+
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetConfigError(constants_1.ConfigKeys.objectId, constants_1.Plugins.pluginName)));
|
|
308
|
+
}
|
|
309
|
+
const applicationIdUri = (_d = localSettings.auth) === null || _d === void 0 ? void 0 : _d.applicationIdUris;
|
|
310
|
+
if (applicationIdUri) {
|
|
311
|
+
this.applicationIdUri = applicationIdUri;
|
|
312
|
+
}
|
|
313
|
+
else {
|
|
314
|
+
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetConfigError(constants_1.ConfigKeys.applicationIdUri, constants_1.Plugins.pluginName)));
|
|
315
|
+
}
|
|
316
|
+
const clientId = (_e = localSettings.auth) === null || _e === void 0 ? void 0 : _e.clientId;
|
|
317
|
+
if (objectId) {
|
|
318
|
+
this.clientId = clientId;
|
|
319
|
+
}
|
|
320
|
+
else {
|
|
321
|
+
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetConfigError(constants_1.ConfigKeys.clientId, constants_1.Plugins.pluginName)));
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
restoreConfigFromEnvInfo(ctx, envInfo) {
|
|
325
|
+
var _a, _b;
|
|
326
|
+
const solutionSettings = ctx.projectSetting.solutionSettings;
|
|
327
|
+
const aadResource = envInfo.state[constants_2.BuiltInResourcePluginNames.aad];
|
|
328
|
+
let frontendEndpoint = aadResource === null || aadResource === void 0 ? void 0 : aadResource.endpoint;
|
|
329
|
+
if (!frontendEndpoint) {
|
|
330
|
+
const tabModules = solutionSettings.modules.filter((m) => m.capabilities.includes(question_1.TabOptionItem.id));
|
|
331
|
+
if (tabModules.length > 0) {
|
|
332
|
+
const hostingPlugin = tabModules[0].hostingPlugin;
|
|
333
|
+
if (hostingPlugin) {
|
|
334
|
+
frontendEndpoint = (_a = envInfo.state[hostingPlugin]) === null || _a === void 0 ? void 0 : _a.endpoint;
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
}
|
|
338
|
+
if (frontendEndpoint) {
|
|
339
|
+
this.frontendEndpoint = format_1.format(frontendEndpoint, format_1.Formats.Endpoint);
|
|
340
|
+
}
|
|
341
|
+
const botModules = solutionSettings.modules.filter((m) => m.capabilities.includes(question_1.BotOptionItem.id));
|
|
342
|
+
let botEndpoint;
|
|
343
|
+
if (botModules.length > 0) {
|
|
344
|
+
const hostingPlugin = botModules[0].hostingPlugin;
|
|
345
|
+
if (hostingPlugin) {
|
|
346
|
+
botEndpoint = (_b = envInfo.state[hostingPlugin]) === null || _b === void 0 ? void 0 : _b.siteEndpoint;
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
if (botEndpoint) {
|
|
350
|
+
this.botEndpoint = format_1.format(botEndpoint, format_1.Formats.Endpoint);
|
|
351
|
+
}
|
|
352
|
+
const objectId = aadResource === null || aadResource === void 0 ? void 0 : aadResource.objectId;
|
|
353
|
+
if (objectId) {
|
|
354
|
+
this.objectId = objectId;
|
|
355
|
+
}
|
|
356
|
+
if (objectId) {
|
|
357
|
+
this.objectId = objectId;
|
|
358
|
+
}
|
|
359
|
+
else {
|
|
360
|
+
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetConfigError(constants_1.ConfigKeys.objectId, constants_1.Plugins.pluginName)));
|
|
361
|
+
}
|
|
362
|
+
const applicationIdUri = aadResource === null || aadResource === void 0 ? void 0 : aadResource.applicationIdUris;
|
|
363
|
+
if (applicationIdUri) {
|
|
364
|
+
this.applicationIdUri = applicationIdUri;
|
|
365
|
+
}
|
|
366
|
+
else {
|
|
367
|
+
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetConfigError(constants_1.ConfigKeys.applicationIdUri, constants_1.Plugins.pluginName)));
|
|
368
|
+
}
|
|
369
|
+
const clientId = aadResource === null || aadResource === void 0 ? void 0 : aadResource.clientId;
|
|
370
|
+
if (clientId) {
|
|
371
|
+
this.clientId = clientId;
|
|
372
|
+
}
|
|
373
|
+
else {
|
|
374
|
+
throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetConfigError(constants_1.ConfigKeys.clientId, constants_1.Plugins.pluginName)));
|
|
375
|
+
}
|
|
376
|
+
}
|
|
145
377
|
async restoreConfigFromContext(ctx) {
|
|
146
378
|
var _a, _b;
|
|
147
379
|
let frontendEndpoint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/configs.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/configs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAKvD,qBAAa,cAAc;WACX,IAAI,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI;WAE9B,SAAS,CACrB,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACtC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GACvC,IAAI;WASO,gBAAgB,CAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACtC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GACvC,IAAI;WAQO,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACtC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GACvC,IAAI;IAcP,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAe,MAAM,gBAAgB,MAAM;;;MAKzE;IAEF,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAIlC"}
|
|
@@ -3,19 +3,19 @@
|
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.TelemetryUtils = void 0;
|
|
6
|
+
const core_1 = require("../../../../core");
|
|
7
|
+
const solutionGlobalVars_1 = require("../../../solution/fx-solution/v3/solutionGlobalVars");
|
|
6
8
|
const constants_1 = require("../constants");
|
|
7
9
|
class TelemetryUtils {
|
|
8
|
-
static init(ctx) {
|
|
9
|
-
TelemetryUtils.ctx = ctx;
|
|
10
|
-
}
|
|
10
|
+
static init(ctx) { }
|
|
11
11
|
static sendEvent(eventName, properties, measurements) {
|
|
12
12
|
var _a;
|
|
13
13
|
if (!properties) {
|
|
14
14
|
properties = {};
|
|
15
15
|
}
|
|
16
16
|
properties[constants_1.Telemetry.component] = constants_1.Plugins.pluginNameComplex;
|
|
17
|
-
TelemetryUtils.addAppIdInProperty(properties
|
|
18
|
-
(_a =
|
|
17
|
+
TelemetryUtils.addAppIdInProperty(properties);
|
|
18
|
+
(_a = core_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(eventName, properties, measurements);
|
|
19
19
|
}
|
|
20
20
|
static sendSuccessEvent(eventName, properties, measurements) {
|
|
21
21
|
if (!properties) {
|
|
@@ -34,19 +34,12 @@ class TelemetryUtils {
|
|
|
34
34
|
properties[constants_1.Telemetry.errorType] = errorType;
|
|
35
35
|
properties[constants_1.Telemetry.errorMessage] = errorMessage;
|
|
36
36
|
properties[constants_1.Telemetry.isSuccess] = constants_1.Telemetry.no;
|
|
37
|
-
TelemetryUtils.addAppIdInProperty(properties
|
|
38
|
-
(_a =
|
|
37
|
+
TelemetryUtils.addAppIdInProperty(properties);
|
|
38
|
+
(_a = core_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(eventName, properties, measurements);
|
|
39
39
|
}
|
|
40
|
-
static addAppIdInProperty(properties
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
.get(constants_1.Plugins.solution)) === null || _a === void 0 ? void 0 : _a.get(constants_1.ConfigKeysOfOtherPlugin.remoteTeamsAppId);
|
|
44
|
-
if (appId) {
|
|
45
|
-
properties[constants_1.Telemetry.appId] = appId;
|
|
46
|
-
}
|
|
47
|
-
else {
|
|
48
|
-
properties[constants_1.Telemetry.appId] = "";
|
|
49
|
-
}
|
|
40
|
+
static addAppIdInProperty(properties) {
|
|
41
|
+
const appId = solutionGlobalVars_1.solutionGlobalVars.TeamsAppId || "";
|
|
42
|
+
properties[constants_1.Telemetry.appId] = appId;
|
|
50
43
|
}
|
|
51
44
|
}
|
|
52
45
|
exports.TelemetryUtils = TelemetryUtils;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,2CAAyC;AACzC,4FAAyF;AACzF,4CAAkD;AAElD,MAAa,cAAc;IAClB,MAAM,CAAC,IAAI,CAAC,GAAkB,IAAS,CAAC;IAExC,MAAM,CAAC,SAAS,CACrB,SAAiB,EACjB,UAAsC,EACtC,YAAwC;;QAExC,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,EAAE,CAAC;SACjB;QACD,UAAU,CAAC,qBAAS,CAAC,SAAS,CAAC,GAAG,mBAAO,CAAC,iBAAiB,CAAC;QAC5D,cAAc,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC9C,MAAA,YAAK,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IACnF,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAC5B,SAAiB,EACjB,UAAsC,EACtC,YAAwC;QAExC,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,EAAE,CAAC;SACjB;QACD,UAAU,CAAC,qBAAS,CAAC,SAAS,CAAC,GAAG,qBAAS,CAAC,GAAG,CAAC;QAChD,cAAc,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IAChE,CAAC;IAEM,MAAM,CAAC,cAAc,CAC1B,SAAiB,EACjB,SAAiB,EACjB,SAAiB,EACjB,YAAoB,EACpB,UAAsC,EACtC,YAAwC;;QAExC,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,EAAE,CAAC;SACjB;QAED,UAAU,CAAC,qBAAS,CAAC,SAAS,CAAC,GAAG,mBAAO,CAAC,iBAAiB,CAAC;QAC5D,UAAU,CAAC,qBAAS,CAAC,SAAS,CAAC,GAAG,GAAG,mBAAO,CAAC,eAAe,IAAI,SAAS,EAAE,CAAC;QAC5E,UAAU,CAAC,qBAAS,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;QAC5C,UAAU,CAAC,qBAAS,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;QAClD,UAAU,CAAC,qBAAS,CAAC,SAAS,CAAC,GAAG,qBAAS,CAAC,EAAE,CAAC;QAC/C,cAAc,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC9C,MAAA,YAAK,CAAC,iBAAiB,0CAAE,uBAAuB,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IACxF,CAAC;IASO,MAAM,CAAC,kBAAkB,CAAC,UAAqC;QACrE,MAAM,KAAK,GAAG,uCAAkB,CAAC,UAAU,IAAI,EAAE,CAAC;QAClD,UAAU,CAAC,qBAAS,CAAC,KAAK,CAAC,GAAG,KAAe,CAAC;IAChD,CAAC;;AA3DH,wCA4DC;AAXiB,+BAAgB,GAAG,CAAC,SAAiB,EAAE,YAAoB,EAAE,EAAE;IAC7E,OAAO;QACL,YAAY,EAAE,SAAS;QACvB,eAAe,EAAE,YAAY;KAC9B,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AppStudioTokenProvider, GraphTokenProvider } from "@microsoft/teamsfx-api";
|
|
2
2
|
export declare enum TokenAudience {
|
|
3
3
|
Graph = "graph",
|
|
4
4
|
AppStudio = "appStudio"
|
|
5
5
|
}
|
|
6
|
+
export interface GraphAndAppStudioTokenProvider {
|
|
7
|
+
graph?: GraphTokenProvider;
|
|
8
|
+
appStudio?: AppStudioTokenProvider;
|
|
9
|
+
}
|
|
6
10
|
export declare class TokenProvider {
|
|
7
11
|
static token?: string;
|
|
8
12
|
static tenantId?: string;
|
|
9
13
|
static audience: TokenAudience;
|
|
10
|
-
static init(
|
|
14
|
+
static init(tokenProvider: GraphAndAppStudioTokenProvider, audience?: TokenAudience): Promise<void>;
|
|
11
15
|
}
|
|
12
16
|
//# sourceMappingURL=tokenProvider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenProvider.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/tokenProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"tokenProvider.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/tokenProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAiB,MAAM,wBAAwB,CAAC;AAInG,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,SAAS,cAAc;CACxB;AAED,MAAM,WAAW,8BAA8B;IAC7C,KAAK,CAAC,EAAE,kBAAkB,CAAC;IAC3B,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAgDD,qBAAa,aAAa;IACxB,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC;WAEX,IAAI,CACtB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,GAAE,aAAmC,GAC5C,OAAO,CAAC,IAAI,CAAC;CAwBjB"}
|