@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.768a76f6e.0

package/build/plugins/resource/apiconnector/plugin.js

@@ -3,37 +3,121 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiConnectorImpl = void 0;
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const fs = tslib_1.__importStar(require("fs-extra"));
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const constants_1 = require("./constants");
+const utils_1 = require("./utils");
 const result_1 = require("./result");
+const constants_1 = require("./constants");
 const envHandler_1 = require("./envHandler");
 const errors_1 = require("./errors");
 const constants_2 = require("../../../common/constants");
 const questions_1 = require("./questions");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const sampleHandler_1 = require("./sampleHandler");
+const common_1 = require("../../../common");
+const utils_2 = require("../../solution/fx-solution/v2/utils");
+const depsHandler_1 = require("./depsHandler");
 class ApiConnectorImpl {
     async scaffold(ctx, inputs) {
+        var _a;
         if (!inputs.projectPath) {
             throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.InvalidProjectError.name, errors_1.ErrorMessage.InvalidProjectError.message());
         }
         const projectPath = inputs.projectPath;
         const languageType = ctx.projectSetting.programmingLanguage;
         const config = this.getUserDataFromInputs(inputs);
-        for (const componentItem of config.ComponentPath) {
-            await this.scaffoldEnvFileToComponent(projectPath, config, componentItem);
-            await this.scaffoldSampleCodeToComponent(projectPath, config, componentItem, languageType);
-            // await this.addSDKDependency(ComponentPath);
+        // backup relative files.
+        const backupFolderName = utils_1.generateTempFolder();
+        await Promise.all(config.ComponentPath.map(async (component) => {
+            await this.backupExistingFiles(path.join(projectPath, component), backupFolderName);
+        }));
+        try {
+            await Promise.all(config.ComponentPath.map(async (component) => {
+                await this.scaffoldInComponent(projectPath, component, config, languageType);
+            }));
+            const msg = this.getNotificationMsg(config, languageType);
+            (_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.showMessage("info", msg, false, "OK", utils_1.Notification.READ_MORE).then((result) => {
+                var _a;
+                const userSelected = result.isOk() ? result.value : undefined;
+                if (userSelected === utils_1.Notification.READ_MORE) {
+                    (_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.openUrl(utils_1.Notification.READ_MORE_URL);
+                }
+            });
+        }
+        catch (err) {
+            await Promise.all(config.ComponentPath.map(async (component) => {
+                await fs.copy(path.join(projectPath, component, backupFolderName), path.join(projectPath, component), { overwrite: true });
+                await this.removeSampleFilesWhenRestore(projectPath, component, config.APIName, languageType);
+            }));
+            if (err instanceof teamsfx_api_1.SystemError || err instanceof teamsfx_api_1.UserError) {
+                throw err;
+            }
+            else {
+                throw result_1.ResultFactory.SystemError(errors_1.ErrorMessage.generateApiConFilesError.name, errors_1.ErrorMessage.generateApiConFilesError.message(err.message));
+            }
+        }
+        finally {
+            await Promise.all(config.ComponentPath.map(async (component) => {
+                await utils_1.removeFileIfExist(path.join(projectPath, component, backupFolderName));
+            }));
         }
         return result_1.ResultFactory.Success();
     }
+    async scaffoldInComponent(projectPath, componentItem, config, languageType) {
+        await this.scaffoldEnvFileToComponent(projectPath, config, componentItem);
+        await this.scaffoldSampleCodeToComponent(projectPath, config, componentItem, languageType);
+        await this.addSDKDependency(projectPath, componentItem);
+    }
+    async backupExistingFiles(folderPath, backupFolder) {
+        await fs.ensureDir(path.join(folderPath, backupFolder));
+        await utils_1.copyFileIfExist(path.join(folderPath, constants_1.Constants.envFileName), path.join(folderPath, backupFolder, constants_1.Constants.envFileName));
+        await utils_1.copyFileIfExist(path.join(folderPath, constants_1.Constants.pkgJsonFile), path.join(folderPath, backupFolder, constants_1.Constants.pkgJsonFile));
+        await utils_1.copyFileIfExist(path.join(folderPath, constants_1.Constants.pkgLockFile), path.join(folderPath, backupFolder, constants_1.Constants.pkgLockFile));
+    }
+    async removeSampleFilesWhenRestore(projectPath, component, apiName, languageType) {
+        const apiFileName = utils_1.getSampleFileName(apiName, languageType);
+        const sampleFilePath = path.join(projectPath, component, apiFileName);
+        await utils_1.removeFileIfExist(sampleFilePath);
+    }
+    getAuthConfigFromInputs(inputs) {
+        let config;
+        if (inputs[constants_1.Constants.questionKey.apiType] === constants_1.AuthType.BASIC) {
+            utils_1.checkInputEmpty(inputs, constants_1.Constants.questionKey.apiUserName);
+            config = {
+                AuthType: constants_1.AuthType.BASIC,
+                UserName: inputs[constants_1.Constants.questionKey.apiUserName],
+            };
+        }
+        else if (inputs[constants_1.Constants.questionKey.apiType] === constants_1.AuthType.AAD) {
+            const AADConfig = {
+                AuthType: constants_1.AuthType.AAD,
+            };
+            if (inputs[constants_1.Constants.questionKey.apiAppType] === questions_1.reuseAppOption.id) {
+                AADConfig.ReuseTeamsApp = true;
+            }
+            else {
+                AADConfig.ReuseTeamsApp = false;
+                utils_1.checkInputEmpty(inputs, constants_1.Constants.questionKey.apiAppTenentId, constants_1.Constants.questionKey.apiAppTenentId);
+                AADConfig.TenantId = inputs[constants_1.Constants.questionKey.apiAppTenentId];
+                AADConfig.ClientId = inputs[constants_1.Constants.questionKey.apiAppId];
+            }
+            config = AADConfig;
+        }
+        else {
+            throw result_1.ResultFactory.SystemError(errors_1.ErrorMessage.ApiConnectorInputError.name, errors_1.ErrorMessage.ApiConnectorInputError.message(inputs[constants_1.Constants.questionKey.apiAppType]));
+        }
+        return config;
+    }
     getUserDataFromInputs(inputs) {
+        utils_1.checkInputEmpty(inputs, constants_1.Constants.questionKey.componentsSelect, constants_1.Constants.questionKey.apiName, constants_1.Constants.questionKey.endpoint);
+        const authConfig = this.getAuthConfigFromInputs(inputs);
         const config = {
             ComponentPath: inputs[constants_1.Constants.questionKey.componentsSelect],
             APIName: inputs[constants_1.Constants.questionKey.apiName],
-            ApiAuthType: inputs[constants_1.Constants.questionKey.apiType],
+            AuthConfig: authConfig,
             EndPoint: inputs[constants_1.Constants.questionKey.endpoint],
-            ApiUserName: inputs[constants_1.Constants.questionKey.apiUserName],
         };
         return config;
     }
@@ -48,7 +132,49 @@ class ApiConnectorImpl {
         await sampleHandler.generateSampleCode(config);
         return result_1.ResultFactory.Success();
     }
-    generateQuestion(activePlugins) {
+    async addSDKDependency(projectPath, component) {
+        const depsHandler = new depsHandler_1.DepsHandler(projectPath, component);
+        return await depsHandler.addPkgDeps();
+    }
+    getNotificationMsg(config, languageType) {
+        const authType = config.AuthConfig.AuthType;
+        const apiName = config.APIName;
+        let retMsg = utils_1.Notification.GetBasiString(apiName, config.ComponentPath, languageType);
+        switch (authType) {
+            case constants_1.AuthType.BASIC: {
+                retMsg += utils_1.Notification.GetBasicAuthString(apiName, config.ComponentPath);
+                break;
+            }
+            case constants_1.AuthType.APIKEY: {
+                retMsg += utils_1.Notification.GetApiKeyAuthString(apiName, config.ComponentPath);
+                break;
+            }
+            case constants_1.AuthType.AAD: {
+                if (config.ReuseTeamsApp) {
+                    retMsg += utils_1.Notification.GetReuseAADAuthString(apiName);
+                }
+                else {
+                    retMsg += utils_1.Notification.GetGenAADAuthString(apiName, config.ComponentPath);
+                }
+                break;
+            }
+            case constants_1.AuthType.CERT: {
+                retMsg += utils_1.Notification.GetCertAuthString(apiName, config.ComponentPath);
+                break;
+            }
+            case constants_1.AuthType.CUSTOM: {
+                retMsg = utils_1.Notification.GetCustomAuthString(apiName, config.ComponentPath, languageType);
+                break;
+            }
+        }
+        return retMsg;
+    }
+    async generateQuestion(ctx) {
+        var _a;
+        const activePlugins = (_a = ctx.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins;
+        if (!activePlugins) {
+            throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.NoActivePluginsExistError.name, errors_1.ErrorMessage.NoActivePluginsExistError.message());
+        }
         const options = [];
         if (activePlugins.includes(constants_2.ResourcePlugins.Bot)) {
             options.push(questions_1.botOption);
@@ -73,7 +199,20 @@ class ApiConnectorImpl {
                     return undefined;
                 },
             },
+            placeholder: localizeUtils_1.getLocalizedString("plugins.apiConnector.whichService.placeholder"), // Use the placeholder to display some description
         });
+        const apiNameQuestion = new questions_1.ApiNameQuestion(ctx);
+        const whichAuthType = this.buildAuthTypeQuestion(ctx);
+        const question = new teamsfx_api_1.QTreeNode({
+            type: "group",
+        });
+        question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiEndpointQuestion));
+        question.addChild(whichComponent);
+        question.addChild(new teamsfx_api_1.QTreeNode(apiNameQuestion.getQuestion()));
+        question.addChild(whichAuthType);
+        return teamsfx_api_1.ok(question);
+    }
+    buildAuthTypeQuestion(ctx) {
         const whichAuthType = new teamsfx_api_1.QTreeNode({
             name: constants_1.Constants.questionKey.apiType,
             type: "singleSelect",
@@ -85,16 +224,39 @@ class ApiConnectorImpl {
                 questions_1.ImplementMyselfOption,
             ],
             title: localizeUtils_1.getLocalizedString("plugins.apiConnector.whichAuthType.title"),
+            placeholder: localizeUtils_1.getLocalizedString("plugins.apiConnector.whichAuthType.placeholder"), // Use the placeholder to display some description
         });
-        const question = new teamsfx_api_1.QTreeNode({
-            type: "group",
-        });
-        question.addChild(whichComponent);
-        question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiNameQuestion));
-        question.addChild(whichAuthType);
-        question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiEndpointQuestion));
-        question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiLoginUserNameQuestion));
-        return question;
+        whichAuthType.addChild(this.buildAADAuthQuestion(ctx));
+        whichAuthType.addChild(this.buildBasicAuthQuestion());
+        return whichAuthType;
+    }
+    buildBasicAuthQuestion() {
+        const node = new teamsfx_api_1.QTreeNode(questions_1.basicAuthUsernameQuestion);
+        node.condition = { equals: questions_1.BasicAuthOption.id };
+        return node;
+    }
+    buildAADAuthQuestion(ctx) {
+        let node;
+        const solutionSettings = utils_2.getAzureSolutionSettings(ctx);
+        if (common_1.isAADEnabled(solutionSettings)) {
+            node = new teamsfx_api_1.QTreeNode({
+                name: constants_1.Constants.questionKey.apiAppType,
+                type: "singleSelect",
+                staticOptions: [questions_1.reuseAppOption, questions_1.anotherAppOption],
+                title: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestion.appType.title"),
+            });
+            node.condition = { equals: questions_1.AADAuthOption.id };
+            const tenentQuestionNode = new teamsfx_api_1.QTreeNode(questions_1.appTenantIdQuestion);
+            tenentQuestionNode.condition = { equals: questions_1.anotherAppOption.id };
+            tenentQuestionNode.addChild(new teamsfx_api_1.QTreeNode(questions_1.appIdQuestion));
+            node.addChild(tenentQuestionNode);
+        }
+        else {
+            node = new teamsfx_api_1.QTreeNode(questions_1.appTenantIdQuestion);
+            node.condition = { equals: questions_1.AADAuthOption.id };
+            node.addChild(new teamsfx_api_1.QTreeNode(questions_1.appIdQuestion));
+        }
+        return node;
     }
 }
 exports.ApiConnectorImpl = ApiConnectorImpl;

package/build/plugins/resource/apiconnector/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AACb,wDAA2D;AAG3D,2CAAwC;AACxC,qCAA6D;AAC7D,6CAA0C;AAC1C,qCAAwC;AACxC,yDAA4D;AAC5D,2CAWqB;AACrB,iEAAmE;AACnE,mDAAgD;AAChD,MAAa,gBAAgB;IACpB,KAAK,CAAC,QAAQ,CAAC,GAAY,EAAE,MAAc;QAChD,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,MAAM,sBAAa,CAAC,SAAS,CAC3B,qBAAY,CAAC,mBAAmB,CAAC,IAAI,EACrC,qBAAY,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAC3C,CAAC;SACH;QACD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACvC,MAAM,YAAY,GAAW,GAAG,CAAC,cAAe,CAAC,mBAAoB,CAAC;QACtE,MAAM,MAAM,GAA8B,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAC7E,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,aAAa,EAAE;YAChD,MAAM,IAAI,CAAC,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;YAC1E,MAAM,IAAI,CAAC,6BAA6B,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;YAC3F,8CAA8C;SAC/C;QAED,OAAO,sBAAa,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAEO,qBAAqB,CAAC,MAAc;QAC1C,MAAM,MAAM,GAA8B;YACxC,aAAa,EAAE,MAAM,CAAC,qBAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC;YAC7D,OAAO,EAAE,MAAM,CAAC,qBAAS,CAAC,WAAW,CAAC,OAAO,CAAC;YAC9C,WAAW,EAAE,MAAM,CAAC,qBAAS,CAAC,WAAW,CAAC,OAAO,CAAC;YAClD,QAAQ,EAAE,MAAM,CAAC,qBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC;YAChD,WAAW,EAAE,MAAM,CAAC,qBAAS,CAAC,WAAW,CAAC,WAAW,CAAC;SACvD,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,0BAA0B,CACtC,WAAmB,EACnB,MAAiC,EACjC,SAAiB;QAEjB,MAAM,SAAS,GAAG,IAAI,uBAAU,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACzD,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,SAAS,CAAC,gBAAgB,EAAE,CAAC;QACnC,OAAO,sBAAa,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,6BAA6B,CACzC,WAAmB,EACnB,MAAiC,EACjC,SAAiB,EACjB,YAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,WAAW,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAC9E,MAAM,aAAa,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC/C,OAAO,sBAAa,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAEM,gBAAgB,CAAC,aAAuB;QAC7C,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,IAAI,aAAa,CAAC,QAAQ,CAAC,2BAAe,CAAC,GAAG,CAAC,EAAE;YAC/C,OAAO,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAC;SACzB;QACD,IAAI,aAAa,CAAC,QAAQ,CAAC,2BAAe,CAAC,QAAQ,CAAC,EAAE;YACpD,OAAO,CAAC,IAAI,CAAC,0BAAc,CAAC,CAAC;SAC9B;QACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,MAAM,sBAAa,CAAC,SAAS,CAC3B,qBAAY,CAAC,yBAAyB,CAAC,IAAI,EAC3C,qBAAY,CAAC,yBAAyB,CAAC,OAAO,EAAE,CACjD,CAAC;SACH;QACD,MAAM,cAAc,GAAG,IAAI,uBAAS,CAAC;YACnC,IAAI,EAAE,qBAAS,CAAC,WAAW,CAAC,gBAAgB;YAC5C,IAAI,EAAE,aAAa;YACnB,aAAa,EAAE,OAAO;YACtB,KAAK,EAAE,kCAAkB,CAAC,yCAAyC,CAAC;YACpE,UAAU,EAAE;gBACV,SAAS,EAAE,KAAK,EAAE,KAAe,EAA+B,EAAE;oBAChE,MAAM,IAAI,GAAG,KAAiB,CAAC;oBAC/B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;wBACrB,OAAO,kCAAkB,CACvB,6DAA6D,CAC9D,CAAC;qBACH;oBACD,OAAO,SAAS,CAAC;gBACnB,CAAC;aACF;SACF,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,IAAI,uBAAS,CAAC;YAClC,IAAI,EAAE,qBAAS,CAAC,WAAW,CAAC,OAAO;YACnC,IAAI,EAAE,cAAc;YACpB,aAAa,EAAE;gBACb,2BAAe;gBACf,0BAAc;gBACd,yBAAa;gBACb,4BAAgB;gBAChB,iCAAqB;aACtB;YACD,KAAK,EAAE,kCAAkB,CAAC,0CAA0C,CAAC;SACtE,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,uBAAS,CAAC;YAC7B,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;QACH,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAClC,QAAQ,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,2BAAe,CAAC,CAAC,CAAC;QAClD,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACjC,QAAQ,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,+BAAmB,CAAC,CAAC,CAAC;QACtD,QAAQ,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,oCAAwB,CAAC,CAAC,CAAC;QAE3D,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AA3GD,4CA2GC"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/apiconnector/questions.d.ts

@@ -1,8 +1,28 @@
-import { TextInputQuestion, OptionItem } from "@microsoft/teamsfx-api";
-export declare const apiNameQuestion: TextInputQuestion;
+import { LogProvider, OptionItem, PluginContext, TelemetryReporter, Question, ValidationSchema, TextInputQuestion } from "@microsoft/teamsfx-api";
+import { Context } from "@microsoft/teamsfx-api/build/v2";
+export interface IQuestionService {
+    condition?(parentAnswerPath: string): {
+        target?: string;
+    } & ValidationSchema;
+    getQuestion(ctx: PluginContext): Question;
+}
+export declare class BaseQuestionService {
+    protected readonly logger: LogProvider | undefined;
+    protected readonly telemetryReporter: TelemetryReporter | undefined;
+    constructor(telemetryReporter?: TelemetryReporter, logger?: LogProvider);
+}
+export declare class ApiNameQuestion extends BaseQuestionService implements IQuestionService {
+    protected readonly ctx: Context | undefined;
+    constructor(ctx?: Context, telemetryReporter?: TelemetryReporter, logger?: LogProvider);
+    getQuestion(): TextInputQuestion;
+}
 export declare const apiEndpointQuestion: TextInputQuestion;
 export declare const apiTypeQuestion: TextInputQuestion;
-export declare const apiLoginUserNameQuestion: TextInputQuestion;
+export declare const basicAuthUsernameQuestion: TextInputQuestion;
+export declare const appTenantIdQuestion: TextInputQuestion;
+export declare const appIdQuestion: TextInputQuestion;
+export declare const reuseAppOption: OptionItem;
+export declare const anotherAppOption: OptionItem;
 export declare const botOption: OptionItem;
 export declare const functionOption: OptionItem;
 export declare const BasicAuthOption: OptionItem;

package/build/plugins/resource/apiconnector/questions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/questions.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIvE,eAAO,MAAM,eAAe,EAAE,iBAI7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,iBAIjC,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,iBAI7B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAItC,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,UAIvB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UAI5B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAI7B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UAI5B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,UAI3B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAI9B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAInC,CAAC"}
+{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/questions.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,WAAW,EACX,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,QAAQ,EACR,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAI1D,MAAM,WAAW,gBAAgB;IAE/B,SAAS,CAAC,CAAC,gBAAgB,EAAE,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,gBAAgB,CAAC;IAE7E,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,QAAQ,CAAC;CAC3C;AAED,qBAAa,mBAAmB;IAC9B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IACnD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;gBAExD,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,WAAW;CAIxE;AACD,qBAAa,eAAgB,SAAQ,mBAAoB,YAAW,gBAAgB;IAClF,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,CAAC;gBAChC,GAAG,CAAC,EAAE,OAAO,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,WAAW;IAK/E,WAAW,IAAI,iBAAiB;CAqBxC;AAED,eAAO,MAAM,mBAAmB,EAAE,iBAKjC,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,iBAI7B,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,iBAOvC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,iBAKjC,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,iBAK3B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UAG5B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAG9B,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,UAIvB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UAI5B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAI7B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UAI5B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,UAI3B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAI9B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAInC,CAAC"}

package/build/plugins/resource/apiconnector/questions.js

@@ -2,62 +2,109 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImplementMyselfOption = exports.APIKeyAuthOption = exports.AADAuthOption = exports.CertAuthOption = exports.BasicAuthOption = exports.functionOption = exports.botOption = exports.apiLoginUserNameQuestion = exports.apiTypeQuestion = exports.apiEndpointQuestion = exports.apiNameQuestion = void 0;
+exports.ImplementMyselfOption = exports.APIKeyAuthOption = exports.AADAuthOption = exports.CertAuthOption = exports.BasicAuthOption = exports.functionOption = exports.botOption = exports.anotherAppOption = exports.reuseAppOption = exports.appIdQuestion = exports.appTenantIdQuestion = exports.basicAuthUsernameQuestion = exports.apiTypeQuestion = exports.apiEndpointQuestion = exports.ApiNameQuestion = exports.BaseQuestionService = void 0;
 const constants_1 = require("./constants");
 const localizeUtils_1 = require("../../../common/localizeUtils");
-exports.apiNameQuestion = {
-    name: constants_1.Constants.questionKey.apiName,
-    title: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestionApiName.title"),
-    type: "text",
-};
+const checker_1 = require("./checker");
+class BaseQuestionService {
+    constructor(telemetryReporter, logger) {
+        this.telemetryReporter = telemetryReporter;
+        this.logger = logger;
+    }
+}
+exports.BaseQuestionService = BaseQuestionService;
+class ApiNameQuestion extends BaseQuestionService {
+    constructor(ctx, telemetryReporter, logger) {
+        super(telemetryReporter, logger);
+        this.ctx = ctx;
+    }
+    getQuestion() {
+        return {
+            type: "text",
+            name: constants_1.Constants.questionKey.apiName,
+            title: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestionApiName.title"),
+            validation: {
+                validFunc: async (input, previousInputs) => {
+                    var _a;
+                    const languageType = (_a = this.ctx) === null || _a === void 0 ? void 0 : _a.projectSetting.programmingLanguage;
+                    const components = previousInputs[constants_1.Constants.questionKey.componentsSelect];
+                    return await checker_1.checkApiNameExist(input, previousInputs === null || previousInputs === void 0 ? void 0 : previousInputs.projectPath, components, languageType);
+                },
+            },
+        };
+    }
+}
+exports.ApiNameQuestion = ApiNameQuestion;
 exports.apiEndpointQuestion = {
     name: constants_1.Constants.questionKey.endpoint,
     title: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestionEndpoint.title"),
     type: "text",
+    placeholder: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestionEndpoint.placeholder"), // Use the placeholder to display some description
 };
 exports.apiTypeQuestion = {
     name: constants_1.Constants.questionKey.apiType,
     title: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestionApiType.title"),
     type: "text",
 };
-exports.apiLoginUserNameQuestion = {
+exports.basicAuthUsernameQuestion = {
     name: constants_1.Constants.questionKey.apiUserName,
-    title: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestionApiUserName.title"),
+    title: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestion.basicAuth.userName.title"),
+    type: "text",
+    placeholder: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestion.basicAuth.userName.placeholder"), // Use the placeholder to display some description
+};
+exports.appTenantIdQuestion = {
+    name: constants_1.Constants.questionKey.apiAppTenentId,
+    title: localizeUtils_1.getLocalizedString("plugins.apiConnector.appTenantId.title"),
     type: "text",
+    placeholder: localizeUtils_1.getLocalizedString("plugins.apiConnector.appTenantId.placeholder"), // Use the placeholder to display some description
+};
+exports.appIdQuestion = {
+    name: constants_1.Constants.questionKey.apiAppId,
+    title: localizeUtils_1.getLocalizedString("plugins.apiConnector.appId.title"),
+    type: "text",
+    placeholder: localizeUtils_1.getLocalizedString("plugins.apiConnector.appId.placeholder"), // Use the placeholder to display some description
+};
+exports.reuseAppOption = {
+    id: "reuseApp",
+    label: localizeUtils_1.getLocalizedString("plugins.apiConnector.reuseAppOption.title"),
+};
+exports.anotherAppOption = {
+    id: "anotherApp",
+    label: localizeUtils_1.getLocalizedString("plugins.apiConnector.anotherAppOption.title"),
 };
 exports.botOption = {
     id: "bot",
-    label: "bot",
-    detail: localizeUtils_1.getLocalizedString("plugins.apiConnector.botOption.detail"),
+    label: localizeUtils_1.getLocalizedString("plugins.apiConnector.botOption.title"),
+    detail: "./bot",
 };
 exports.functionOption = {
     id: "api",
-    label: "api",
-    detail: localizeUtils_1.getLocalizedString("plugins.apiConnector.functionOption.detail"),
+    label: localizeUtils_1.getLocalizedString("plugins.apiConnector.functionOption.title"),
+    detail: "./api",
 };
 exports.BasicAuthOption = {
-    id: "basic",
-    label: "Basic Authentication",
+    id: constants_1.AuthType.BASIC,
+    label: "Basic",
     detail: localizeUtils_1.getLocalizedString("plugins.apiConnector.BasicAuthOption.detail"),
 };
 exports.CertAuthOption = {
-    id: "cert",
-    label: "Certification Authentication",
+    id: constants_1.AuthType.CERT,
+    label: "Certification",
     detail: localizeUtils_1.getLocalizedString("plugins.apiConnector.CertAuthOption.detail"),
 };
 exports.AADAuthOption = {
-    id: "aad",
-    label: "Azure Active Directory Authentication",
+    id: constants_1.AuthType.AAD,
+    label: "Azure Active Directory",
     detail: localizeUtils_1.getLocalizedString("plugins.apiConnector.AADAuthOption.detail"),
 };
 exports.APIKeyAuthOption = {
-    id: "APIkey",
-    label: "API Key Authentication",
+    id: constants_1.AuthType.APIKEY,
+    label: "API Key",
     detail: localizeUtils_1.getLocalizedString("plugins.apiConnector.APIKeyOption.detail"),
 };
 exports.ImplementMyselfOption = {
-    id: "ImplementMyself",
-    label: "Implement authentication by myself",
+    id: constants_1.AuthType.CUSTOM,
+    label: "Custom Auth Implementation",
     detail: localizeUtils_1.getLocalizedString("plugins.apiConnector.ImplementMyselfOption.detail"),
 };
 //# sourceMappingURL=questions.js.map

package/build/plugins/resource/apiconnector/questions.js.map

@@ -1 +1 @@
-{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/questions.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,2CAAwC;AACxC,iEAAmE;AAEtD,QAAA,eAAe,GAAsB;IAChD,IAAI,EAAE,qBAAS,CAAC,WAAW,CAAC,OAAO;IACnC,KAAK,EAAE,kCAAkB,CAAC,+CAA+C,CAAC;IAC1E,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,mBAAmB,GAAsB;IACpD,IAAI,EAAE,qBAAS,CAAC,WAAW,CAAC,QAAQ;IACpC,KAAK,EAAE,kCAAkB,CAAC,gDAAgD,CAAC;IAC3E,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,eAAe,GAAsB;IAChD,IAAI,EAAE,qBAAS,CAAC,WAAW,CAAC,OAAO;IACnC,KAAK,EAAE,kCAAkB,CAAC,+CAA+C,CAAC;IAC1E,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,wBAAwB,GAAsB;IACzD,IAAI,EAAE,qBAAS,CAAC,WAAW,CAAC,WAAW;IACvC,KAAK,EAAE,kCAAkB,CAAC,mDAAmD,CAAC;IAC9E,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,SAAS,GAAe;IACnC,EAAE,EAAE,KAAK;IACT,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,kCAAkB,CAAC,uCAAuC,CAAC;CACpE,CAAC;AAEW,QAAA,cAAc,GAAe;IACxC,EAAE,EAAE,KAAK;IACT,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,kCAAkB,CAAC,4CAA4C,CAAC;CACzE,CAAC;AAEW,QAAA,eAAe,GAAe;IACzC,EAAE,EAAE,OAAO;IACX,KAAK,EAAE,sBAAsB;IAC7B,MAAM,EAAE,kCAAkB,CAAC,6CAA6C,CAAC;CAC1E,CAAC;AAEW,QAAA,cAAc,GAAe;IACxC,EAAE,EAAE,MAAM;IACV,KAAK,EAAE,8BAA8B;IACrC,MAAM,EAAE,kCAAkB,CAAC,4CAA4C,CAAC;CACzE,CAAC;AAEW,QAAA,aAAa,GAAe;IACvC,EAAE,EAAE,KAAK;IACT,KAAK,EAAE,uCAAuC;IAC9C,MAAM,EAAE,kCAAkB,CAAC,2CAA2C,CAAC;CACxE,CAAC;AAEW,QAAA,gBAAgB,GAAe;IAC1C,EAAE,EAAE,QAAQ;IACZ,KAAK,EAAE,wBAAwB;IAC/B,MAAM,EAAE,kCAAkB,CAAC,0CAA0C,CAAC;CACvE,CAAC;AAEW,QAAA,qBAAqB,GAAe;IAC/C,EAAE,EAAE,iBAAiB;IACrB,KAAK,EAAE,oCAAoC;IAC3C,MAAM,EAAE,kCAAkB,CAAC,mDAAmD,CAAC;CAChF,CAAC"}
+{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/questions.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/apiconnector/result.d.ts

@@ -1,5 +1,6 @@
-import { FxError, SystemError, UserError, Result } from "@microsoft/teamsfx-api";
+import { FxError, SystemError, UserError, Result, QTreeNode } from "@microsoft/teamsfx-api";
 export declare type ApiConnectorResult = Result<any, FxError>;
+export declare type QesutionResult = Result<QTreeNode | undefined, FxError>;
 export declare class ResultFactory {
     static readonly source: string;
     static UserError(name: string, message: string, innerError?: any, stack?: string, helpLink?: string): UserError;

package/build/plugins/resource/apiconnector/result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/result.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAM,MAAM,wBAAwB,CAAC;AAErF,oBAAY,kBAAkB,GAAG,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACtD,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA6B;WAC7C,SAAS,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,GAAG,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,GAChB,SAAS;WAIE,WAAW,CACvB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,GAAG,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,WAAW;WAIA,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,GAAG,kBAAkB;CAGxD"}
+{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/result.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAM,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEhG,oBAAY,kBAAkB,GAAG,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACtD,oBAAY,cAAc,GAAG,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;AACpE,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA6B;WAC7C,SAAS,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,GAAG,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,GAChB,SAAS;WAIE,WAAW,CACvB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,GAAG,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,WAAW;WAIA,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,GAAG,kBAAkB;CAGxD"}

package/build/plugins/resource/apiconnector/result.js.map

@@ -1 +1 @@
-{"version":3,"file":"result.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/result.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AACb,wDAAqF;AACrF,2CAAwC;AAExC,MAAa,aAAa;IAEjB,MAAM,CAAC,SAAS,CACrB,IAAY,EACZ,OAAe,EACf,UAAgB,EAChB,KAAc,EACd,QAAiB;QAEjB,OAAO,IAAI,uBAAS,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;IAEM,MAAM,CAAC,WAAW,CACvB,IAAY,EACZ,OAAe,EACf,UAAgB,EAChB,KAAc,EACd,SAAkB;QAElB,OAAO,IAAI,yBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,MAAY;QAChC,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;;AAxBH,sCAyBC;AAxBiB,oBAAM,GAAW,qBAAS,CAAC,eAAe,CAAC"}
+{"version":3,"file":"result.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/result.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AACb,wDAAgG;AAChG,2CAAwC;AAGxC,MAAa,aAAa;IAEjB,MAAM,CAAC,SAAS,CACrB,IAAY,EACZ,OAAe,EACf,UAAgB,EAChB,KAAc,EACd,QAAiB;QAEjB,OAAO,IAAI,uBAAS,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;IAEM,MAAM,CAAC,WAAW,CACvB,IAAY,EACZ,OAAe,EACf,UAAgB,EAChB,KAAc,EACd,SAAkB;QAElB,OAAO,IAAI,yBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,MAAY;QAChC,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;;AAxBH,sCAyBC;AAxBiB,oBAAM,GAAW,qBAAS,CAAC,eAAe,CAAC"}

package/build/plugins/resource/apiconnector/sampleHandler.d.ts

@@ -1,5 +1,5 @@
 import { ApiConnectorResult } from "./result";
-import { ApiConnectorConfiguration } from "./utils";
+import { ApiConnectorConfiguration } from "./config";
 export declare class SampleHandler {
     private readonly projectRoot;
     private readonly languageExt;

package/build/plugins/resource/apiconnector/sampleHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampleHandler.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/sampleHandler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAG7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAEpD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAW;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBACvB,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAM3D,kBAAkB,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAiChG"}
+{"version":3,"file":"sampleHandler.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/sampleHandler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAG7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAErD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAW;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBACvB,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAM3D,kBAAkB,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAoChG"}

package/build/plugins/resource/apiconnector/sampleHandler.js

@@ -20,11 +20,15 @@ class SampleHandler {
     }
     async generateSampleCode(config) {
         const fileSuffix = this.languageExt;
-        const templateDirectory = path.join(folder_1.getTemplatesFolder(), "plugins", "resource", "apiconnector", "sample", fileSuffix);
-        const templateName = constants_1.Constants.pluginNameShort + ".template";
+        const baseDirectory = path.join(folder_1.getTemplatesFolder(), "plugins", "resource", "apiconnector", "sample");
+        const templateDirectory = path.join(baseDirectory, fileSuffix);
+        const commentTemplateFilePath = path.join(baseDirectory, constants_1.Constants.commentTemplate);
+        const templateName = config.AuthConfig.AuthType + constants_1.Constants.templateEx;
         const templateFilePath = path.join(templateDirectory, templateName);
         try {
-            const templateString = await fs.readFile(templateFilePath, constants_2.ConstantString.UTF8Encoding);
+            const commentString = await fs.readFile(commentTemplateFilePath, constants_2.ConstantString.UTF8Encoding);
+            let templateString = await fs.readFile(templateFilePath, constants_2.ConstantString.UTF8Encoding);
+            templateString += commentString;
             const context = {
                 config: config,
                 capitalName: config.APIName.toUpperCase(),

package/build/plugins/resource/apiconnector/sampleHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"sampleHandler.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/sampleHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AACb,mDAA6B;AAC7B,qDAA+B;AAC/B,2CAAgE;AAChE,4CAAqD;AACrD,qCAA6D;AAC7D,4CAAkE;AAClE,yDAA2D;AAE3D,qCAAwC;AACxC,MAAa,aAAa;IAIxB,YAAY,WAAmB,EAAE,YAAoB,EAAE,SAAiB;QACtE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,YAAY,KAAK,wBAAY,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAQ,CAAC,EAAE,CAAC;QAChF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,MAAiC;QAC/D,MAAM,UAAU,GAAW,IAAI,CAAC,WAAW,CAAC;QAC5C,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,2BAAkB,EAAE,EACpB,SAAS,EACT,UAAU,EACV,cAAc,EACd,QAAQ,EACR,UAAU,CACX,CAAC;QACF,MAAM,YAAY,GAAW,qBAAS,CAAC,eAAe,GAAG,WAAW,CAAC;QACrE,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;QACpE,IAAI;YACF,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,0BAAc,CAAC,YAAY,CAAC,CAAC;YACxF,MAAM,OAAO,GAAG;gBACd,MAAM,EAAE,MAAM;gBACd,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE;aAC1C,CAAC;YACF,MAAM,YAAY,GAAW,MAAM,CAAC,OAAO,GAAG,GAAG,GAAG,UAAU,CAAC;YAC/D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YAC/E,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;gBACrC,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;aAC/B;YACD,MAAM,QAAQ,GAAG,wCAA+B,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC1E,MAAM,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAC3C,OAAO,sBAAa,CAAC,OAAO,EAAE,CAAC;SAChC;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,sBAAa,CAAC,WAAW,CAC7B,qBAAY,CAAC,yBAAyB,CAAC,IAAI,EAC3C,qBAAY,CAAC,yBAAyB,CAAC,OAAO,CAAC,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAAC,CAChF,CAAC;SACH;IACH,CAAC;CACF;AA3CD,sCA2CC"}
+{"version":3,"file":"sampleHandler.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/sampleHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AACb,mDAA6B;AAC7B,qDAA+B;AAC/B,2CAAgE;AAChE,4CAAqD;AACrD,qCAA6D;AAC7D,4CAAkE;AAClE,yDAA2D;AAE3D,qCAAwC;AACxC,MAAa,aAAa;IAIxB,YAAY,WAAmB,EAAE,YAAoB,EAAE,SAAiB;QACtE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,YAAY,KAAK,wBAAY,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAQ,CAAC,EAAE,CAAC;QAChF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,MAAiC;QAC/D,MAAM,UAAU,GAAW,IAAI,CAAC,WAAW,CAAC;QAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAC7B,2BAAkB,EAAE,EACpB,SAAS,EACT,UAAU,EACV,cAAc,EACd,QAAQ,CACT,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC/D,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAS,CAAC,eAAe,CAAC,CAAC;QACpF,MAAM,YAAY,GAAW,MAAM,CAAC,UAAU,CAAC,QAAQ,GAAG,qBAAS,CAAC,UAAU,CAAC;QAC/E,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;QACpE,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,0BAAc,CAAC,YAAY,CAAC,CAAC;YAC9F,IAAI,cAAc,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,0BAAc,CAAC,YAAY,CAAC,CAAC;YACtF,cAAc,IAAI,aAAa,CAAC;YAChC,MAAM,OAAO,GAAG;gBACd,MAAM,EAAE,MAAM;gBACd,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE;aAC1C,CAAC;YACF,MAAM,YAAY,GAAW,MAAM,CAAC,OAAO,GAAG,GAAG,GAAG,UAAU,CAAC;YAC/D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YAC/E,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;gBACrC,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;aAC/B;YACD,MAAM,QAAQ,GAAG,wCAA+B,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC1E,MAAM,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAC3C,OAAO,sBAAa,CAAC,OAAO,EAAE,CAAC;SAChC;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,sBAAa,CAAC,WAAW,CAC7B,qBAAY,CAAC,yBAAyB,CAAC,IAAI,EAC3C,qBAAY,CAAC,yBAAyB,CAAC,OAAO,CAAC,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAAC,CAChF,CAAC;SACH;IACH,CAAC;CACF;AA9CD,sCA8CC"}

package/build/plugins/resource/apiconnector/utils.d.ts

@@ -1,22 +1,18 @@
-export interface ApiConnectorConfiguration extends Record<any, any> {
-    ComponentPath: string[];
-    APIName: string;
-    ApiAuthType?: string;
-    EndPoint: string;
-    ApiUserName?: string;
-}
-export declare type ApiConnectorItem = Record<ApiConfigName, string>;
-export declare enum ApiConfigName {
-    ENDPOINT = "_ENDPOINT",
-    AUTHENTICATION_TYPE = "_AUTHENTICATION_TYPE",
-    USERNAME = "_USERNAME",
-    PASSWORD = "_PASSWORD"
-}
-export declare enum AuthType {
-    BASIC = "Basic Auth",
-    APIKEY = "Api Key",
-    AAD = "Azure Active Directory",
-    CERT = "certificate",
-    OTHERS = "Others"
+import { Inputs } from "@microsoft/teamsfx-api";
+export declare function generateTempFolder(): string;
+export declare function getSampleFileName(apiName: string, languageType: string): string;
+export declare function copyFileIfExist(srcFile: string, targetFile: string): Promise<void>;
+export declare function removeFileIfExist(file: string): Promise<void>;
+export declare function checkInputEmpty(inputs: Inputs, ...keys: string[]): void;
+export declare class Notification {
+    static readonly READ_MORE: string;
+    static readonly READ_MORE_URL = "https://aka.ms/teamsfx-connect-api";
+    static GetBasiString(apiName: string, components: string[], languageType: string): string;
+    static GetBasicAuthString(apiName: string, components: string[]): string;
+    static GetCertAuthString(apiName: string, components: string[]): string;
+    static GetApiKeyAuthString(apiName: string, components: string[]): string;
+    static GetCustomAuthString(apiName: string, components: string[], languageType: string): string;
+    static GetGenAADAuthString(apiName: string, components: string[]): string;
+    static GetReuseAADAuthString(apiName: string): string;
 }
 //# sourceMappingURL=utils.d.ts.map

package/build/plugins/resource/apiconnector/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/utils.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;IACjE,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,oBAAY,gBAAgB,GAAG,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAE7D,oBAAY,aAAa;IACvB,QAAQ,cAAc;IACtB,mBAAmB,yBAAyB;IAC5C,QAAQ,cAAc;IACtB,QAAQ,cAAc;CACvB;AAED,oBAAY,QAAQ;IAClB,KAAK,eAAe;IACpB,MAAM,YAAY;IAClB,GAAG,2BAA2B;IAC9B,IAAI,gBAAgB;IACpB,MAAM,WAAW;CAClB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAOhD,wBAAgB,kBAAkB,IAAI,MAAM,CAI3C;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAGtE;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAIxE;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,iBAInD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,QAShE;AAED,qBAAa,YAAY;IACvB,gBAAuB,SAAS,SAAoD;IACpF,gBAAuB,aAAa,wCAAwC;WAE9D,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM;WASlF,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM;WAUjE,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM;WAOhE,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM;WAUlE,mBAAmB,CAC/B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAAE,EACpB,YAAY,EAAE,MAAM,GACnB,MAAM;WASK,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM;WAWlE,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAG7D"}