@microsoft/teamsfx-core 1.2.1 → 1.2.2-alpha.096c8289.0

package/build/plugins/resource/aad/utils/configs.d.ts

@@ -1,4 +1,4 @@
-import { PluginContext, ConfigValue } from "@microsoft/teamsfx-api";
+import { PluginContext, ConfigValue, v2, Result, FxError, v3 } from "@microsoft/teamsfx-api";
 export declare class ConfigUtils {
     static getAadConfig(ctx: PluginContext, key: string, isLocalDebug?: boolean): string | undefined;
     static getLocalDebugConfigOfOtherPlugins(ctx: PluginContext, key: string): string | undefined;
@@ -14,8 +14,12 @@ export declare class ProvisionConfig {
     oauth2PermissionScopeId?: string;
     private isLocalDebug;
     constructor(isLocalDebug?: boolean);
+    restoreConfigFromLocalSettings(ctx: v2.Context, inputs: v2.InputsWithProjectPath, localSettings: v2.LocalSettings): Promise<Result<any, FxError>>;
+    restoreConfigFromEnvInfo(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v3.EnvInfoV3): Promise<Result<any, FxError>>;
     restoreConfigFromContext(ctx: PluginContext): Promise<void>;
     saveConfigIntoContext(ctx: PluginContext, tenantId: string): void;
+    saveConfigIntoLocalSettings(localSettings: v2.LocalSettings, tenantId: string): void;
+    saveConfigIntoEnvInfo(envInfo: v3.EnvInfoV3, tenantId: string): void;
     private static getOauthAuthority;
 }
 export declare class SetApplicationInContextConfig {
@@ -26,15 +30,20 @@ export declare class SetApplicationInContextConfig {
     private isLocalDebug;
     constructor(isLocalDebug?: boolean);
     restoreConfigFromContext(ctx: PluginContext): void;
+    restoreConfigFromLocalSettings(localSettings: v2.LocalSettings): void;
+    restoreConfigFromEnvInfo(ctx: v2.Context, envInfo: v3.EnvInfoV3): void;
     saveConfigIntoContext(ctx: PluginContext): void;
 }
 export declare class PostProvisionConfig {
     frontendEndpoint?: string;
     botEndpoint?: string;
     objectId?: string;
+    clientId?: string;
     applicationIdUri?: string;
     private isLocalDebug;
     constructor(isLocalDebug?: boolean);
+    restoreConfigFromLocalSettings(localSettings: v2.LocalSettings): void;
+    restoreConfigFromEnvInfo(ctx: v2.Context, envInfo: v3.EnvInfoV3): void;
     restoreConfigFromContext(ctx: PluginContext): Promise<void>;
 }
 export declare class UpdatePermissionConfig {

package/build/plugins/resource/aad/utils/configs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configs.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/configs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAmB,MAAM,wBAAwB,CAAC;AAiBrF,qBAAa,WAAW;WACR,YAAY,CACxB,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,MAAM,EACX,YAAY,UAAQ,GACnB,MAAM,GAAG,SAAS;WAgBP,iCAAiC,CAC7C,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS;WAwBP,kBAAkB,CAC9B,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW,EAClB,YAAY,UAAQ;WAiBF,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;IAKnB,wBAAwB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCjE,qBAAqB,CAAC,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IA4BxE,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;IA0ClD,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,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,YAAY,CAAU;gBAElB,YAAY,UAAQ;IAInB,wBAAwB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CA4DzE;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"}
+{"version":3,"file":"configs.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/configs.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/aad/utils/configs.js

@@ -3,54 +3,37 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CheckGrantPermissionConfig = exports.UpdatePermissionConfig = exports.PostProvisionConfig = exports.SetApplicationInContextConfig = exports.ProvisionConfig = exports.ConfigUtils = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("../constants");
 const errors_1 = require("../errors");
 const format_1 = require("./format");
 const common_1 = require("./common");
 const results_1 = require("../results");
 const uuid_1 = require("uuid");
-const common_2 = require("../../../../common");
 const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
+const v3_1 = require("../v3");
+const constants_2 = require("../../../solution/fx-solution/v3/constants");
 class ConfigUtils {
     static getAadConfig(ctx, key, isLocalDebug = false) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         if (isLocalDebug) {
-            if (common_2.isMultiEnvEnabled()) {
-                return (_b = (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.get(key);
-            }
-            else {
-                return (_c = ctx.config) === null || _c === void 0 ? void 0 : _c.get(common_1.Utils.addLocalDebugPrefix(true, key));
-            }
+            return (_b = (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.get(key);
         }
         else {
-            if (common_2.isMultiEnvEnabled()) {
-                return (_d = ctx.envInfo.state.get(constants_1.Plugins.pluginNameComplex)) === null || _d === void 0 ? void 0 : _d.get(key);
-            }
-            else {
-                return (_e = ctx.config) === null || _e === void 0 ? void 0 : _e.get(key);
-            }
+            return (_c = ctx.envInfo.state.get(constants_1.Plugins.pluginNameComplex)) === null || _c === void 0 ? void 0 : _c.get(key);
         }
     }
     static getLocalDebugConfigOfOtherPlugins(ctx, key) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        const isMultiEnvEnable = common_2.isMultiEnvEnabled();
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         switch (key) {
             case constants_1.ConfigKeysOfOtherPlugin.localDebugTabDomain:
-                return isMultiEnvEnable
-                    ? (_b = (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.frontend) === null || _b === void 0 ? void 0 : _b.get(localSettingsConstants_1.LocalSettingsFrontendKeys.TabDomain)
-                    : (_c = ctx.envInfo.state.get(constants_1.Plugins.localDebug)) === null || _c === void 0 ? void 0 : _c.get(key);
+                return (_b = (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.frontend) === null || _b === void 0 ? void 0 : _b.get(localSettingsConstants_1.LocalSettingsFrontendKeys.TabDomain);
             case constants_1.ConfigKeysOfOtherPlugin.localDebugTabEndpoint:
-                return isMultiEnvEnable
-                    ? (_e = (_d = ctx.localSettings) === null || _d === void 0 ? void 0 : _d.frontend) === null || _e === void 0 ? void 0 : _e.get(localSettingsConstants_1.LocalSettingsFrontendKeys.TabEndpoint)
-                    : (_f = ctx.envInfo.state.get(constants_1.Plugins.localDebug)) === null || _f === void 0 ? void 0 : _f.get(key);
+                return (_d = (_c = ctx.localSettings) === null || _c === void 0 ? void 0 : _c.frontend) === null || _d === void 0 ? void 0 : _d.get(localSettingsConstants_1.LocalSettingsFrontendKeys.TabEndpoint);
             case constants_1.ConfigKeysOfOtherPlugin.localDebugBotEndpoint:
-                return isMultiEnvEnable
-                    ? (_h = (_g = ctx.localSettings) === null || _g === void 0 ? void 0 : _g.bot) === null || _h === void 0 ? void 0 : _h.get(localSettingsConstants_1.LocalSettingsBotKeys.BotEndpoint)
-                    : (_j = ctx.envInfo.state.get(constants_1.Plugins.localDebug)) === null || _j === void 0 ? void 0 : _j.get(key);
+                return (_f = (_e = ctx.localSettings) === null || _e === void 0 ? void 0 : _e.bot) === null || _f === void 0 ? void 0 : _f.get(localSettingsConstants_1.LocalSettingsBotKeys.BotEndpoint);
             case constants_1.ConfigKeysOfOtherPlugin.teamsBotIdLocal:
-                return isMultiEnvEnable
-                    ? (_l = (_k = ctx.localSettings) === null || _k === void 0 ? void 0 : _k.bot) === null || _l === void 0 ? void 0 : _l.get(localSettingsConstants_1.LocalSettingsBotKeys.BotId)
-                    : (_m = ctx.envInfo.state.get(constants_1.Plugins.teamsBot)) === null || _m === void 0 ? void 0 : _m.get(key);
+                return (_h = (_g = ctx.localSettings) === null || _g === void 0 ? void 0 : _g.bot) === null || _h === void 0 ? void 0 : _h.get(localSettingsConstants_1.LocalSettingsBotKeys.BotId);
             default:
                 return undefined;
         }
@@ -60,16 +43,11 @@ class ConfigUtils {
         if (!value) {
             return;
         }
-        if (common_2.isMultiEnvEnabled()) {
-            if (isLocalDebug) {
-                (_b = (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.set(key, value);
-            }
-            else {
-                (_c = ctx.envInfo.state.get(constants_1.Plugins.pluginNameComplex)) === null || _c === void 0 ? void 0 : _c.set(key, value);
-            }
+        if (isLocalDebug) {
+            (_b = (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.set(key, value);
         }
         else {
-            ctx.config.set(common_1.Utils.addLocalDebugPrefix(isLocalDebug, key), value);
+            (_c = ctx.envInfo.state.get(constants_1.Plugins.pluginNameComplex)) === null || _c === void 0 ? void 0 : _c.set(key, value);
         }
     }
     static async getPermissionRequest(ctx) {
@@ -91,6 +69,54 @@ class ProvisionConfig {
         this.isLocalDebug = isLocalDebug;
         this.oauth2PermissionScopeId = uuid_1.v4();
     }
+    async restoreConfigFromLocalSettings(ctx, inputs, localSettings) {
+        var _a, _b;
+        const displayName = ctx.projectSetting.appName;
+        if (displayName) {
+            this.displayName = displayName.substr(0, constants_1.Constants.aadAppMaxLength);
+        }
+        else {
+            throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetDisplayNameError));
+        }
+        const permissionRes = await v3_1.getPermissionRequest(inputs.projectPath);
+        if (permissionRes.isErr()) {
+            return teamsfx_api_1.err(permissionRes.error);
+        }
+        this.permissionRequest = permissionRes.value;
+        const objectId = (_a = localSettings.auth) === null || _a === void 0 ? void 0 : _a.objectId;
+        if (objectId) {
+            this.objectId = objectId;
+        }
+        const clientSecret = (_b = localSettings.auth) === null || _b === void 0 ? void 0 : _b.clientSecret;
+        if (clientSecret) {
+            this.password = clientSecret;
+        }
+        return teamsfx_api_1.ok(undefined);
+    }
+    async restoreConfigFromEnvInfo(ctx, inputs, envInfo) {
+        const displayName = ctx.projectSetting.appName;
+        if (displayName) {
+            this.displayName = displayName.substr(0, constants_1.Constants.aadAppMaxLength);
+        }
+        else {
+            throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.GetConfigError.message(errors_1.ConfigErrorMessages.GetDisplayNameError));
+        }
+        const permissionRes = await v3_1.getPermissionRequest(inputs.projectPath);
+        if (permissionRes.isErr()) {
+            return teamsfx_api_1.err(permissionRes.error);
+        }
+        this.permissionRequest = permissionRes.value;
+        const aadResource = envInfo.state[constants_2.BuiltInFeaturePluginNames.aad];
+        const objectId = aadResource === null || aadResource === void 0 ? void 0 : aadResource.objectId;
+        if (objectId) {
+            this.objectId = objectId;
+        }
+        const clientSecret = aadResource === null || aadResource === void 0 ? void 0 : aadResource.clientSecret;
+        if (clientSecret) {
+            this.password = clientSecret;
+        }
+        return teamsfx_api_1.ok(undefined);
+    }
     async restoreConfigFromContext(ctx) {
         const displayName = ctx.projectSettings.appName;
         if (displayName) {
@@ -116,8 +142,46 @@ class ProvisionConfig {
         ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.objectId, this.objectId, this.isLocalDebug);
         ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.oauth2PermissionScopeId, this.oauth2PermissionScopeId, this.isLocalDebug);
         ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.tenantId, tenantId, this.isLocalDebug);
-        ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.oauthHost, constants_1.Constants.oauthAuthorityPrefix, common_2.isMultiEnvEnabled() && this.isLocalDebug);
-        ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.oauthAuthority, oauthAuthority, common_2.isMultiEnvEnabled() && this.isLocalDebug);
+        ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.oauthHost, constants_1.Constants.oauthAuthorityPrefix, this.isLocalDebug);
+        ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.oauthAuthority, oauthAuthority, this.isLocalDebug);
+    }
+    saveConfigIntoLocalSettings(localSettings, tenantId) {
+        const oauthAuthority = ProvisionConfig.getOauthAuthority(tenantId);
+        if (!localSettings.auth) {
+            localSettings.auth = {};
+        }
+        if (localSettings.auth) {
+            if (this.clientId)
+                localSettings.auth.clientId = this.clientId;
+            if (this.password)
+                localSettings.auth.clientSecret = this.password;
+            if (this.objectId)
+                localSettings.auth.objectId = this.objectId;
+            if (this.oauth2PermissionScopeId)
+                localSettings.auth.oauth2PermissionScopeId = this.oauth2PermissionScopeId;
+            localSettings.auth.tenantId = tenantId;
+            localSettings.auth.oauthHost = constants_1.Constants.oauthAuthorityPrefix;
+            localSettings.auth.oauthAuthority = oauthAuthority;
+        }
+    }
+    saveConfigIntoEnvInfo(envInfo, tenantId) {
+        if (!envInfo.state[constants_2.BuiltInFeaturePluginNames.aad]) {
+            envInfo.state[constants_2.BuiltInFeaturePluginNames.aad] = {};
+            envInfo.state[constants_2.BuiltInFeaturePluginNames.aad].secretFields = ["clientSecret"];
+        }
+        const envState = envInfo.state[constants_2.BuiltInFeaturePluginNames.aad];
+        const oauthAuthority = ProvisionConfig.getOauthAuthority(tenantId);
+        if (this.clientId)
+            envState.clientId = this.clientId;
+        if (this.password)
+            envState.clientSecret = this.password;
+        if (this.objectId)
+            envState.objectId = this.objectId;
+        if (this.oauth2PermissionScopeId)
+            envState.oauth2PermissionScopeId = this.oauth2PermissionScopeId;
+        envState.tenantId = tenantId;
+        envState.oauthHost = constants_1.Constants.oauthAuthorityPrefix;
+        envState.oauthAuthority = oauthAuthority;
     }
     static getOauthAuthority(tenantId) {
         return `${constants_1.Constants.oauthAuthorityPrefix}/${tenantId}`;
@@ -158,6 +222,46 @@ class SetApplicationInContextConfig {
             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)));
         }
     }
+    restoreConfigFromLocalSettings(localSettings) {
+        var _a, _b, _c;
+        const frontendDomain = (_a = localSettings.frontend) === null || _a === void 0 ? void 0 : _a.tabDomain;
+        if (frontendDomain) {
+            this.frontendDomain = format_1.format(frontendDomain, format_1.Formats.Domain);
+        }
+        const botId = (_b = localSettings.bot) === null || _b === void 0 ? void 0 : _b.botId;
+        if (botId) {
+            this.botId = format_1.format(botId, format_1.Formats.UUID);
+        }
+        const clientId = (_c = localSettings.auth) === null || _c === void 0 ? void 0 : _c.clientId;
+        if (clientId) {
+            this.clientId = clientId;
+        }
+        else {
+            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)));
+        }
+    }
+    restoreConfigFromEnvInfo(ctx, envInfo) {
+        var _a, _b;
+        const aadResource = envInfo.state[constants_2.BuiltInFeaturePluginNames.aad];
+        let frontendDomain = aadResource === null || aadResource === void 0 ? void 0 : aadResource.domain;
+        if (!frontendDomain) {
+            frontendDomain = (_a = envInfo.state[constants_2.BuiltInFeaturePluginNames.frontend]) === null || _a === void 0 ? void 0 : _a.domain;
+        }
+        if (frontendDomain) {
+            this.frontendDomain = format_1.format(frontendDomain, format_1.Formats.Domain);
+        }
+        const botId = (_b = envInfo.state[constants_2.BuiltInFeaturePluginNames.bot]) === null || _b === void 0 ? void 0 : _b.botId;
+        if (botId) {
+            this.botId = format_1.format(botId, format_1.Formats.UUID);
+        }
+        const clientId = aadResource === null || aadResource === void 0 ? void 0 : aadResource.clientId;
+        if (clientId) {
+            this.clientId = clientId;
+        }
+        else {
+            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)));
+        }
+    }
     saveConfigIntoContext(ctx) {
         ConfigUtils.checkAndSaveConfig(ctx, constants_1.ConfigKeys.applicationIdUri, this.applicationIdUri, this.isLocalDebug);
     }
@@ -167,6 +271,81 @@ class PostProvisionConfig {
     constructor(isLocalDebug = false) {
         this.isLocalDebug = isLocalDebug;
     }
+    restoreConfigFromLocalSettings(localSettings) {
+        var _a, _b, _c, _d, _e;
+        const frontendEndpoint = (_a = localSettings.frontend) === null || _a === void 0 ? void 0 : _a.tabEndpoint;
+        if (frontendEndpoint) {
+            this.frontendEndpoint = format_1.format(frontendEndpoint, format_1.Formats.Endpoint);
+        }
+        const botEndpoint = (_b = localSettings.bot) === null || _b === void 0 ? void 0 : _b.botEndpoint;
+        if (botEndpoint) {
+            this.botEndpoint = format_1.format(botEndpoint, format_1.Formats.Endpoint);
+        }
+        const objectId = (_c = localSettings.auth) === null || _c === void 0 ? void 0 : _c.objectId;
+        if (objectId) {
+            this.objectId = objectId;
+        }
+        if (objectId) {
+            this.objectId = objectId;
+        }
+        else {
+            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)));
+        }
+        const applicationIdUri = (_d = localSettings.auth) === null || _d === void 0 ? void 0 : _d.applicationIdUris;
+        if (applicationIdUri) {
+            this.applicationIdUri = applicationIdUri;
+        }
+        else {
+            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)));
+        }
+        const clientId = (_e = localSettings.auth) === null || _e === void 0 ? void 0 : _e.clientId;
+        if (objectId) {
+            this.clientId = clientId;
+        }
+        else {
+            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)));
+        }
+    }
+    restoreConfigFromEnvInfo(ctx, envInfo) {
+        var _a, _b;
+        // const solutionSettings = ctx.projectSetting.solutionSettings as v3.TeamsFxSolutionSettings;
+        const aadResource = envInfo.state[constants_2.BuiltInFeaturePluginNames.aad];
+        let frontendEndpoint = aadResource === null || aadResource === void 0 ? void 0 : aadResource.endpoint;
+        if (!frontendEndpoint) {
+            frontendEndpoint = (_a = envInfo.state[constants_2.BuiltInFeaturePluginNames.frontend]) === null || _a === void 0 ? void 0 : _a.endpoint;
+        }
+        if (frontendEndpoint) {
+            this.frontendEndpoint = format_1.format(frontendEndpoint, format_1.Formats.Endpoint);
+        }
+        const botEndpoint = (_b = envInfo.state[constants_2.BuiltInFeaturePluginNames.bot]) === null || _b === void 0 ? void 0 : _b.siteEndpoint;
+        if (botEndpoint) {
+            this.botEndpoint = format_1.format(botEndpoint, format_1.Formats.Endpoint);
+        }
+        const objectId = aadResource === null || aadResource === void 0 ? void 0 : aadResource.objectId;
+        if (objectId) {
+            this.objectId = objectId;
+        }
+        if (objectId) {
+            this.objectId = objectId;
+        }
+        else {
+            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)));
+        }
+        const applicationIdUri = aadResource === null || aadResource === void 0 ? void 0 : aadResource.applicationIdUris;
+        if (applicationIdUri) {
+            this.applicationIdUri = applicationIdUri;
+        }
+        else {
+            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)));
+        }
+        const clientId = aadResource === null || aadResource === void 0 ? void 0 : aadResource.clientId;
+        if (clientId) {
+            this.clientId = clientId;
+        }
+        else {
+            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)));
+        }
+    }
     async restoreConfigFromContext(ctx) {
         var _a, _b;
         let frontendEndpoint;
@@ -203,6 +382,13 @@ class PostProvisionConfig {
         else {
             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)));
         }
+        const clientId = ConfigUtils.getAadConfig(ctx, constants_1.ConfigKeys.clientId, this.isLocalDebug);
+        if (clientId) {
+            this.clientId = clientId;
+        }
+        else {
+            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)));
+        }
     }
 }
 exports.PostProvisionConfig = PostProvisionConfig;

package/build/plugins/resource/aad/utils/configs.js.map

@@ -1 +1 @@
-{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/configs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/configs.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/aad/utils/telemetry.d.ts

@@ -1,6 +1,5 @@
 import { PluginContext } from "@microsoft/teamsfx-api";
 export declare class TelemetryUtils {
-    static ctx: PluginContext;
     static init(ctx: PluginContext): void;
     static sendEvent(eventName: string, properties?: {
         [key: string]: string;

package/build/plugins/resource/aad/utils/telemetry.d.ts.map

@@ -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;AAGvD,qBAAa,cAAc;IACzB,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC;WAEZ,IAAI,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI;WAI9B,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;IAkBP,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAe,MAAM,gBAAgB,MAAM;;;MAKzE;IAEF,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAalC"}
+{"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"}

package/build/plugins/resource/aad/utils/telemetry.js

@@ -3,19 +3,19 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TelemetryUtils = void 0;
+const core_1 = require("../../../../core");
+const solutionGlobalVars_1 = require("../../../solution/fx-solution/v3/solutionGlobalVars");
 const constants_1 = require("../constants");
 class TelemetryUtils {
-    static init(ctx) {
-        TelemetryUtils.ctx = ctx;
-    }
+    static init(ctx) { }
     static sendEvent(eventName, properties, measurements) {
         var _a;
         if (!properties) {
             properties = {};
         }
         properties[constants_1.Telemetry.component] = constants_1.Plugins.pluginNameComplex;
-        TelemetryUtils.addAppIdInProperty(properties, this.ctx);
-        (_a = TelemetryUtils.ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(eventName, properties, measurements);
+        TelemetryUtils.addAppIdInProperty(properties);
+        (_a = core_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(eventName, properties, measurements);
     }
     static sendSuccessEvent(eventName, properties, measurements) {
         if (!properties) {
@@ -34,19 +34,12 @@ class TelemetryUtils {
         properties[constants_1.Telemetry.errorType] = errorType;
         properties[constants_1.Telemetry.errorMessage] = errorMessage;
         properties[constants_1.Telemetry.isSuccess] = constants_1.Telemetry.no;
-        TelemetryUtils.addAppIdInProperty(properties, this.ctx);
-        (_a = TelemetryUtils.ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(eventName, properties, measurements);
+        TelemetryUtils.addAppIdInProperty(properties);
+        (_a = core_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(eventName, properties, measurements);
     }
-    static addAppIdInProperty(properties, ctx) {
-        var _a;
-        const appId = (_a = ctx.envInfo.state
-            .get(constants_1.Plugins.solution)) === null || _a === void 0 ? void 0 : _a.get(constants_1.ConfigKeysOfOtherPlugin.remoteTeamsAppId);
-        if (appId) {
-            properties[constants_1.Telemetry.appId] = appId;
-        }
-        else {
-            properties[constants_1.Telemetry.appId] = "";
-        }
+    static addAppIdInProperty(properties) {
+        const appId = solutionGlobalVars_1.solutionGlobalVars.TeamsAppId || "";
+        properties[constants_1.Telemetry.appId] = appId;
     }
 }
 exports.TelemetryUtils = TelemetryUtils;

package/build/plugins/resource/aad/utils/telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,4CAA2E;AAE3E,MAAa,cAAc;IAGlB,MAAM,CAAC,IAAI,CAAC,GAAkB;QACnC,cAAc,CAAC,GAAG,GAAG,GAAG,CAAC;IAC3B,CAAC;IAEM,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,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,MAAA,cAAc,CAAC,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IAChG,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,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,MAAA,cAAc,CAAC,GAAG,CAAC,iBAAiB,0CAAE,uBAAuB,CAC3D,SAAS,EACT,UAAU,EACV,YAAY,CACb,CAAC;IACJ,CAAC;IASO,MAAM,CAAC,kBAAkB,CAC/B,UAAqC,EACrC,GAAkB;;QAElB,MAAM,KAAK,GAAG,MAAA,GAAG,CAAC,OAAO,CAAC,KAAK;aAC5B,GAAG,CAAC,mBAAO,CAAC,QAAQ,CAAC,0CACpB,GAAG,CAAC,mCAAuB,CAAC,gBAAgB,CAAC,CAAC;QAClD,IAAI,KAAK,EAAE;YACT,UAAU,CAAC,qBAAS,CAAC,KAAK,CAAC,GAAG,KAAe,CAAC;SAC/C;aAAM;YACL,UAAU,CAAC,qBAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;SAClC;IACH,CAAC;;AA5EH,wCA6EC;AApBiB,+BAAgB,GAAG,CAAC,SAAiB,EAAE,YAAoB,EAAE,EAAE;IAC7E,OAAO;QACL,YAAY,EAAE,SAAS;QACvB,eAAe,EAAE,YAAY;KAC9B,CAAC;AACJ,CAAC,CAAC"}
+{"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"}

package/build/plugins/resource/aad/utils/tokenProvider.d.ts

@@ -1,12 +1,16 @@
-import { PluginContext } from "@microsoft/teamsfx-api";
+import { AppStudioTokenProvider, GraphTokenProvider } from "@microsoft/teamsfx-api";
 export declare enum TokenAudience {
     Graph = "graph",
     AppStudio = "appStudio"
 }
+export interface GraphAndAppStudioTokenProvider {
+    graph?: GraphTokenProvider;
+    appStudio?: AppStudioTokenProvider;
+}
 export declare class TokenProvider {
     static token?: string;
     static tenantId?: string;
     static audience: TokenAudience;
-    static init(ctx: PluginContext, audience?: TokenAudience): Promise<void>;
+    static init(tokenProvider: GraphAndAppStudioTokenProvider, audience?: TokenAudience): Promise<void>;
 }
 //# sourceMappingURL=tokenProvider.d.ts.map

package/build/plugins/resource/aad/utils/tokenProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenProvider.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/tokenProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAIvD,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,SAAS,cAAc;CACxB;AAyCD,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,GAAG,EAAE,aAAa,EAClB,QAAQ,GAAE,aAAmC,GAC5C,OAAO,CAAC,IAAI,CAAC;CAwBjB"}
+{"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"}

package/build/plugins/resource/aad/utils/tokenProvider.js

@@ -11,14 +11,14 @@ var TokenAudience;
     TokenAudience["AppStudio"] = "appStudio";
 })(TokenAudience = exports.TokenAudience || (exports.TokenAudience = {}));
 class GraphInstance {
-    async getToken(ctx) {
+    async getToken(tokenProvider) {
         var _a;
-        const token = await ((_a = ctx.graphTokenProvider) === null || _a === void 0 ? void 0 : _a.getAccessToken());
+        const token = await ((_a = tokenProvider.graph) === null || _a === void 0 ? void 0 : _a.getAccessToken());
         return token;
     }
-    async getTenant(ctx) {
+    async getTenant(tokenProvider) {
         var _a;
-        const tokenObject = await ((_a = ctx.graphTokenProvider) === null || _a === void 0 ? void 0 : _a.getJsonObject());
+        const tokenObject = await ((_a = tokenProvider.graph) === null || _a === void 0 ? void 0 : _a.getJsonObject());
         if (!tokenObject) {
             return undefined;
         }
@@ -27,14 +27,14 @@ class GraphInstance {
     }
 }
 class AppStudioInstance {
-    async getToken(ctx) {
+    async getToken(tokenProvider) {
         var _a;
-        const token = await ((_a = ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getAccessToken());
+        const token = await ((_a = tokenProvider.appStudio) === null || _a === void 0 ? void 0 : _a.getAccessToken());
         return token;
     }
-    async getTenant(ctx) {
+    async getTenant(tokenProvider) {
         var _a;
-        const tokenObject = await ((_a = ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getJsonObject());
+        const tokenObject = await ((_a = tokenProvider.appStudio) === null || _a === void 0 ? void 0 : _a.getJsonObject());
         if (!tokenObject) {
             return undefined;
         }
@@ -43,7 +43,7 @@ class AppStudioInstance {
     }
 }
 class TokenProvider {
-    static async init(ctx, audience = TokenAudience.Graph) {
+    static async init(tokenProvider, audience = TokenAudience.Graph) {
         this.audience = audience;
         let instance;
         if (audience === TokenAudience.AppStudio) {
@@ -52,14 +52,14 @@ class TokenProvider {
         else {
             instance = new GraphInstance();
         }
-        const token = await instance.getToken(ctx);
+        const token = await instance.getToken(tokenProvider);
         if (token) {
             TokenProvider.token = token;
         }
         else {
             throw results_1.ResultFactory.SystemError(errors_1.GetTokenError.name, errors_1.GetTokenError.message(this.audience));
         }
-        const tenantId = await instance.getTenant(ctx);
+        const tenantId = await instance.getTenant(tokenProvider);
         if (tenantId) {
             this.tenantId = tenantId;
         }

package/build/plugins/resource/aad/utils/tokenProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokenProvider.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/tokenProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wCAA2C;AAC3C,sCAA+D;AAE/D,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,wCAAuB,CAAA;AACzB,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB;AAOD,MAAM,aAAa;IACV,KAAK,CAAC,QAAQ,CAAC,GAAkB;;QACtC,MAAM,KAAK,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,kBAAkB,0CAAE,cAAc,EAAE,CAAA,CAAC;QAC7D,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,GAAkB;;QACvC,MAAM,WAAW,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,kBAAkB,0CAAE,aAAa,EAAE,CAAA,CAAC;QAClE,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,QAAQ,GAAY,WAAmB,CAAC,GAAG,CAAC;QAClD,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED,MAAM,iBAAiB;IACd,KAAK,CAAC,QAAQ,CAAC,GAAkB;;QACtC,MAAM,KAAK,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,cAAc,0CAAE,cAAc,EAAE,CAAA,CAAC;QACzD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,GAAkB;;QACvC,MAAM,WAAW,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,cAAc,0CAAE,aAAa,EAAE,CAAA,CAAC;QAC9D,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,QAAQ,GAAY,WAAmB,CAAC,GAAG,CAAC;QAClD,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED,MAAa,aAAa;IAKjB,MAAM,CAAC,KAAK,CAAC,IAAI,CACtB,GAAkB,EAClB,WAA0B,aAAa,CAAC,KAAK;QAE7C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,IAAI,QAAuB,CAAC;QAC5B,IAAI,QAAQ,KAAK,aAAa,CAAC,SAAS,EAAE;YACxC,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAC;SACpC;aAAM;YACL,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;SAChC;QAED,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,KAAK,EAAE;YACT,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;SAC7B;aAAM;YACL,MAAM,uBAAa,CAAC,WAAW,CAAC,sBAAa,CAAC,IAAI,EAAE,sBAAa,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;SAC3F;QAED,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAC1B;aAAM;YACL,MAAM,uBAAa,CAAC,WAAW,CAAC,4BAAmB,CAAC,IAAI,EAAE,4BAAmB,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1F;IACH,CAAC;CACF;AAhCD,sCAgCC"}
+{"version":3,"file":"tokenProvider.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/utils/tokenProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wCAA2C;AAC3C,sCAA+D;AAE/D,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,wCAAuB,CAAA;AACzB,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB;AAWD,MAAM,aAAa;IACV,KAAK,CAAC,QAAQ,CACnB,aAA6C;;QAE7C,MAAM,KAAK,GAAG,MAAM,CAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,EAAE,CAAA,CAAC;QAC1D,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,SAAS,CACpB,aAA6C;;QAE7C,MAAM,WAAW,GAAG,MAAM,CAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,aAAa,EAAE,CAAA,CAAC;QAC/D,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,QAAQ,GAAY,WAAmB,CAAC,GAAG,CAAC;QAClD,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED,MAAM,iBAAiB;IACd,KAAK,CAAC,QAAQ,CACnB,aAA6C;;QAE7C,MAAM,KAAK,GAAG,MAAM,CAAA,MAAA,aAAa,CAAC,SAAS,0CAAE,cAAc,EAAE,CAAA,CAAC;QAC9D,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,SAAS,CACpB,aAA6C;;QAE7C,MAAM,WAAW,GAAG,MAAM,CAAA,MAAA,aAAa,CAAC,SAAS,0CAAE,aAAa,EAAE,CAAA,CAAC;QACnE,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,QAAQ,GAAY,WAAmB,CAAC,GAAG,CAAC;QAClD,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED,MAAa,aAAa;IAKjB,MAAM,CAAC,KAAK,CAAC,IAAI,CACtB,aAA6C,EAC7C,WAA0B,aAAa,CAAC,KAAK;QAE7C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,IAAI,QAAuB,CAAC;QAC5B,IAAI,QAAQ,KAAK,aAAa,CAAC,SAAS,EAAE;YACxC,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAC;SACpC;aAAM;YACL,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;SAChC;QAED,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACrD,IAAI,KAAK,EAAE;YACT,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;SAC7B;aAAM;YACL,MAAM,uBAAa,CAAC,WAAW,CAAC,sBAAa,CAAC,IAAI,EAAE,sBAAa,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;SAC3F;QAED,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACzD,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAC1B;aAAM;YACL,MAAM,uBAAa,CAAC,WAAW,CAAC,4BAAmB,CAAC,IAAI,EAAE,4BAAmB,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1F;IACH,CAAC;CACF;AAhCD,sCAgCC"}