@microsoft/teamsfx-core 1.3.0 → 1.3.1-alpha.c8083c82.0

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"}

package/build/plugins/resource/aad/v2/index.d.ts

@@ -1,19 +1,18 @@
 import { Func, FxError, Inputs, Json, Result, TokenProvider, Void, v2, ProjectSettings } from "@microsoft/teamsfx-api";
-import { Context, ProvisionInputs, ResourcePlugin, ResourceProvisionOutput, ResourceTemplate } from "@microsoft/teamsfx-api/build/v2";
 import { AadAppForTeamsPlugin } from "..";
-export declare class AadPluginV2 implements ResourcePlugin {
+export declare class AadPluginV2 implements v2.ResourcePlugin {
     name: string;
     displayName: string;
     plugin: AadAppForTeamsPlugin;
     activate(projectSettings: ProjectSettings): boolean;
-    generateResourceTemplate(ctx: Context, inputs: Inputs): Promise<Result<ResourceTemplate, FxError>>;
-    provisionResource(ctx: Context, inputs: ProvisionInputs, envInfo: Readonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<ResourceProvisionOutput, FxError>>;
-    configureResource(ctx: Context, inputs: ProvisionInputs, envInfo: Readonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<ResourceProvisionOutput, FxError>>;
-    provisionLocalResource(ctx: Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
-    configureLocalResource(ctx: Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
-    executeUserTask(ctx: Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<unknown, FxError>>;
-    grantPermission(ctx: Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, userInfo: Json): Promise<Result<Json, FxError>>;
-    checkPermission(ctx: Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, userInfo: Json): Promise<Result<Json, FxError>>;
-    listCollaborator(ctx: Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, userInfo: Json): Promise<Result<Json, FxError>>;
+    generateResourceTemplate(ctx: v2.Context, inputs: Inputs): Promise<Result<v2.ResourceTemplate, FxError>>;
+    provisionResource(ctx: v2.Context, inputs: v2.ProvisionInputs, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
+    configureResource(ctx: v2.Context, inputs: v2.ProvisionInputs, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
+    provisionLocalResource(ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
+    configureLocalResource(ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
+    executeUserTask(ctx: v2.Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<unknown, FxError>>;
+    grantPermission(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, userInfo: Json): Promise<Result<Json, FxError>>;
+    checkPermission(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, userInfo: Json): Promise<Result<Json, FxError>>;
+    listCollaborator(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, userInfo: Json): Promise<Result<Json, FxError>>;
 }
 //# sourceMappingURL=index.d.ts.map

package/build/plugins/resource/aad/v2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,EACJ,MAAM,EACN,aAAa,EACb,IAAI,EACJ,EAAE,EACF,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,OAAO,EACP,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,gBAAgB,EACjB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAe1C,qBACa,WAAY,YAAW,cAAc;IAChD,IAAI,SAAmC;IACvC,WAAW,SAAS;IAEpB,MAAM,EAAG,oBAAoB,CAAC;IAE9B,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAK7C,wBAAwB,CAC5B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAGvC,iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,EAC/B,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAI9C,iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,EAC/B,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAI9C,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAY9B,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAY3B,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAY3B,gBAAgB,CACpB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAWlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,EACJ,MAAM,EACN,aAAa,EACb,IAAI,EACJ,EAAE,EACF,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAe1C,qBACa,WAAY,YAAW,EAAE,CAAC,cAAc;IACnD,IAAI,SAAmC;IACvC,WAAW,SAAS;IAEpB,MAAM,EAAG,oBAAoB,CAAC;IAE9B,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAK7C,wBAAwB,CAC5B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAG1C,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,eAAe,EAC1B,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAI3B,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,eAAe,EAC1B,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAI3B,sBAAsB,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,sBAAsB,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,eAAe,CACnB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAY9B,eAAe,CACnB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAY3B,eAAe,CACnB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAY3B,gBAAgB,CACpB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAWlC"}

package/build/plugins/resource/aad/v2/index.js.map

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

package/build/plugins/resource/aad/v3/index.d.ts

@@ -0,0 +1,20 @@
+import { FxError, ProjectSettings, Result, TokenProvider as TokenProviderInAPI, v2, v3, Void } from "@microsoft/teamsfx-api";
+export declare function createPermissionRequestFile(projectPath: string): Promise<Result<string, FxError>>;
+export declare function checkPermissionRequest(projectPath: string): Promise<Result<string, FxError>>;
+export declare function getPermissionRequest(projectPath: string): Promise<Result<string, FxError>>;
+export declare function isAadAdded(projectSetting: ProjectSettings): boolean;
+export declare class AadAppForTeamsPluginV3 implements v3.FeaturePlugin {
+    name: string;
+    type: "resource";
+    resourceType: string;
+    description: string;
+    /**
+     * when AAD is added, permissions.json is created
+     * manifest template will also be updated
+     */
+    addFeature(ctx: v3.ContextWithManifestProvider, inputs: v2.InputsWithProjectPath): Promise<Result<v2.ResourceTemplate[], FxError>>;
+    provisionResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v3.EnvInfoV3, tokenProvider: TokenProviderInAPI, props?: any): Promise<Result<Void, FxError>>;
+    configureResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v3.EnvInfoV3, tokenProvider: TokenProviderInAPI, props?: any): Promise<Result<Void, FxError>>;
+    setApplicationInContext(ctx: v2.Context, envInfo: v3.EnvInfoV3): Promise<Result<Void, FxError>>;
+}
+//# sourceMappingURL=index.d.ts.map

package/build/plugins/resource/aad/v3/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/v3/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,OAAO,EAEP,eAAe,EACf,MAAM,EAEN,aAAa,IAAI,kBAAkB,EAEnC,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAwBhC,wBAAsB,2BAA2B,CAC/C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC;AAED,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAYlC;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAOhG;AAED,wBAAgB,UAAU,CAAC,cAAc,EAAE,eAAe,GAAG,OAAO,CASnE;AAED,qBACa,sBAAuB,YAAW,EAAE,CAAC,aAAa;IAC7D,IAAI,SAA6B;IACjC,IAAI,EAAE,UAAU,CAAc;IAC9B,YAAY,SAAkB;IAC9B,WAAW,SAA+D;IAE1E;;;OAGG;IAEG,UAAU,CACd,GAAG,EAAE,EAAE,CAAC,2BAA2B,EACnC,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAmB5C,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,kBAAkB,EACjC,KAAK,CAAC,EAAE,GAAG,GACV,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IA4E3B,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,kBAAkB,EACjC,KAAK,CAAC,EAAE,GAAG,GACV,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAkDpB,uBAAuB,CAClC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAmBlC"}

package/build/plugins/resource/aad/v3/index.js

@@ -0,0 +1,213 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AadAppForTeamsPluginV3 = exports.isAadAdded = exports.getPermissionRequest = exports.checkPermissionRequest = exports.createPermissionRequestFile = void 0;
+const tslib_1 = require("tslib");
+const lib_1 = require("@feathersjs/hooks/lib");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path = tslib_1.__importStar(require("path"));
+const typedi_1 = require("typedi");
+const CommonErrorHandlerMW_1 = require("../../../../core/middleware/CommonErrorHandlerMW");
+const solution_1 = require("../../../solution");
+const constants_1 = require("../../../solution/fx-solution/v3/constants");
+const aadAppClient_1 = require("../aadAppClient");
+const constants_2 = require("../constants");
+const errors_1 = require("../errors");
+const plugin_1 = require("../plugin");
+const results_1 = require("../results");
+const common_1 = require("../utils/common");
+const configs_1 = require("../utils/configs");
+const dialog_1 = require("../utils/dialog");
+const tokenProvider_1 = require("../utils/tokenProvider");
+const permissionFile = "permissions.json";
+async function createPermissionRequestFile(projectPath) {
+    const filePath = path.join(projectPath, permissionFile);
+    await fs_extra_1.default.writeJSON(filePath, solution_1.DEFAULT_PERMISSION_REQUEST, {
+        spaces: 4,
+    });
+    return teamsfx_api_1.ok(filePath);
+}
+exports.createPermissionRequestFile = createPermissionRequestFile;
+async function checkPermissionRequest(projectPath) {
+    const filePath = path.join(projectPath, permissionFile);
+    if (!(await fs_extra_1.default.pathExists(filePath))) {
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError(solution_1.SolutionError.MissingPermissionsJson, `${filePath} is missing`, constants_2.Plugins.pluginNameShort));
+    }
+    return teamsfx_api_1.ok(filePath);
+}
+exports.checkPermissionRequest = checkPermissionRequest;
+async function getPermissionRequest(projectPath) {
+    const checkRes = await checkPermissionRequest(projectPath);
+    if (checkRes.isErr()) {
+        return teamsfx_api_1.err(checkRes.error);
+    }
+    const permissionRequest = await fs_extra_1.default.readJSON(checkRes.value);
+    return teamsfx_api_1.ok(JSON.stringify(permissionRequest));
+}
+exports.getPermissionRequest = getPermissionRequest;
+function isAadAdded(projectSetting) {
+    if (projectSetting.solutionSettings &&
+        projectSetting.solutionSettings.activeResourcePlugins.includes(constants_2.Plugins.pluginNameComplex))
+        return true;
+    return false;
+}
+exports.isAadAdded = isAadAdded;
+let AadAppForTeamsPluginV3 = class AadAppForTeamsPluginV3 {
+    constructor() {
+        this.name = constants_2.Plugins.pluginNameComplex;
+        this.type = "resource";
+        this.resourceType = "Azure AD App";
+        this.description = "Azure AD App provide single-sign-on feature for Teams App";
+    }
+    /**
+     * when AAD is added, permissions.json is created
+     * manifest template will also be updated
+     */
+    async addFeature(ctx, inputs) {
+        const res = await createPermissionRequestFile(inputs.projectPath);
+        if (res.isErr())
+            return teamsfx_api_1.err(res.error);
+        const loadRes = await ctx.appManifestProvider.loadManifest(ctx, inputs);
+        if (loadRes.isErr())
+            return teamsfx_api_1.err(loadRes.error);
+        const manifest = loadRes.value;
+        manifest.webApplicationInfo = {
+            id: `{{state.${constants_2.Plugins.pluginNameComplex}.clientId}}`,
+            resource: `{{{state.${constants_2.Plugins.pluginNameComplex}.applicationIdUris}}}`,
+        };
+        await ctx.appManifestProvider.saveManifest(ctx, inputs, manifest);
+        return teamsfx_api_1.ok([]);
+    }
+    async provisionResource(ctx, inputs, envInfo, tokenProvider, props) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        const checkPermissionRes = await checkPermissionRequest(inputs.projectPath);
+        if (checkPermissionRes.isErr())
+            return teamsfx_api_1.err(checkPermissionRes.error);
+        const isLocalDebug = envInfo.envName === "local";
+        ctx.logProvider.info(constants_2.Messages.StartProvision.log);
+        const telemetryMessage = "provision";
+        await tokenProvider_1.TokenProvider.init({
+            graph: tokenProvider.graphTokenProvider,
+            appStudio: tokenProvider.appStudioToken,
+        });
+        //init aad part in local settings or env state
+        if (!envInfo.state[constants_1.BuiltInFeaturePluginNames.aad]) {
+            envInfo.state[constants_1.BuiltInFeaturePluginNames.aad] = {
+                secretFields: ["clientSecret"],
+            };
+        }
+        // Move objectId etc. from input to output.
+        const skip = common_1.Utils.skipCreateAadForProvision(envInfo);
+        dialog_1.DialogUtils.init(ctx.userInteraction, constants_2.ProgressTitle.Provision, constants_2.ProgressTitle.ProvisionSteps);
+        let config = new configs_1.ProvisionConfig(isLocalDebug);
+        await config.restoreConfigFromEnvInfo(ctx, inputs, envInfo);
+        const permissions = plugin_1.AadAppForTeamsImpl.parsePermission(config.permissionRequest, ctx.logProvider);
+        await ((_a = dialog_1.DialogUtils.progress) === null || _a === void 0 ? void 0 : _a.start(constants_2.ProgressDetail.Starting));
+        if (config.objectId) {
+            if (!skip) {
+                await ((_b = dialog_1.DialogUtils.progress) === null || _b === void 0 ? void 0 : _b.next(constants_2.ProgressDetail.GetAadApp));
+                config = await aadAppClient_1.AadAppClient.getAadApp(telemetryMessage, config.objectId, config.password, tokenProvider.graphTokenProvider, envInfo.envName);
+                (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(constants_2.Messages.getLog(constants_2.Messages.GetAadAppSuccess));
+            }
+        }
+        else {
+            await ((_d = dialog_1.DialogUtils.progress) === null || _d === void 0 ? void 0 : _d.next(constants_2.ProgressDetail.ProvisionAadApp));
+            await aadAppClient_1.AadAppClient.createAadApp(telemetryMessage, config);
+            config.password = undefined;
+            (_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.info(constants_2.Messages.getLog(constants_2.Messages.CreateAadAppSuccess));
+        }
+        if (!config.password) {
+            await ((_f = dialog_1.DialogUtils.progress) === null || _f === void 0 ? void 0 : _f.next(constants_2.ProgressDetail.CreateAadAppSecret));
+            await aadAppClient_1.AadAppClient.createAadAppSecret(telemetryMessage, config);
+            (_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.info(constants_2.Messages.getLog(constants_2.Messages.CreateAadAppPasswordSuccess));
+        }
+        await ((_h = dialog_1.DialogUtils.progress) === null || _h === void 0 ? void 0 : _h.next(constants_2.ProgressDetail.UpdatePermission));
+        await aadAppClient_1.AadAppClient.updateAadAppPermission(telemetryMessage, config.objectId, permissions, skip);
+        (_j = ctx.logProvider) === null || _j === void 0 ? void 0 : _j.info(constants_2.Messages.getLog(constants_2.Messages.UpdatePermissionSuccess));
+        await ((_k = dialog_1.DialogUtils.progress) === null || _k === void 0 ? void 0 : _k.end(true));
+        config.saveConfigIntoEnvInfo(envInfo, tokenProvider_1.TokenProvider.tenantId);
+        ctx.logProvider.info(constants_2.Messages.EndProvision.log);
+        if (props)
+            props[constants_2.Telemetry.skip] = skip ? constants_2.Telemetry.yes : constants_2.Telemetry.no;
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    }
+    async configureResource(ctx, inputs, envInfo, tokenProvider, props) {
+        var _a, _b, _c, _d, _e, _f;
+        const setApplicationInContextRes = await this.setApplicationInContext(ctx, envInfo);
+        if (setApplicationInContextRes.isErr())
+            return teamsfx_api_1.err(setApplicationInContextRes.error);
+        const isLocalDebug = envInfo.envName === "local";
+        ctx.logProvider.info(constants_2.Messages.StartPostProvision.log);
+        const skip = common_1.Utils.skipCreateAadForProvision(envInfo);
+        dialog_1.DialogUtils.init(ctx.userInteraction, constants_2.ProgressTitle.PostProvision, constants_2.ProgressTitle.PostProvisionSteps);
+        await tokenProvider_1.TokenProvider.init({
+            graph: tokenProvider.graphTokenProvider,
+            appStudio: tokenProvider.appStudioToken,
+        });
+        const config = new configs_1.PostProvisionConfig(isLocalDebug);
+        config.restoreConfigFromEnvInfo(ctx, envInfo);
+        await ((_a = dialog_1.DialogUtils.progress) === null || _a === void 0 ? void 0 : _a.start(constants_2.ProgressDetail.Starting));
+        await ((_b = dialog_1.DialogUtils.progress) === null || _b === void 0 ? void 0 : _b.next(constants_2.ProgressDetail.UpdateRedirectUri));
+        const redirectUris = plugin_1.AadAppForTeamsImpl.getRedirectUris(config.frontendEndpoint, config.botEndpoint, config.clientId);
+        await aadAppClient_1.AadAppClient.updateAadAppRedirectUri(isLocalDebug ? constants_2.Messages.EndPostLocalDebug.telemetry : constants_2.Messages.EndPostProvision.telemetry, config.objectId, redirectUris, skip);
+        (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(constants_2.Messages.getLog(constants_2.Messages.UpdateRedirectUriSuccess));
+        await ((_d = dialog_1.DialogUtils.progress) === null || _d === void 0 ? void 0 : _d.next(constants_2.ProgressDetail.UpdateAppIdUri));
+        await aadAppClient_1.AadAppClient.updateAadAppIdUri(isLocalDebug ? constants_2.Messages.EndPostLocalDebug.telemetry : constants_2.Messages.EndPostProvision.telemetry, config.objectId, config.applicationIdUri, skip);
+        (_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.info(constants_2.Messages.getLog(constants_2.Messages.UpdateAppIdUriSuccess));
+        await ((_f = dialog_1.DialogUtils.progress) === null || _f === void 0 ? void 0 : _f.end(true));
+        ctx.logProvider.info(constants_2.Messages.EndPostProvision.log);
+        if (props)
+            props[constants_2.Telemetry.skip] = skip ? constants_2.Telemetry.yes : constants_2.Telemetry.no;
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    }
+    async setApplicationInContext(ctx, envInfo) {
+        var _a;
+        const isLocalDebug = envInfo.envName === "local";
+        const config = new configs_1.SetApplicationInContextConfig(isLocalDebug);
+        config.restoreConfigFromEnvInfo(ctx, envInfo);
+        if (!config.frontendDomain && !config.botId) {
+            throw results_1.ResultFactory.UserError(errors_1.AppIdUriInvalidError.name, errors_1.AppIdUriInvalidError.message());
+        }
+        let applicationIdUri = "api://";
+        applicationIdUri += config.frontendDomain ? `${config.frontendDomain}/` : "";
+        applicationIdUri += config.botId ? "botid-" + config.botId : config.clientId;
+        config.applicationIdUri = applicationIdUri;
+        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(constants_2.Messages.getLog(constants_2.Messages.SetAppIdUriSuccess));
+        envInfo.state[constants_1.BuiltInFeaturePluginNames.aad].applicationIdUris =
+            config.applicationIdUri;
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    }
+};
+tslib_1.__decorate([
+    lib_1.hooks([CommonErrorHandlerMW_1.CommonErrorHandlerMW({ telemetry: { component: constants_1.BuiltInFeaturePluginNames.aad } })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AadAppForTeamsPluginV3.prototype, "addFeature", null);
+tslib_1.__decorate([
+    lib_1.hooks([
+        CommonErrorHandlerMW_1.CommonErrorHandlerMW({
+            telemetry: { component: constants_1.BuiltInFeaturePluginNames.aad, eventName: "provision" },
+        }),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AadAppForTeamsPluginV3.prototype, "provisionResource", null);
+tslib_1.__decorate([
+    lib_1.hooks([
+        CommonErrorHandlerMW_1.CommonErrorHandlerMW({
+            telemetry: { component: constants_1.BuiltInFeaturePluginNames.aad, eventName: "post-provision" },
+        }),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AadAppForTeamsPluginV3.prototype, "configureResource", null);
+AadAppForTeamsPluginV3 = tslib_1.__decorate([
+    typedi_1.Service(constants_2.Plugins.pluginNameComplex)
+], AadAppForTeamsPluginV3);
+exports.AadAppForTeamsPluginV3 = AadAppForTeamsPluginV3;
+//# sourceMappingURL=index.js.map

package/build/plugins/resource/aad/v3/index.js.map

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

package/build/plugins/resource/apim/answer.d.ts

@@ -3,8 +3,6 @@ import { OpenAPI } from "openapi-types";
 import { PluginLifeCycle } from "./constants";
 import { IApimPluginConfig } from "./config";
 export interface IAnswer {
-    resourceGroupName: string | undefined;
-    apimServiceName: string | undefined;
     apiDocumentPath: string | undefined;
     apiPrefix: string | undefined;
     apiId: string | undefined;
@@ -22,8 +20,6 @@ declare class BaseAnswer {
 }
 export declare class VSCodeAnswer extends BaseAnswer implements IAnswer {
     constructor(inputs: Inputs);
-    get resourceGroupName(): string | undefined;
-    get apimServiceName(): string | undefined;
     get apiDocumentPath(): string | undefined;
     get openApiDocumentSpec(): OpenAPI.Document | undefined;
     get apiPrefix(): string | undefined;
@@ -33,8 +29,6 @@ export declare class VSCodeAnswer extends BaseAnswer implements IAnswer {
 }
 export declare class CLIAnswer extends BaseAnswer implements IAnswer {
     constructor(inputs: Inputs);
-    get resourceGroupName(): string | undefined;
-    get apimServiceName(): string | undefined;
     get apiDocumentPath(): string | undefined;
     get apiPrefix(): string | undefined;
     get apiId(): string | undefined;

package/build/plugins/resource/apim/answer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"answer.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apim/answer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAY,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,eAAe,EAA0C,MAAM,aAAa,CAAC;AAEtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAM7C,MAAM,WAAW,OAAO;IACtB,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,mBAAmB,CAAC,EAAE,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IACnD,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtE,QAAQ,CAAC,CACP,SAAS,EAAE,eAAe,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAU/D;AAED,cAAM,UAAU;IACd,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBACb,MAAM,EAAE,MAAM;IAI1B,SAAS,CAAC,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU;IAIzD,SAAS,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;CAGlD;AAED,qBAAa,YAAa,SAAQ,UAAW,YAAW,OAAO;gBACjD,MAAM,EAAE,MAAM;IAI1B,IAAI,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAI1C;IACD,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAIxC;IACD,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IACD,IAAI,mBAAmB,IAAI,OAAO,CAAC,QAAQ,GAAG,SAAS,CAKtD;IACD,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IACD,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAI9B;IACD,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAIxC;IAED,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI;CAYtE;AAED,qBAAa,SAAU,SAAQ,UAAW,YAAW,OAAO;gBAC9C,MAAM,EAAE,MAAM;IAI1B,IAAI,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAE1C;IACD,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IACD,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IACD,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IACD,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IACD,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI;IAa/D,QAAQ,CACZ,SAAS,EAAE,eAAe,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;YAUF,mBAAmB;CA2FlC"}
+{"version":3,"file":"answer.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apim/answer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAY,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,eAAe,EAA0C,MAAM,aAAa,CAAC;AAEtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAK7C,MAAM,WAAW,OAAO;IACtB,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,mBAAmB,CAAC,EAAE,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IACnD,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtE,QAAQ,CAAC,CACP,SAAS,EAAE,eAAe,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAU/D;AAED,cAAM,UAAU;IACd,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBACb,MAAM,EAAE,MAAM;IAI1B,SAAS,CAAC,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU;IAIzD,SAAS,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;CAGlD;AAED,qBAAa,YAAa,SAAQ,UAAW,YAAW,OAAO;gBACjD,MAAM,EAAE,MAAM;IAI1B,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IACD,IAAI,mBAAmB,IAAI,OAAO,CAAC,QAAQ,GAAG,SAAS,CAKtD;IACD,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IACD,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAI9B;IACD,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAIxC;IAED,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI;CAQtE;AAED,qBAAa,SAAU,SAAQ,UAAW,YAAW,OAAO;gBAC9C,MAAM,EAAE,MAAM;IAI1B,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IACD,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IACD,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IACD,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI;IAS/D,QAAQ,CACZ,SAAS,EAAE,eAAe,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;YAUF,mBAAmB;CAoElC"}

package/build/plugins/resource/apim/answer.js

@@ -33,16 +33,6 @@ class VSCodeAnswer extends BaseAnswer {
     constructor(inputs) {
         super(inputs);
     }
-    get resourceGroupName() {
-        var _a;
-        const apimService = (_a = this.getOptionItem(constants_1.QuestionConstants.VSCode.Apim.questionName)) === null || _a === void 0 ? void 0 : _a.data;
-        return apimService === null || apimService === void 0 ? void 0 : apimService.resourceGroupName;
-    }
-    get apimServiceName() {
-        var _a;
-        const apimService = (_a = this.getOptionItem(constants_1.QuestionConstants.VSCode.Apim.questionName)) === null || _a === void 0 ? void 0 : _a.data;
-        return apimService === null || apimService === void 0 ? void 0 : apimService.serviceName;
-    }
     get apiDocumentPath() {
         var _a;
         return (_a = this.getOptionItem(constants_1.QuestionConstants.VSCode.OpenApiDocument.questionName)) === null || _a === void 0 ? void 0 : _a.label;
@@ -66,15 +56,11 @@ class VSCodeAnswer extends BaseAnswer {
         return (_b = api === null || api === void 0 ? void 0 : api.apiVersion) !== null && _b !== void 0 ? _b : this.getString(constants_1.QuestionConstants.VSCode.NewApiVersion.questionName);
     }
     save(lifecycle, apimConfig) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         switch (lifecycle) {
-            case constants_1.PluginLifeCycle.Scaffold:
-                apimConfig.resourceGroupName = (_a = this.resourceGroupName) !== null && _a !== void 0 ? _a : apimConfig.resourceGroupName;
-                apimConfig.serviceName = (_b = this.apimServiceName) !== null && _b !== void 0 ? _b : apimConfig.serviceName;
-                break;
             case constants_1.PluginLifeCycle.Deploy:
-                apimConfig.apiDocumentPath = (_c = this.apiDocumentPath) !== null && _c !== void 0 ? _c : apimConfig.apiDocumentPath;
-                apimConfig.apiPrefix = (_d = this.apiPrefix) !== null && _d !== void 0 ? _d : apimConfig.apiPrefix;
+                apimConfig.apiDocumentPath = (_a = this.apiDocumentPath) !== null && _a !== void 0 ? _a : apimConfig.apiDocumentPath;
+                apimConfig.apiPrefix = (_b = this.apiPrefix) !== null && _b !== void 0 ? _b : apimConfig.apiPrefix;
                 break;
         }
     }
@@ -84,12 +70,6 @@ class CLIAnswer extends BaseAnswer {
     constructor(inputs) {
         super(inputs);
     }
-    get resourceGroupName() {
-        return this.getString(constants_1.QuestionConstants.CLI.ApimResourceGroup.questionName);
-    }
-    get apimServiceName() {
-        return this.getString(constants_1.QuestionConstants.CLI.ApimServiceName.questionName);
-    }
     get apiDocumentPath() {
         return this.getString(constants_1.QuestionConstants.CLI.OpenApiDocument.questionName);
     }
@@ -103,15 +83,11 @@ class CLIAnswer extends BaseAnswer {
         return this.getString(constants_1.QuestionConstants.CLI.ApiVersion.questionName);
     }
     save(lifecycle, apimConfig) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         switch (lifecycle) {
-            case constants_1.PluginLifeCycle.Scaffold:
-                apimConfig.resourceGroupName = (_a = this.resourceGroupName) !== null && _a !== void 0 ? _a : apimConfig.resourceGroupName;
-                apimConfig.serviceName = (_b = this.apimServiceName) !== null && _b !== void 0 ? _b : apimConfig.serviceName;
-                break;
             case constants_1.PluginLifeCycle.Deploy:
-                apimConfig.apiDocumentPath = (_c = this.apiDocumentPath) !== null && _c !== void 0 ? _c : apimConfig.apiDocumentPath;
-                apimConfig.apiPrefix = (_d = this.apiPrefix) !== null && _d !== void 0 ? _d : apimConfig.apiPrefix;
+                apimConfig.apiDocumentPath = (_a = this.apiDocumentPath) !== null && _a !== void 0 ? _a : apimConfig.apiDocumentPath;
+                apimConfig.apiPrefix = (_b = this.apiPrefix) !== null && _b !== void 0 ? _b : apimConfig.apiPrefix;
                 break;
         }
     }
@@ -126,21 +102,6 @@ class CLIAnswer extends BaseAnswer {
     // https://msazure.visualstudio.com/Microsoft%20Teams%20Extensibility/_workitems/edit/9823734
     async validateWithMessage(lifecycle, apimConfig, projectRootDir) {
         switch (lifecycle) {
-            case constants_1.PluginLifeCycle.Scaffold:
-                // Validate the option format
-                if (typeof this.resourceGroupName !== "undefined") {
-                    const message = namingRules_1.NamingRules.validate(this.resourceGroupName, namingRules_1.NamingRules.resourceGroupName);
-                    if (message) {
-                        return `${constants_1.ValidationConstants.CLI.invalidOptionMessage(constants_1.QuestionConstants.CLI.ApimResourceGroup.questionName)} ${message}`;
-                    }
-                }
-                if (typeof this.apimServiceName !== "undefined") {
-                    const message = namingRules_1.NamingRules.validate(this.apimServiceName, namingRules_1.NamingRules.apimServiceName);
-                    if (message) {
-                        return `${constants_1.ValidationConstants.CLI.invalidOptionMessage(constants_1.QuestionConstants.CLI.ApimServiceName.questionName)} ${message}`;
-                    }
-                }
-                break;
             case constants_1.PluginLifeCycle.Deploy:
                 // Validate the option requirements
                 if (!apimConfig.apiPrefix && !this.apiPrefix) {