@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
|
@@ -15,20 +15,21 @@ const dialog_1 = require("./utils/dialog");
|
|
|
15
15
|
const telemetry_1 = require("./utils/telemetry");
|
|
16
16
|
const tokenProvider_1 = require("./utils/tokenProvider");
|
|
17
17
|
const tools_1 = require("../../../common/tools");
|
|
18
|
+
const core_1 = require("../../../core");
|
|
18
19
|
function delay(ms) {
|
|
19
20
|
// tslint:disable-next-line no-string-based-set-timeout
|
|
20
21
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
21
22
|
}
|
|
22
23
|
class AadAppClient {
|
|
23
|
-
static async createAadApp(
|
|
24
|
+
static async createAadApp(stage, config) {
|
|
24
25
|
try {
|
|
25
26
|
const provisionObject = AadAppClient.getAadAppProvisionObject(config.displayName, config.oauth2PermissionScopeId);
|
|
26
27
|
let provisionAadResponse;
|
|
27
28
|
if (tokenProvider_1.TokenProvider.audience === tokenProvider_1.TokenAudience.AppStudio) {
|
|
28
|
-
provisionAadResponse = (await this.retryHanlder(
|
|
29
|
+
provisionAadResponse = (await this.retryHanlder(stage, () => appStudio_1.AppStudio.createAADAppV2(tokenProvider_1.TokenProvider.token, provisionObject)));
|
|
29
30
|
}
|
|
30
31
|
else {
|
|
31
|
-
provisionAadResponse = (await this.retryHanlder(
|
|
32
|
+
provisionAadResponse = (await this.retryHanlder(stage, () => graph_1.GraphClient.createAADApp(tokenProvider_1.TokenProvider.token, provisionObject)));
|
|
32
33
|
}
|
|
33
34
|
config.clientId = provisionAadResponse.appId;
|
|
34
35
|
config.objectId = provisionAadResponse.id;
|
|
@@ -37,14 +38,14 @@ class AadAppClient {
|
|
|
37
38
|
throw AadAppClient.handleError(error, errors_1.CreateAppError);
|
|
38
39
|
}
|
|
39
40
|
}
|
|
40
|
-
static async createAadAppSecret(
|
|
41
|
+
static async createAadAppSecret(stage, config) {
|
|
41
42
|
try {
|
|
42
43
|
let createSecretObject;
|
|
43
44
|
if (tokenProvider_1.TokenProvider.audience === tokenProvider_1.TokenAudience.AppStudio) {
|
|
44
|
-
createSecretObject = (await AadAppClient.retryHanlder(
|
|
45
|
+
createSecretObject = (await AadAppClient.retryHanlder(stage, () => appStudio_1.AppStudio.createAADAppPassword(tokenProvider_1.TokenProvider.token, config.objectId)));
|
|
45
46
|
}
|
|
46
47
|
else {
|
|
47
|
-
createSecretObject = (await AadAppClient.retryHanlder(
|
|
48
|
+
createSecretObject = (await AadAppClient.retryHanlder(stage, () => graph_1.GraphClient.createAadAppSecret(tokenProvider_1.TokenProvider.token, config.objectId)));
|
|
48
49
|
}
|
|
49
50
|
config.password = createSecretObject.value;
|
|
50
51
|
}
|
|
@@ -52,20 +53,20 @@ class AadAppClient {
|
|
|
52
53
|
throw AadAppClient.handleError(error, errors_1.CreateSecretError);
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
|
-
static async updateAadAppRedirectUri(
|
|
56
|
+
static async updateAadAppRedirectUri(stage, objectId, redirectUris, skip = false) {
|
|
56
57
|
var _a;
|
|
57
58
|
try {
|
|
58
59
|
if (tokenProvider_1.TokenProvider.audience === tokenProvider_1.TokenAudience.AppStudio) {
|
|
59
|
-
await AadAppClient.retryHanlder(
|
|
60
|
+
await AadAppClient.retryHanlder(stage, () => appStudio_1.AppStudio.updateAADApp(tokenProvider_1.TokenProvider.token, objectId, redirectUris));
|
|
60
61
|
}
|
|
61
62
|
else {
|
|
62
|
-
await AadAppClient.retryHanlder(
|
|
63
|
+
await AadAppClient.retryHanlder(stage, () => graph_1.GraphClient.updateAADApp(tokenProvider_1.TokenProvider.token, objectId, redirectUris));
|
|
63
64
|
}
|
|
64
65
|
}
|
|
65
66
|
catch (error) {
|
|
66
67
|
if (skip) {
|
|
67
68
|
const message = constants_1.Messages.StepFailedAndSkipped(constants_1.ProgressDetail.UpdateRedirectUri, constants_1.Messages.UpdateRedirectUriHelpMessage(common_1.Utils.parseRedirectUriMessage(redirectUris)));
|
|
68
|
-
(_a =
|
|
69
|
+
(_a = core_1.TOOLS.logProvider) === null || _a === void 0 ? void 0 : _a.warning(constants_1.Messages.getLog(message));
|
|
69
70
|
dialog_1.DialogUtils.show(message, constants_1.UILevels.Warn);
|
|
70
71
|
}
|
|
71
72
|
else {
|
|
@@ -73,21 +74,21 @@ class AadAppClient {
|
|
|
73
74
|
}
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
|
-
static async updateAadAppIdUri(
|
|
77
|
+
static async updateAadAppIdUri(stage, objectId, applicationIdUri, skip = false) {
|
|
77
78
|
var _a;
|
|
78
79
|
try {
|
|
79
80
|
const updateAppIdObject = AadAppClient.getAadApplicationIdObject(applicationIdUri);
|
|
80
81
|
if (tokenProvider_1.TokenProvider.audience === tokenProvider_1.TokenAudience.AppStudio) {
|
|
81
|
-
await AadAppClient.retryHanlder(
|
|
82
|
+
await AadAppClient.retryHanlder(stage, () => appStudio_1.AppStudio.updateAADApp(tokenProvider_1.TokenProvider.token, objectId, updateAppIdObject));
|
|
82
83
|
}
|
|
83
84
|
else {
|
|
84
|
-
await AadAppClient.retryHanlder(
|
|
85
|
+
await AadAppClient.retryHanlder(stage, () => graph_1.GraphClient.updateAADApp(tokenProvider_1.TokenProvider.token, objectId, updateAppIdObject));
|
|
85
86
|
}
|
|
86
87
|
}
|
|
87
88
|
catch (error) {
|
|
88
89
|
if (skip) {
|
|
89
90
|
const message = constants_1.Messages.StepFailedAndSkipped(constants_1.ProgressDetail.UpdateAppIdUri, constants_1.Messages.UpdateAppIdUriHelpMessage(applicationIdUri));
|
|
90
|
-
(_a =
|
|
91
|
+
(_a = core_1.TOOLS.logProvider) === null || _a === void 0 ? void 0 : _a.warning(constants_1.Messages.getLog(message));
|
|
91
92
|
dialog_1.DialogUtils.show(message, constants_1.UILevels.Warn);
|
|
92
93
|
}
|
|
93
94
|
else {
|
|
@@ -95,21 +96,21 @@ class AadAppClient {
|
|
|
95
96
|
}
|
|
96
97
|
}
|
|
97
98
|
}
|
|
98
|
-
static async updateAadAppPermission(
|
|
99
|
+
static async updateAadAppPermission(stage, objectId, permissions, skip = false) {
|
|
99
100
|
var _a;
|
|
100
101
|
try {
|
|
101
102
|
const updatePermissionObject = AadAppClient.getAadPermissionObject(permissions);
|
|
102
103
|
if (tokenProvider_1.TokenProvider.audience === tokenProvider_1.TokenAudience.AppStudio) {
|
|
103
|
-
await AadAppClient.retryHanlder(
|
|
104
|
+
await AadAppClient.retryHanlder(stage, () => appStudio_1.AppStudio.updateAADApp(tokenProvider_1.TokenProvider.token, objectId, updatePermissionObject));
|
|
104
105
|
}
|
|
105
106
|
else {
|
|
106
|
-
await AadAppClient.retryHanlder(
|
|
107
|
+
await AadAppClient.retryHanlder(stage, () => graph_1.GraphClient.updateAADApp(tokenProvider_1.TokenProvider.token, objectId, updatePermissionObject));
|
|
107
108
|
}
|
|
108
109
|
}
|
|
109
110
|
catch (error) {
|
|
110
111
|
if (skip) {
|
|
111
112
|
const message = constants_1.Messages.StepFailedAndSkipped(constants_1.ProgressDetail.UpdatePermission, constants_1.Messages.UpdatePermissionHelpMessage);
|
|
112
|
-
(_a =
|
|
113
|
+
(_a = core_1.TOOLS.logProvider) === null || _a === void 0 ? void 0 : _a.warning(constants_1.Messages.getLog(message));
|
|
113
114
|
dialog_1.DialogUtils.show(message, constants_1.UILevels.Warn);
|
|
114
115
|
}
|
|
115
116
|
else {
|
|
@@ -117,30 +118,30 @@ class AadAppClient {
|
|
|
117
118
|
}
|
|
118
119
|
}
|
|
119
120
|
}
|
|
120
|
-
static async getAadApp(
|
|
121
|
+
static async getAadApp(stage, objectId, clientSecret, graphTokenProvider, envName, skip = false) {
|
|
121
122
|
var _a, _b, _c, _d;
|
|
122
123
|
let getAppObject;
|
|
123
124
|
try {
|
|
124
125
|
if (tokenProvider_1.TokenProvider.audience === tokenProvider_1.TokenAudience.AppStudio) {
|
|
125
|
-
getAppObject = (await this.retryHanlder(
|
|
126
|
+
getAppObject = (await this.retryHanlder(stage, () => appStudio_1.AppStudio.getAadApp(tokenProvider_1.TokenProvider.token, objectId)));
|
|
126
127
|
}
|
|
127
128
|
else {
|
|
128
|
-
getAppObject = (await this.retryHanlder(
|
|
129
|
+
getAppObject = (await this.retryHanlder(stage, () => graph_1.GraphClient.getAadApp(tokenProvider_1.TokenProvider.token, objectId)));
|
|
129
130
|
}
|
|
130
131
|
}
|
|
131
132
|
catch (error) {
|
|
132
|
-
const tenantId = await common_1.Utils.getCurrentTenantId(
|
|
133
|
-
const fileName = common_1.Utils.getConfigFileName(
|
|
133
|
+
const tenantId = await common_1.Utils.getCurrentTenantId(graphTokenProvider);
|
|
134
|
+
const fileName = common_1.Utils.getConfigFileName(envName);
|
|
134
135
|
throw AadAppClient.handleError(error, errors_1.GetAppError, objectId, tenantId, fileName);
|
|
135
136
|
}
|
|
136
|
-
const config = new configs_1.ProvisionConfig(
|
|
137
|
+
const config = new configs_1.ProvisionConfig(!envName);
|
|
137
138
|
if (((_a = getAppObject.api) === null || _a === void 0 ? void 0 : _a.oauth2PermissionScopes) &&
|
|
138
139
|
((_b = getAppObject.api) === null || _b === void 0 ? void 0 : _b.oauth2PermissionScopes[0]) &&
|
|
139
140
|
((_c = getAppObject.api) === null || _c === void 0 ? void 0 : _c.oauth2PermissionScopes[0].id)) {
|
|
140
141
|
config.oauth2PermissionScopeId = (_d = getAppObject.api) === null || _d === void 0 ? void 0 : _d.oauth2PermissionScopes[0].id;
|
|
141
142
|
}
|
|
142
143
|
else {
|
|
143
|
-
const fileName = common_1.Utils.getConfigFileName(
|
|
144
|
+
const fileName = common_1.Utils.getConfigFileName(envName);
|
|
144
145
|
throw results_1.ResultFactory.UserError(errors_1.GetAppConfigError.name, errors_1.GetAppConfigError.message(constants_1.ConfigKeys.oauth2PermissionScopeId, fileName));
|
|
145
146
|
}
|
|
146
147
|
config.objectId = objectId;
|
|
@@ -150,7 +151,7 @@ class AadAppClient {
|
|
|
150
151
|
}
|
|
151
152
|
static async checkPermission(ctx, stage, objectId, userObjectId) {
|
|
152
153
|
try {
|
|
153
|
-
return (await this.retryHanlder(
|
|
154
|
+
return (await this.retryHanlder(stage, () => graph_1.GraphClient.checkPermission(tokenProvider_1.TokenProvider.token, objectId, userObjectId)));
|
|
154
155
|
}
|
|
155
156
|
catch (error) {
|
|
156
157
|
// TODO: Give out detailed help message for different errors.
|
|
@@ -173,17 +174,16 @@ class AadAppClient {
|
|
|
173
174
|
}
|
|
174
175
|
static async listCollaborator(ctx, stage, objectId) {
|
|
175
176
|
try {
|
|
176
|
-
return await this.retryHanlder(
|
|
177
|
+
return await this.retryHanlder(stage, () => graph_1.GraphClient.getAadOwners(tokenProvider_1.TokenProvider.token, objectId));
|
|
177
178
|
}
|
|
178
179
|
catch (error) {
|
|
179
180
|
// TODO: Give out detailed help message for different errors.
|
|
180
181
|
throw AadAppClient.handleError(error, errors_1.ListCollaboratorError);
|
|
181
182
|
}
|
|
182
183
|
}
|
|
183
|
-
static async retryHanlder(
|
|
184
|
+
static async retryHanlder(stage, fn) {
|
|
184
185
|
let retries = constants_1.Constants.maxRetryTimes;
|
|
185
186
|
let response;
|
|
186
|
-
telemetry_1.TelemetryUtils.init(ctx);
|
|
187
187
|
while (retries > 0) {
|
|
188
188
|
retries = retries - 1;
|
|
189
189
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/aadAppClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/aadAppClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { AadResult } from "./results";
|
|
|
4
4
|
import { AzureSolutionSettings } from "@microsoft/teamsfx-api";
|
|
5
5
|
import { AadOwner, ResourcePermission } from "../../../common/permissionInterface";
|
|
6
6
|
import "./v2";
|
|
7
|
+
import "./v3";
|
|
7
8
|
export declare class AadAppForTeamsPlugin implements Plugin {
|
|
8
9
|
name: string;
|
|
9
10
|
displayName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EACN,aAAa,EAIb,IAAI,EAEJ,MAAM,EACN,OAAO,EACR,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAiB,MAAM,WAAW,CAAC;AAKrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAK/D,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,MAAM,CAAC;AAEd,qBACa,oBAAqB,YAAW,MAAM;IACjD,IAAI,SAAmC;IACvC,WAAW,SAAS;IACpB,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAOnD,UAAU,EAAE,kBAAkB,CAA4B;IAEpD,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAQjD,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAQxD,uBAAuB,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,SAAS;IAOtE,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAQrD,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAQtD,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAQ5D,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAiBnE,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC5B,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAQpC,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC5B,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAQpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;YAQzE,6BAA6B;IAY3C,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,WAAW;CAiDpB;;AAED,wBAA0C"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EACN,aAAa,EAIb,IAAI,EAEJ,MAAM,EACN,OAAO,EACR,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAiB,MAAM,WAAW,CAAC;AAKrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAK/D,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,MAAM,CAAC;AACd,OAAO,MAAM,CAAC;AAEd,qBACa,oBAAqB,YAAW,MAAM;IACjD,IAAI,SAAmC;IACvC,WAAW,SAAS;IACpB,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAOnD,UAAU,EAAE,kBAAkB,CAA4B;IAEpD,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAQjD,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAQxD,uBAAuB,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,SAAS;IAOtE,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAQrD,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAQtD,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAQ5D,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAiBnE,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC5B,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAQpC,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC5B,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAQpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;YAQzE,6BAA6B;IAY3C,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,WAAW;CAiDpB;;AAED,wBAA0C"}
|
|
@@ -16,6 +16,7 @@ const typedi_1 = require("typedi");
|
|
|
16
16
|
const ResourcePluginContainer_1 = require("../../solution/fx-solution/ResourcePluginContainer");
|
|
17
17
|
const constants_2 = require("../bot/constants");
|
|
18
18
|
require("./v2");
|
|
19
|
+
require("./v3");
|
|
19
20
|
let AadAppForTeamsPlugin = class AadAppForTeamsPlugin {
|
|
20
21
|
constructor() {
|
|
21
22
|
this.name = "fx-resource-aad-app-for-teams";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { FxError, PluginContext, Result } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { FxError, LogProvider, PluginContext, Result } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { AadResult } from "./results";
|
|
3
|
+
import { IAADDefinition, RequiredResourceAccess } from "./interfaces/IAADDefinition";
|
|
3
4
|
import { AadOwner, ResourcePermission } from "../../../common/permissionInterface";
|
|
4
5
|
import { IUserList } from "../appstudio/interfaces/IAppDefinition";
|
|
5
6
|
export declare class AadAppForTeamsImpl {
|
|
@@ -11,9 +12,9 @@ export declare class AadAppForTeamsImpl {
|
|
|
11
12
|
checkPermission(ctx: PluginContext, userInfo: IUserList): Promise<Result<ResourcePermission[], FxError>>;
|
|
12
13
|
listCollaborator(ctx: PluginContext): Promise<Result<AadOwner[], FxError>>;
|
|
13
14
|
grantPermission(ctx: PluginContext, userInfo: IUserList): Promise<Result<ResourcePermission[], FxError>>;
|
|
14
|
-
|
|
15
|
+
static getRedirectUris(frontendEndpoint: string | undefined, botEndpoint: string | undefined, clientId: string): IAADDefinition;
|
|
15
16
|
private static getUpdatePermissionConfigs;
|
|
16
|
-
|
|
17
|
+
static parsePermission(permissionRequest: string, logProvider?: LogProvider): RequiredResourceAccess[];
|
|
17
18
|
private static generateRequiredResourceAccess;
|
|
18
19
|
private static getPermissionMap;
|
|
19
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAE,SAAS,EAAiB,MAAM,WAAW,CAAC;AAkCrD,OAAO,EACL,cAAc,EACd,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AAUrC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AAEnE,qBAAa,kBAAkB;IAChB,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAyE7E,uBAAuB,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,SAAS;IAkBtE,aAAa,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAoD3E,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAwCxD,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAqB5D,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,SAAS,GAClB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IA+BpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IA4B1E,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,SAAS,GAClB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;WA+BnC,eAAe,CAC3B,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,QAAQ,EAAE,MAAM;mBAyBG,0BAA0B;WA8CjC,eAAe,CAC3B,iBAAiB,EAAE,MAAM,EACzB,WAAW,CAAC,EAAE,WAAW,GACxB,sBAAsB,EAAE;IA6B3B,OAAO,CAAC,MAAM,CAAC,8BAA8B;IAyH7C,OAAO,CAAC,MAAM,CAAC,gBAAgB;CAuBhC"}
|
|
@@ -28,7 +28,7 @@ class AadAppForTeamsImpl {
|
|
|
28
28
|
const telemetryMessage = isLocalDebug
|
|
29
29
|
? constants_1.Messages.EndLocalDebug.telemetry
|
|
30
30
|
: constants_1.Messages.EndProvision.telemetry;
|
|
31
|
-
await tokenProvider_1.TokenProvider.init(ctx);
|
|
31
|
+
await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken });
|
|
32
32
|
// Move objectId etc. from input to output.
|
|
33
33
|
const skip = common_1.Utils.skipAADProvision(ctx, isLocalDebug);
|
|
34
34
|
dialog_1.DialogUtils.init(ctx.ui, constants_1.ProgressTitle.Provision, constants_1.ProgressTitle.ProvisionSteps);
|
|
@@ -39,23 +39,23 @@ class AadAppForTeamsImpl {
|
|
|
39
39
|
if (config.objectId) {
|
|
40
40
|
if (!skip) {
|
|
41
41
|
await ((_b = dialog_1.DialogUtils.progress) === null || _b === void 0 ? void 0 : _b.next(constants_1.ProgressDetail.GetAadApp));
|
|
42
|
-
config = await aadAppClient_1.AadAppClient.getAadApp(
|
|
42
|
+
config = await aadAppClient_1.AadAppClient.getAadApp(telemetryMessage, config.objectId, config.password, ctx.graphTokenProvider, isLocalDebug ? undefined : ctx.envInfo.envName);
|
|
43
43
|
(_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(constants_1.Messages.getLog(constants_1.Messages.GetAadAppSuccess));
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
else {
|
|
47
47
|
await ((_d = dialog_1.DialogUtils.progress) === null || _d === void 0 ? void 0 : _d.next(constants_1.ProgressDetail.ProvisionAadApp));
|
|
48
|
-
await aadAppClient_1.AadAppClient.createAadApp(
|
|
48
|
+
await aadAppClient_1.AadAppClient.createAadApp(telemetryMessage, config);
|
|
49
49
|
config.password = undefined;
|
|
50
50
|
(_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.info(constants_1.Messages.getLog(constants_1.Messages.CreateAadAppSuccess));
|
|
51
51
|
}
|
|
52
52
|
if (!config.password) {
|
|
53
53
|
await ((_f = dialog_1.DialogUtils.progress) === null || _f === void 0 ? void 0 : _f.next(constants_1.ProgressDetail.CreateAadAppSecret));
|
|
54
|
-
await aadAppClient_1.AadAppClient.createAadAppSecret(
|
|
54
|
+
await aadAppClient_1.AadAppClient.createAadAppSecret(telemetryMessage, config);
|
|
55
55
|
(_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.info(constants_1.Messages.getLog(constants_1.Messages.CreateAadAppPasswordSuccess));
|
|
56
56
|
}
|
|
57
57
|
await ((_h = dialog_1.DialogUtils.progress) === null || _h === void 0 ? void 0 : _h.next(constants_1.ProgressDetail.UpdatePermission));
|
|
58
|
-
await aadAppClient_1.AadAppClient.updateAadAppPermission(
|
|
58
|
+
await aadAppClient_1.AadAppClient.updateAadAppPermission(telemetryMessage, config.objectId, permissions, skip);
|
|
59
59
|
(_j = ctx.logProvider) === null || _j === void 0 ? void 0 : _j.info(constants_1.Messages.getLog(constants_1.Messages.UpdatePermissionSuccess));
|
|
60
60
|
await ((_k = dialog_1.DialogUtils.progress) === null || _k === void 0 ? void 0 : _k.end(true));
|
|
61
61
|
config.saveConfigIntoContext(ctx, tokenProvider_1.TokenProvider.tenantId);
|
|
@@ -83,16 +83,16 @@ class AadAppForTeamsImpl {
|
|
|
83
83
|
common_1.Utils.addLogAndTelemetryWithLocalDebug(ctx.logProvider, constants_1.Messages.StartPostProvision, constants_1.Messages.StartPostLocalDebug, isLocalDebug);
|
|
84
84
|
const skip = common_1.Utils.skipAADProvision(ctx, isLocalDebug);
|
|
85
85
|
dialog_1.DialogUtils.init(ctx.ui, constants_1.ProgressTitle.PostProvision, constants_1.ProgressTitle.PostProvisionSteps);
|
|
86
|
-
await tokenProvider_1.TokenProvider.init(ctx);
|
|
86
|
+
await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken });
|
|
87
87
|
const config = new configs_1.PostProvisionConfig(isLocalDebug);
|
|
88
88
|
config.restoreConfigFromContext(ctx);
|
|
89
89
|
await ((_a = dialog_1.DialogUtils.progress) === null || _a === void 0 ? void 0 : _a.start(constants_1.ProgressDetail.Starting));
|
|
90
90
|
await ((_b = dialog_1.DialogUtils.progress) === null || _b === void 0 ? void 0 : _b.next(constants_1.ProgressDetail.UpdateRedirectUri));
|
|
91
91
|
const redirectUris = AadAppForTeamsImpl.getRedirectUris(config.frontendEndpoint, config.botEndpoint, config.clientId);
|
|
92
|
-
await aadAppClient_1.AadAppClient.updateAadAppRedirectUri(
|
|
92
|
+
await aadAppClient_1.AadAppClient.updateAadAppRedirectUri(isLocalDebug ? constants_1.Messages.EndPostLocalDebug.telemetry : constants_1.Messages.EndPostProvision.telemetry, config.objectId, redirectUris, skip);
|
|
93
93
|
(_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(constants_1.Messages.getLog(constants_1.Messages.UpdateRedirectUriSuccess));
|
|
94
94
|
await ((_d = dialog_1.DialogUtils.progress) === null || _d === void 0 ? void 0 : _d.next(constants_1.ProgressDetail.UpdateAppIdUri));
|
|
95
|
-
await aadAppClient_1.AadAppClient.updateAadAppIdUri(
|
|
95
|
+
await aadAppClient_1.AadAppClient.updateAadAppIdUri(isLocalDebug ? constants_1.Messages.EndPostLocalDebug.telemetry : constants_1.Messages.EndPostProvision.telemetry, config.objectId, config.applicationIdUri, skip);
|
|
96
96
|
(_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.info(constants_1.Messages.getLog(constants_1.Messages.UpdateAppIdUriSuccess));
|
|
97
97
|
await ((_f = dialog_1.DialogUtils.progress) === null || _f === void 0 ? void 0 : _f.end(true));
|
|
98
98
|
common_1.Utils.addLogAndTelemetryWithLocalDebug(ctx.logProvider, constants_1.Messages.EndPostProvision, constants_1.Messages.EndPostLocalDebug, isLocalDebug, skip ? { [constants_1.Telemetry.skip]: constants_1.Telemetry.yes } : {});
|
|
@@ -113,12 +113,12 @@ class AadAppForTeamsImpl {
|
|
|
113
113
|
if (!configs) {
|
|
114
114
|
return results_1.ResultFactory.Success();
|
|
115
115
|
}
|
|
116
|
-
await tokenProvider_1.TokenProvider.init(ctx);
|
|
116
|
+
await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken });
|
|
117
117
|
const permissions = AadAppForTeamsImpl.parsePermission(configs[0].permissionRequest, ctx.logProvider);
|
|
118
118
|
await ((_b = dialog_1.DialogUtils.progress) === null || _b === void 0 ? void 0 : _b.start(constants_1.ProgressDetail.Starting));
|
|
119
119
|
await ((_c = dialog_1.DialogUtils.progress) === null || _c === void 0 ? void 0 : _c.next(constants_1.ProgressDetail.UpdatePermission));
|
|
120
120
|
for (const config of configs) {
|
|
121
|
-
await aadAppClient_1.AadAppClient.updateAadAppPermission(
|
|
121
|
+
await aadAppClient_1.AadAppClient.updateAadAppPermission(constants_1.Messages.EndUpdatePermission.telemetry, config.objectId, permissions);
|
|
122
122
|
}
|
|
123
123
|
(_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(constants_1.Messages.getLog(constants_1.Messages.UpdatePermissionSuccess));
|
|
124
124
|
await ((_e = dialog_1.DialogUtils.progress) === null || _e === void 0 ? void 0 : _e.end(true));
|
|
@@ -137,7 +137,7 @@ class AadAppForTeamsImpl {
|
|
|
137
137
|
async checkPermission(ctx, userInfo) {
|
|
138
138
|
telemetry_1.TelemetryUtils.init(ctx);
|
|
139
139
|
common_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.StartCheckPermission);
|
|
140
|
-
await tokenProvider_1.TokenProvider.init(ctx, tokenProvider_1.TokenAudience.Graph);
|
|
140
|
+
await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken }, tokenProvider_1.TokenAudience.Graph);
|
|
141
141
|
const config = new configs_1.CheckGrantPermissionConfig();
|
|
142
142
|
await config.restoreConfigFromContext(ctx);
|
|
143
143
|
const userObjectId = userInfo.aadId;
|
|
@@ -156,7 +156,7 @@ class AadAppForTeamsImpl {
|
|
|
156
156
|
async listCollaborator(ctx) {
|
|
157
157
|
telemetry_1.TelemetryUtils.init(ctx);
|
|
158
158
|
common_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.StartListCollaborator);
|
|
159
|
-
await tokenProvider_1.TokenProvider.init(ctx, tokenProvider_1.TokenAudience.Graph);
|
|
159
|
+
await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken }, tokenProvider_1.TokenAudience.Graph);
|
|
160
160
|
const objectId = configs_1.ConfigUtils.getAadConfig(ctx, constants_1.ConfigKeys.objectId, false);
|
|
161
161
|
if (!objectId) {
|
|
162
162
|
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)));
|
|
@@ -168,7 +168,7 @@ class AadAppForTeamsImpl {
|
|
|
168
168
|
async grantPermission(ctx, userInfo) {
|
|
169
169
|
telemetry_1.TelemetryUtils.init(ctx);
|
|
170
170
|
common_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.StartGrantPermission);
|
|
171
|
-
await tokenProvider_1.TokenProvider.init(ctx, tokenProvider_1.TokenAudience.Graph);
|
|
171
|
+
await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken }, tokenProvider_1.TokenAudience.Graph);
|
|
172
172
|
const config = new configs_1.CheckGrantPermissionConfig(true);
|
|
173
173
|
await config.restoreConfigFromContext(ctx);
|
|
174
174
|
const userObjectId = userInfo.aadId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/plugin.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LogProvider, PluginContext } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { GraphTokenProvider, LogProvider, PluginContext, v2, v3 } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { Messages } from "../constants";
|
|
3
3
|
import { IAADDefinition } from "../interfaces/IAADDefinition";
|
|
4
4
|
export declare class Utils {
|
|
@@ -8,9 +8,11 @@ export declare class Utils {
|
|
|
8
8
|
static addLogAndTelemetry(logProvider: LogProvider | undefined, message: Messages): void;
|
|
9
9
|
static addLocalDebugPrefix(isLocalDebug: boolean, key: string): string;
|
|
10
10
|
static getPermissionErrorMessage(message: string, isGrantPermission?: boolean, objectId?: string): string;
|
|
11
|
-
static getConfigFileName(
|
|
12
|
-
static getInputFileName(
|
|
13
|
-
static getCurrentTenantId(
|
|
11
|
+
static getConfigFileName(envName?: string): string;
|
|
12
|
+
static getInputFileName(envName: string): string;
|
|
13
|
+
static getCurrentTenantId(graphTokenProvider?: GraphTokenProvider): Promise<string>;
|
|
14
|
+
static skipCreateAadForProvision(envInfo: v3.EnvInfoV3): boolean;
|
|
15
|
+
static skipCreateAadForLocalProvision(localSettings: v2.LocalSettings): boolean;
|
|
14
16
|
static skipAADProvision(ctx: PluginContext, isLocalDebug?: boolean): boolean;
|
|
15
17
|
static parseRedirectUriMessage(redirectUris: IAADDefinition): string;
|
|
16
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/common.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/common.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,kBAAkB,EAClB,WAAW,EACX,aAAa,EACb,EAAE,EACF,EAAE,EACH,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAK9D,qBAAa,KAAK;WACF,gCAAgC,CAC5C,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,OAAO,EAAE,QAAQ,EACjB,YAAY,EAAE,QAAQ,EACtB,YAAY,UAAQ,EACpB,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GACrC,IAAI;WAUO,kBAAkB,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS,EAAE,OAAO,EAAE,QAAQ,GAAG,IAAI;WAKjF,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;WAI/D,yBAAyB,CACrC,OAAO,EAAE,MAAM,EACf,iBAAiB,UAAQ,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM;WAMK,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;WAQ3C,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WAInC,kBAAkB,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;WAMlF,yBAAyB,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,GAAG,OAAO;WAsBzD,8BAA8B,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,GAAG,OAAO;WAgBxE,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,OAAO;WAoCnE,uBAAuB,CAAC,YAAY,EAAE,cAAc,GAAG,MAAM;CAc5E"}
|