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

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":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAagC;AAChC,gEAA0B;AAC1B,mDAA6B;AAC7B,mCAAiC;AACjC,2FAAwF;AACxF,gDAA8E;AAC9E,0EAAuF;AACvF,kDAA+C;AAC/C,4CAA2F;AAC3F,sCAAiD;AAEjD,sCAA+C;AAC/C,wCAA2C;AAC3C,4CAAwC;AACxC,8CAI0B;AAC1B,4CAA8C;AAC9C,0DAAuD;AAEvD,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAEnC,KAAK,UAAU,2BAA2B,CAC/C,WAAmB;IAEnB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACxD,MAAM,kBAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,qCAA0B,EAAE;QACvD,MAAM,EAAE,CAAC;KACV,CAAC,CAAC;IACH,OAAO,gBAAE,CAAC,QAAQ,CAAC,CAAC;AACtB,CAAC;AARD,kEAQC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,WAAmB;IAEnB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACxD,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE;QACpC,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,wBAAa,CAAC,sBAAsB,EACpC,GAAG,QAAQ,aAAa,EACxB,mBAAO,CAAC,eAAe,CACxB,CACF,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,QAAQ,CAAC,CAAC;AACtB,CAAC;AAdD,wDAcC;AAEM,KAAK,UAAU,oBAAoB,CAAC,WAAmB;IAC5D,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,WAAW,CAAC,CAAC;IAC3D,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE;QACpB,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC5B;IACD,MAAM,iBAAiB,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5D,OAAO,gBAAE,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAC/C,CAAC;AAPD,oDAOC;AAED,SAAgB,UAAU,CAAC,cAA+B;IACxD,IACE,cAAc,CAAC,gBAAgB;QAC9B,cAAc,CAAC,gBAA0C,CAAC,qBAAqB,CAAC,QAAQ,CACvF,mBAAO,CAAC,iBAAiB,CAC1B;QAED,OAAO,IAAI,CAAC;IACd,OAAO,KAAK,CAAC;AACf,CAAC;AATD,gCASC;AAGD,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAAnC;QACE,SAAI,GAAG,mBAAO,CAAC,iBAAiB,CAAC;QACjC,SAAI,GAAe,UAAU,CAAC;QAC9B,iBAAY,GAAG,cAAc,CAAC;QAC9B,gBAAW,GAAG,2DAA2D,CAAC;IA6L5E,CAAC;IA3LC;;;OAGG;IAEH,KAAK,CAAC,UAAU,CACd,GAAmC,EACnC,MAAgC;QAEhC,MAAM,GAAG,GAAG,MAAM,2BAA2B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAClE,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACxE,IAAI,OAAO,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC;QAC9B,QAA6B,CAAC,kBAAkB,GAAG;YAClD,EAAE,EAAE,WAAW,mBAAO,CAAC,iBAAiB,aAAa;YACrD,QAAQ,EAAE,YAAY,mBAAO,CAAC,iBAAiB,uBAAuB;SACvE,CAAC;QACF,MAAM,GAAG,CAAC,mBAAmB,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClE,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;IAChB,CAAC;IAOD,KAAK,CAAC,iBAAiB,CACrB,GAAe,EACf,MAAgC,EAChC,OAAqB,EACrB,aAAiC,EACjC,KAAW;;QAEX,MAAM,kBAAkB,GAAG,MAAM,sBAAsB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC5E,IAAI,kBAAkB,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACrE,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC;QACjD,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAElD,MAAM,gBAAgB,GAAG,WAAW,CAAC;QAErC,MAAM,6BAAa,CAAC,IAAI,CAAC;YACvB,KAAK,EAAE,aAAa,CAAC,kBAAkB;YACvC,SAAS,EAAE,aAAa,CAAC,cAAc;SACxC,CAAC,CAAC;QAEH,8CAA8C;QAC9C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,qCAAyB,CAAC,GAAG,CAAC,EAAE;YACjD,OAAO,CAAC,KAAK,CAAC,qCAAyB,CAAC,GAAG,CAAC,GAAG;gBAC7C,YAAY,EAAE,CAAC,cAAc,CAAC;aAC/B,CAAC;SACH;QACD,2CAA2C;QAC3C,MAAM,IAAI,GAAG,cAAK,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACtD,oBAAW,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,yBAAa,CAAC,SAAS,EAAE,yBAAa,CAAC,cAAc,CAAC,CAAC;QAE7F,IAAI,MAAM,GAAoB,IAAI,yBAAe,CAAC,YAAY,CAAC,CAAC;QAChE,MAAM,MAAM,CAAC,wBAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,2BAAkB,CAAC,eAAe,CACpD,MAAM,CAAC,iBAA2B,EAClC,GAAG,CAAC,WAAW,CAChB,CAAC;QAEF,MAAM,CAAA,MAAA,oBAAW,CAAC,QAAQ,0CAAE,KAAK,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAA,CAAC;QAC3D,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,CAAA,MAAA,oBAAW,CAAC,QAAQ,0CAAE,IAAI,CAAC,0BAAc,CAAC,SAAS,CAAC,CAAA,CAAC;gBAC3D,MAAM,GAAG,MAAM,2BAAY,CAAC,SAAS,CACnC,gBAAgB,EAChB,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,QAAQ,EACf,aAAa,CAAC,kBAAkB,EAChC,OAAO,CAAC,OAAO,CAChB,CAAC;gBACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,oBAAQ,CAAC,MAAM,CAAC,oBAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;aACnE;SACF;aAAM;YACL,MAAM,CAAA,MAAA,oBAAW,CAAC,QAAQ,0CAAE,IAAI,CAAC,0BAAc,CAAC,eAAe,CAAC,CAAA,CAAC;YACjE,MAAM,2BAAY,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC5B,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,oBAAQ,CAAC,MAAM,CAAC,oBAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC;SACtE;QAED,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACpB,MAAM,CAAA,MAAA,oBAAW,CAAC,QAAQ,0CAAE,IAAI,CAAC,0BAAc,CAAC,kBAAkB,CAAC,CAAA,CAAC;YACpE,MAAM,2BAAY,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;YAChE,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,oBAAQ,CAAC,MAAM,CAAC,oBAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAC;SAC9E;QAED,MAAM,CAAA,MAAA,oBAAW,CAAC,QAAQ,0CAAE,IAAI,CAAC,0BAAc,CAAC,gBAAgB,CAAC,CAAA,CAAC;QAClE,MAAM,2BAAY,CAAC,sBAAsB,CACvC,gBAAgB,EAChB,MAAM,CAAC,QAAkB,EACzB,WAAW,EACX,IAAI,CACL,CAAC;QACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,oBAAQ,CAAC,MAAM,CAAC,oBAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACzE,MAAM,CAAA,MAAA,oBAAW,CAAC,QAAQ,0CAAE,GAAG,CAAC,IAAI,CAAC,CAAA,CAAC;QACtC,MAAM,CAAC,qBAAqB,CAAC,OAAO,EAAE,6BAAa,CAAC,QAAkB,CAAC,CAAC;QACxE,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,KAAK;YAAE,KAAK,CAAC,qBAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,qBAAS,CAAC,GAAG,CAAC,CAAC,CAAC,qBAAS,CAAC,EAAE,CAAC;QACvE,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAClB,CAAC;IAOD,KAAK,CAAC,iBAAiB,CACrB,GAAe,EACf,MAAgC,EAChC,OAAqB,EACrB,aAAiC,EACjC,KAAW;;QAEX,MAAM,0BAA0B,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpF,IAAI,0BAA0B,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC;QACrF,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC;QACjD,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAQ,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,cAAK,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACtD,oBAAW,CAAC,IAAI,CACd,GAAG,CAAC,eAAe,EACnB,yBAAa,CAAC,aAAa,EAC3B,yBAAa,CAAC,kBAAkB,CACjC,CAAC;QAEF,MAAM,6BAAa,CAAC,IAAI,CAAC;YACvB,KAAK,EAAE,aAAa,CAAC,kBAAkB;YACvC,SAAS,EAAE,aAAa,CAAC,cAAc;SACxC,CAAC,CAAC;QACH,MAAM,MAAM,GAAwB,IAAI,6BAAmB,CAAC,YAAY,CAAC,CAAC;QAC1E,MAAM,CAAC,wBAAwB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE9C,MAAM,CAAA,MAAA,oBAAW,CAAC,QAAQ,0CAAE,KAAK,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAA,CAAC;QAC3D,MAAM,CAAA,MAAA,oBAAW,CAAC,QAAQ,0CAAE,IAAI,CAAC,0BAAc,CAAC,iBAAiB,CAAC,CAAA,CAAC;QAEnE,MAAM,YAAY,GAAmB,2BAAkB,CAAC,eAAe,CACrE,MAAM,CAAC,gBAAgB,EACvB,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,QAAS,CACjB,CAAC;QACF,MAAM,2BAAY,CAAC,uBAAuB,CACxC,YAAY,CAAC,CAAC,CAAC,oBAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAQ,CAAC,gBAAgB,CAAC,SAAS,EACzF,MAAM,CAAC,QAAkB,EACzB,YAAY,EACZ,IAAI,CACL,CAAC;QACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,oBAAQ,CAAC,MAAM,CAAC,oBAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC;QAE1E,MAAM,CAAA,MAAA,oBAAW,CAAC,QAAQ,0CAAE,IAAI,CAAC,0BAAc,CAAC,cAAc,CAAC,CAAA,CAAC;QAChE,MAAM,2BAAY,CAAC,iBAAiB,CAClC,YAAY,CAAC,CAAC,CAAC,oBAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAQ,CAAC,gBAAgB,CAAC,SAAS,EACzF,MAAM,CAAC,QAAkB,EACzB,MAAM,CAAC,gBAA0B,EACjC,IAAI,CACL,CAAC;QACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,oBAAQ,CAAC,MAAM,CAAC,oBAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;QAEvE,MAAM,CAAA,MAAA,oBAAW,CAAC,QAAQ,0CAAE,GAAG,CAAC,IAAI,CAAC,CAAA,CAAC;QACtC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACpD,IAAI,KAAK;YAAE,KAAK,CAAC,qBAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,qBAAS,CAAC,GAAG,CAAC,CAAC,CAAC,qBAAS,CAAC,EAAE,CAAC;QACvE,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAClC,GAAe,EACf,OAAqB;;QAErB,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC;QACjD,MAAM,MAAM,GAAkC,IAAI,uCAA6B,CAAC,YAAY,CAAC,CAAC;QAC9F,MAAM,CAAC,wBAAwB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE9C,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YAC3C,MAAM,uBAAa,CAAC,SAAS,CAAC,6BAAoB,CAAC,IAAI,EAAE,6BAAoB,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1F;QAED,IAAI,gBAAgB,GAAG,QAAQ,CAAC;QAChC,gBAAgB,IAAI,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,gBAAgB,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC7E,MAAM,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAE3C,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,oBAAQ,CAAC,MAAM,CAAC,oBAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACnE,OAAO,CAAC,KAAK,CAAC,qCAAyB,CAAC,GAAG,CAAe,CAAC,iBAAiB;YAC3E,MAAM,CAAC,gBAAgB,CAAC;QAC1B,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAClB,CAAC;CACF,CAAA;AAtLC;IADC,WAAK,CAAC,CAAC,2CAAoB,CAAC,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,qCAAyB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;;;;wDAgB1F;AAOD;IALC,WAAK,CAAC;QACL,2CAAoB,CAAC;YACnB,SAAS,EAAE,EAAE,SAAS,EAAE,qCAAyB,CAAC,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE;SAChF,CAAC;KACH,CAAC;;;;+DA4ED;AAOD;IALC,WAAK,CAAC;QACL,2CAAoB,CAAC;YACnB,SAAS,EAAE,EAAE,SAAS,EAAE,qCAAyB,CAAC,GAAG,EAAE,SAAS,EAAE,gBAAgB,EAAE;SACrF,CAAC;KACH,CAAC;;;;+DAuDD;AAzKU,sBAAsB;IADlC,gBAAO,CAAC,mBAAO,CAAC,iBAAiB,CAAC;GACtB,sBAAsB,CAiMlC;AAjMY,wDAAsB"}

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) {

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

@@ -1 +1 @@
-{"version":3,"file":"answer.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apim/answer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"answer.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apim/answer.ts"],"names":[],"mappings":";;;AAGA,wDAAsE;AAEtE,2CAAsF;AACtF,mCAA4F;AAG5F,qDAAkD;AAClD,+DAA4D;AAgB5D,SAAgB,WAAW,CAAC,MAA0B;IACpD,MAAM,GAAG,sBAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC1C,QAAQ,MAAM,CAAC,QAAQ,EAAE;QACvB,KAAK,sBAAQ,CAAC,MAAM;YAClB,OAAO,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;QAClC,KAAK,sBAAQ,CAAC,GAAG;YACf,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC;QAC/B;YACE,MAAM,kBAAU,CAAC,sBAAc,CAAC,CAAC;KACpC;AACH,CAAC;AAVD,kCAUC;AAED,MAAM,UAAU;IAEd,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAES,aAAa,CAAC,YAAoB;QAC1C,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAe,CAAC;IACjD,CAAC;IAES,SAAS,CAAC,YAAoB;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAW,CAAC;IAC7C,CAAC;CACF;AAED,MAAa,YAAa,SAAQ,UAAU;IAC1C,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,IAAI,eAAe;;QACjB,OAAO,MAAA,IAAI,CAAC,aAAa,CAAC,6BAAiB,CAAC,MAAM,CAAC,eAAe,CAAC,YAAY,CAAC,0CAAE,KAAK,CAAC;IAC1F,CAAC;IACD,IAAI,mBAAmB;;QACrB,MAAM,eAAe,GAAG,MAAA,IAAI,CAAC,aAAa,CACxC,6BAAiB,CAAC,MAAM,CAAC,eAAe,CAAC,YAAY,CACtD,0CAAE,IAAwB,CAAC;QAC5B,OAAO,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAwB,CAAC;IACnD,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,SAAS,CAAC,6BAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,KAAK;;QACP,MAAM,GAAG,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,6BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,0CAC5E,IAAmB,CAAC;QACxB,OAAO,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,CAAC;IACnB,CAAC;IACD,IAAI,eAAe;;QACjB,MAAM,GAAG,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,6BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,0CAC5E,IAAmB,CAAC;QACxB,OAAO,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,UAAU,mCAAI,IAAI,CAAC,SAAS,CAAC,6BAAiB,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IAChG,CAAC;IAED,IAAI,CAAC,SAA0B,EAAE,UAA6B;;QAC5D,QAAQ,SAAS,EAAE;YACjB,KAAK,2BAAe,CAAC,MAAM;gBACzB,UAAU,CAAC,eAAe,GAAG,MAAA,IAAI,CAAC,eAAe,mCAAI,UAAU,CAAC,eAAe,CAAC;gBAChF,UAAU,CAAC,SAAS,GAAG,MAAA,IAAI,CAAC,SAAS,mCAAI,UAAU,CAAC,SAAS,CAAC;gBAC9D,MAAM;SACT;IACH,CAAC;CACF;AApCD,oCAoCC;AAED,MAAa,SAAU,SAAQ,UAAU;IACvC,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC,6BAAiB,CAAC,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,SAAS,CAAC,6BAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,6BAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC,6BAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,CAAC,SAA0B,EAAE,UAA6B;;QAC5D,QAAQ,SAAS,EAAE;YACjB,KAAK,2BAAe,CAAC,MAAM;gBACzB,UAAU,CAAC,eAAe,GAAG,MAAA,IAAI,CAAC,eAAe,mCAAI,UAAU,CAAC,eAAe,CAAC;gBAChF,UAAU,CAAC,SAAS,GAAG,MAAA,IAAI,CAAC,SAAS,mCAAI,UAAU,CAAC,SAAS,CAAC;gBAC9D,MAAM;SACT;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,SAA0B,EAC1B,UAA6B,EAC7B,cAAsB;QAEtB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;QACtF,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;YAClC,MAAM,kBAAU,CAAC,6BAAqB,EAAE,OAAO,CAAC,CAAC;SAClD;IACH,CAAC;IAED,wGAAwG;IACxG,6FAA6F;IAC7F,6FAA6F;IACrF,KAAK,CAAC,mBAAmB,CAC/B,SAA0B,EAC1B,UAA6B,EAC7B,cAAsB;QAEtB,QAAQ,SAAS,EAAE;YACjB,KAAK,2BAAe,CAAC,MAAM;gBACzB,mCAAmC;gBACnC,IAAI,CAAC,UAAU,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;oBAC5C,OAAO,+BAAmB,CAAC,GAAG,CAAC,kBAAkB,CAC/C,6BAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAC7C,CAAC;iBACH;gBAED,IAAI,CAAC,UAAU,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;oBACxD,OAAO,+BAAmB,CAAC,GAAG,CAAC,kBAAkB,CAC/C,6BAAiB,CAAC,GAAG,CAAC,eAAe,CAAC,YAAY,CACnD,CAAC;iBACH;gBAED,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;oBACzB,OAAO,+BAAmB,CAAC,GAAG,CAAC,kBAAkB,CAC/C,6BAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAC9C,CAAC;iBACH;gBAED,+BAA+B;gBAC/B,IAAI,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE;oBAC1C,OAAO,+BAAmB,CAAC,GAAG,CAAC,qBAAqB,CAClD,6BAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAC7C,CAAC;iBACH;gBAED,6BAA6B;gBAC7B,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;oBACzC,MAAM,OAAO,GAAG,yBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAW,CAAC,SAAS,CAAC,CAAC;oBAC5E,IAAI,OAAO,EAAE;wBACX,OAAO,GAAG,+BAAmB,CAAC,GAAG,CAAC,oBAAoB,CACpD,6BAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAC7C,IAAI,OAAO,EAAE,CAAC;qBAChB;iBACF;gBAED,IAAI,OAAO,IAAI,CAAC,eAAe,KAAK,WAAW,EAAE;oBAC/C,IAAI;wBACF,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,EAAE,CAAC;wBAChD,MAAM,gBAAgB,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;qBAClF;oBAAC,OAAO,KAAU,EAAE;wBACnB,OAAO,GAAG,+BAAmB,CAAC,GAAG,CAAC,oBAAoB,CACpD,6BAAiB,CAAC,GAAG,CAAC,eAAe,CAAC,YAAY,CACnD,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;qBACtB;iBACF;gBAED,IAAI,OAAO,IAAI,CAAC,eAAe,IAAI,WAAW,EAAE;oBAC9C,MAAM,OAAO,GAAG,yBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,yBAAW,CAAC,eAAe,CAAC,CAAC;oBACxF,IAAI,OAAO,EAAE;wBACX,OAAO,GAAG,+BAAmB,CAAC,GAAG,CAAC,oBAAoB,CACpD,6BAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAC9C,IAAI,OAAO,EAAE,CAAC;qBAChB;iBACF;gBAED,MAAM;SACT;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA7GD,8BA6GC"}

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

@@ -1,9 +1,5 @@
-import { EnvInfo, PluginConfig } from "@microsoft/teamsfx-api";
+import { EnvInfo, Json, PluginConfig, v3 } from "@microsoft/teamsfx-api";
 export interface IApimPluginConfig {
-    resourceGroupName?: string | undefined;
-    serviceName?: string | undefined;
-    productId?: string | undefined;
-    oAuthServerId?: string | undefined;
     apimClientAADObjectId?: string | undefined;
     apimClientAADClientId?: string | undefined;
     apimClientAADClientSecret?: string | undefined;
@@ -32,21 +28,12 @@ export interface ISolutionConfig {
     teamsAppTenantId: string;
     resourceGroupName: string;
     location: string;
-    remoteTeamsAppId?: string | undefined;
     subscriptionId: string | undefined;
 }
 export declare class ApimPluginConfig implements IApimPluginConfig {
     private readonly config;
     private readonly envName;
-    constructor(config: PluginConfig, envName: string);
-    get resourceGroupName(): string | undefined;
-    set resourceGroupName(value: string | undefined);
-    get serviceName(): string | undefined;
-    set serviceName(value: string | undefined);
-    get productId(): string | undefined;
-    set productId(value: string | undefined);
-    get oAuthServerId(): string | undefined;
-    set oAuthServerId(value: string | undefined);
+    constructor(config: PluginConfig | Json, envName: string);
     get apimClientAADObjectId(): string | undefined;
     set apimClientAADObjectId(value: string | undefined);
     get apimClientAADClientId(): string | undefined;
@@ -78,14 +65,14 @@ export declare class ApimPluginConfig implements IApimPluginConfig {
 export declare class FunctionPluginConfig implements IFunctionPluginConfig {
     private readonly configOfOtherPlugins;
     private readonly envName;
-    constructor(envInfo: EnvInfo);
+    constructor(envInfo: EnvInfo | v3.EnvInfoV3);
     get functionEndpoint(): string;
     private checkAndGet;
 }
 export declare class AadPluginConfig implements IAadPluginConfig {
     private readonly configOfOtherPlugins;
     private readonly envName;
-    constructor(envInfo: EnvInfo);
+    constructor(envInfo: EnvInfo | v3.EnvInfoV3);
     get objectId(): string;
     get clientId(): string;
     get oauth2PermissionScopeId(): string;
@@ -95,12 +82,11 @@ export declare class AadPluginConfig implements IAadPluginConfig {
 export declare class SolutionConfig implements ISolutionConfig {
     private readonly configOfOtherPlugins;
     private readonly envName;
-    constructor(envInfo: EnvInfo);
+    constructor(envInfo: EnvInfo | v3.EnvInfoV3);
     get resourceNameSuffix(): string;
     get teamsAppTenantId(): string;
     get resourceGroupName(): string;
     get location(): string;
-    get remoteTeamsAppId(): string | undefined;
     get subscriptionId(): string | undefined;
     private checkAndGet;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apim/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,YAAY,EAA0B,MAAM,wBAAwB,CAAC;AAkBvF,MAAM,WAAW,iBAAiB;IAChC,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,qBAAqB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,qBAAqB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,yBAAyB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,oBAAoB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,uBAAuB,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAED,qBAAa,gBAAiB,YAAW,iBAAiB;IAExD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM;IAKjD,IAAI,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAE1C;IACD,IAAI,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE9C;IACD,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IACD,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAExC;IACD,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IACD,IAAI,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEtC;IACD,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IACD,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE1C;IACD,IAAI,qBAAqB,IAAI,MAAM,GAAG,SAAS,CAK9C;IACD,IAAI,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAElD;IACD,IAAI,qBAAqB,IAAI,MAAM,GAAG,SAAS,CAK9C;IACD,IAAI,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAElD;IACD,IAAI,yBAAyB,IAAI,MAAM,GAAG,SAAS,CAElD;IACD,IAAI,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEtD;IACD,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IACD,IAAI,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEtC;IACD,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAErC;IACD,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEzC;IACD,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IACD,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEpC;IACD,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IACD,IAAI,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE5C;IACD,IAAI,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAE1C;IACD,IAAI,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE9C;IACD,IAAI,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAE1C;IACD,IAAI,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE9C;IACD,IAAI,oBAAoB,IAAI,MAAM,GAAG,SAAS,CAE7C;IACD,IAAI,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEjD;IACD,IAAI,cAAc,IAAI,MAAM,GAAG,SAAS,CAEvC;IACD,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE3C;IACD,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IACD,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE1C;IAED,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,QAAQ;IAIT,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CASxC;AAED,qBAAa,oBAAqB,YAAW,qBAAqB;IAChE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAyB;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBACrB,OAAO,EAAE,OAAO;IAK5B,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED,OAAO,CAAC,WAAW;CAQpB;AAED,qBAAa,eAAgB,YAAW,gBAAgB;IACtD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAyB;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBACrB,OAAO,EAAE,OAAO;IAK5B,IAAI,QAAQ,IAAI,MAAM,CAErB;IACD,IAAI,QAAQ,IAAI,MAAM,CAErB;IACD,IAAI,uBAAuB,IAAI,MAAM,CAEpC;IACD,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,OAAO,CAAC,WAAW;CAQpB;AAED,qBAAa,cAAe,YAAW,eAAe;IACpD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAyB;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBACrB,OAAO,EAAE,OAAO;IAK5B,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IACD,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IACD,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IACD,IAAI,QAAQ,IAAI,MAAM,CAErB;IACD,IAAI,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAIzC;IAED,IAAI,cAAc,IAAI,MAAM,GAAG,SAAS,CAIvC;IAED,OAAO,CAAC,WAAW;CAQpB"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apim/config.ts"],"names":[],"mappings":"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"}

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

@@ -6,33 +6,12 @@ const error_1 = require("./error");
 const namingRules_1 = require("./utils/namingRules");
 class ApimPluginConfig {
     constructor(config, envName) {
+        if (!config) {
+            throw error_1.BuildError(error_1.NoPluginConfig, constants_1.TeamsToolkitComponent.ApimPlugin, constants_1.ComponentRetryOperations[constants_1.TeamsToolkitComponent.ApimPlugin]);
+        }
         this.config = config;
         this.envName = envName;
     }
-    get resourceGroupName() {
-        return this.getValue(constants_1.ApimPluginConfigKeys.resourceGroupName, namingRules_1.NamingRules.resourceGroupName);
-    }
-    set resourceGroupName(value) {
-        this.setValue(constants_1.ApimPluginConfigKeys.resourceGroupName, value);
-    }
-    get serviceName() {
-        return this.getValue(constants_1.ApimPluginConfigKeys.serviceName, namingRules_1.NamingRules.apimServiceName);
-    }
-    set serviceName(value) {
-        this.setValue(constants_1.ApimPluginConfigKeys.serviceName, value);
-    }
-    get productId() {
-        return this.getValue(constants_1.ApimPluginConfigKeys.productId, namingRules_1.NamingRules.productId);
-    }
-    set productId(value) {
-        this.setValue(constants_1.ApimPluginConfigKeys.productId, value);
-    }
-    get oAuthServerId() {
-        return this.getValue(constants_1.ApimPluginConfigKeys.oAuthServerId, namingRules_1.NamingRules.oAuthServerId);
-    }
-    set oAuthServerId(value) {
-        this.setValue(constants_1.ApimPluginConfigKeys.oAuthServerId, value);
-    }
     get apimClientAADObjectId() {
         return this.getValue(constants_1.ApimPluginConfigKeys.apimClientAADObjectId, namingRules_1.NamingRules.apimClientAADObjectId);
     }
@@ -106,7 +85,7 @@ class ApimPluginConfig {
         this.setValue(constants_1.ApimPluginConfigKeys.publisherName, value);
     }
     getValue(key, namingRule) {
-        const value = this.config.getString(key);
+        const value = this.config.getString ? this.config.getString(key) : this.config[key];
         if (namingRule && value) {
             const message = namingRules_1.NamingRules.validate(value, namingRule);
             if (message) {
@@ -116,7 +95,7 @@ class ApimPluginConfig {
         return value;
     }
     setValue(key, value) {
-        this.config.set(key, value);
+        this.config.set ? this.config.set(key, value) : (this.config[key] = value);
     }
     checkAndGet(key) {
         const value = error_1.AssertConfigNotEmpty(constants_1.TeamsToolkitComponent.ApimPlugin, key, this.getValue(key), this.envName);
@@ -176,15 +155,8 @@ class SolutionConfig {
     get location() {
         return this.checkAndGet(constants_1.SolutionConfigKeys.location);
     }
-    get remoteTeamsAppId() {
-        var _a;
-        return (_a = this.configOfOtherPlugins
-            .get(constants_1.TeamsToolkitComponent.Solution)) === null || _a === void 0 ? void 0 : _a.get(constants_1.SolutionConfigKeys.remoteTeamsAppId);
-    }
     get subscriptionId() {
-        var _a;
-        return (_a = this.configOfOtherPlugins
-            .get(constants_1.TeamsToolkitComponent.Solution)) === null || _a === void 0 ? void 0 : _a.get(constants_1.SolutionConfigKeys.subscriptionId);
+        return this.checkAndGet(constants_1.SolutionConfigKeys.subscriptionId);
     }
     checkAndGet(key) {
         return checkAndGetOtherPluginConfig(this.configOfOtherPlugins, constants_1.TeamsToolkitComponent.Solution, key, this.envName);
@@ -192,7 +164,9 @@ class SolutionConfig {
 }
 exports.SolutionConfig = SolutionConfig;
 function checkAndGetOtherPluginConfig(configOfOtherPlugins, component, key, envName) {
-    const pluginConfig = configOfOtherPlugins.get(component);
+    const pluginConfig = configOfOtherPlugins.get
+        ? configOfOtherPlugins.get(component)
+        : configOfOtherPlugins[component];
     if (!pluginConfig) {
         throw error_1.BuildError(error_1.NoPluginConfig, component, constants_1.ComponentRetryOperations[component]);
     }

package/build/plugins/resource/apim/config.js.map

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