@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.42a29d71b.0

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

@@ -1,4 +1,4 @@
-import { Func, FxError, Inputs, Json, Result, TokenProvider, Void, v2, ProjectSettings } from "@microsoft/teamsfx-api";
+import { Func, FxError, Inputs, Json, Result, TokenProvider, Void, v2, ProjectSettings, QTreeNode } from "@microsoft/teamsfx-api";
 import { EnvInfoV2, Context } from "@microsoft/teamsfx-api/build/v2";
 import { AadAppForTeamsPlugin } from "..";
 export declare class AadPluginV2 implements v2.ResourcePlugin {
@@ -17,5 +17,6 @@ export declare class AadPluginV2 implements v2.ResourcePlugin {
     listCollaborator(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, userInfo: Json): Promise<Result<Json, FxError>>;
     scaffoldSourceCode(ctx: Context, inputs: Inputs): Promise<Result<Void, FxError>>;
     deploy(ctx: v2.Context, inputs: v2.DeploymentInputs, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
+    getQuestions(ctx: Context, inputs: Inputs, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<QTreeNode | undefined, 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":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/aad/v2/index.ts"],"names":[],"mappings":"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"}

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

@@ -50,6 +50,9 @@ let AadPluginV2 = class AadPluginV2 {
     async deploy(ctx, inputs, envInfo, tokenProvider) {
         return utils4v2_1.deployAdapter(ctx, inputs, envInfo, tokenProvider, this.plugin);
     }
+    async getQuestions(ctx, inputs, envInfo, tokenProvider) {
+        return await utils4v2_1.getQuestionsAdapter(ctx, inputs, envInfo, tokenProvider, this.plugin);
+    }
 };
 tslib_1.__decorate([
     typedi_1.Inject(ResourcePluginContainer_1.ResourcePlugins.AadPlugin),

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/apiconnector/checker.d.ts

@@ -0,0 +1,7 @@
+export declare function checkApiNameExist(input: string, projectPath: string, components: string[], languageType: string): Promise<string | undefined>;
+export declare function checkEmptyValue(input: string): Promise<string | undefined>;
+export declare function checkApiNameValid(input: string): Promise<string | undefined>;
+export declare function checkEmptySelect(input: string[]): Promise<string | undefined>;
+export declare function checkIsGuid(input: string): Promise<string | undefined>;
+export declare function checkHttp(input: string): Promise<string | undefined>;
+//# sourceMappingURL=checker.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/checker.ts"],"names":[],"mappings":"AAUA,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAAE,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAa7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAKhF;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAYlF;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAMnF;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAK5E;AAED,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAK1E"}

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

@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkHttp = exports.checkIsGuid = exports.checkEmptySelect = exports.checkApiNameValid = exports.checkEmptyValue = exports.checkApiNameExist = void 0;
+const tslib_1 = require("tslib");
+const fs = tslib_1.__importStar(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const localizeUtils_1 = require("../../../common/localizeUtils");
+const utils_1 = require("./utils");
+const guidRegex = /^[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$/;
+async function checkApiNameExist(input, projectPath, components, languageType) {
+    const apiFileName = utils_1.getSampleFileName(input, languageType);
+    for (const component of components) {
+        const componentPath = path_1.default.join(projectPath, component);
+        // This pathExistsSync is a workaround for cli interactive command.
+        if (fs.pathExistsSync(path_1.default.join(componentPath, apiFileName))) {
+            return localizeUtils_1.getLocalizedString("plugins.apiConnector.QuestionAppName.validation.ApiNameExist", apiFileName);
+        }
+    }
+    return undefined;
+}
+exports.checkApiNameExist = checkApiNameExist;
+async function checkEmptyValue(input) {
+    if (input) {
+        return undefined;
+    }
+    return localizeUtils_1.getLocalizedString("plugins.apiConnector.Question.validation.EmptyValue");
+}
+exports.checkEmptyValue = checkEmptyValue;
+async function checkApiNameValid(input) {
+    if (input.match(/[^a-zA-Z0-9]/)) {
+        return localizeUtils_1.getLocalizedString("plugins.apiConnector.QuestionAppName.validation.ApiNameAlphanumeric");
+    }
+    if (input.match(/^[0-9]/)) {
+        return localizeUtils_1.getLocalizedString("plugins.apiConnector.QuestionAppName.validation.ApiNameNumberPrefix");
+    }
+    return undefined;
+}
+exports.checkApiNameValid = checkApiNameValid;
+async function checkEmptySelect(input) {
+    const name = input;
+    if (name.length === 0) {
+        return localizeUtils_1.getLocalizedString("plugins.apiConnector.questionComponentSelect.emptySelection");
+    }
+    return undefined;
+}
+exports.checkEmptySelect = checkEmptySelect;
+async function checkIsGuid(input) {
+    if (guidRegex.exec(input)) {
+        return undefined;
+    }
+    return localizeUtils_1.getLocalizedString("plugins.apiConnector.Question.validation.NotGuid");
+}
+exports.checkIsGuid = checkIsGuid;
+async function checkHttp(input) {
+    if (isValidHttpUrl(input)) {
+        return undefined;
+    }
+    return localizeUtils_1.getLocalizedString("plugins.apiConnector.QuestionApiEndpoint.validation.NotHttp");
+}
+exports.checkHttp = checkHttp;
+function isValidHttpUrl(str) {
+    let url;
+    try {
+        url = new URL(str);
+    }
+    catch (_) {
+        return false;
+    }
+    return url.protocol === "http:" || url.protocol === "https:";
+}
+//# sourceMappingURL=checker.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"checker.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/checker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AACb,qDAA+B;AAC/B,wDAAwB;AACxB,iEAAmE;AACnE,mCAA4C;AAE5C,MAAM,SAAS,GAAG,sDAAsD,CAAC;AAElE,KAAK,UAAU,iBAAiB,CACrC,KAAa,EACb,WAAmB,EACnB,UAAoB,EACpB,YAAoB;IAEpB,MAAM,WAAW,GAAW,yBAAiB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACnE,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAClC,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACxD,mEAAmE;QACnE,IAAI,EAAE,CAAC,cAAc,CAAC,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,EAAE;YAC5D,OAAO,kCAAkB,CACvB,8DAA8D,EAC9D,WAAW,CACZ,CAAC;SACH;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAlBD,8CAkBC;AAEM,KAAK,UAAU,eAAe,CAAC,KAAa;IACjD,IAAI,KAAK,EAAE;QACT,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,kCAAkB,CAAC,qDAAqD,CAAC,CAAC;AACnF,CAAC;AALD,0CAKC;AAEM,KAAK,UAAU,iBAAiB,CAAC,KAAa;IACnD,IAAI,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;QAC/B,OAAO,kCAAkB,CACvB,qEAAqE,CACtE,CAAC;KACH;IACD,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;QACzB,OAAO,kCAAkB,CACvB,qEAAqE,CACtE,CAAC;KACH;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAZD,8CAYC;AAEM,KAAK,UAAU,gBAAgB,CAAC,KAAe;IACpD,MAAM,IAAI,GAAG,KAAiB,CAAC;IAC/B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,kCAAkB,CAAC,6DAA6D,CAAC,CAAC;KAC1F;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAND,4CAMC;AAEM,KAAK,UAAU,WAAW,CAAC,KAAa;IAC7C,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,kCAAkB,CAAC,kDAAkD,CAAC,CAAC;AAChF,CAAC;AALD,kCAKC;AAEM,KAAK,UAAU,SAAS,CAAC,KAAa;IAC3C,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,kCAAkB,CAAC,6DAA6D,CAAC,CAAC;AAC3F,CAAC;AALD,8BAKC;AAED,SAAS,cAAc,CAAC,GAAW;IACjC,IAAI,GAAG,CAAC;IAER,IAAI;QACF,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;KACpB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;IAED,OAAO,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAC/D,CAAC"}

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

@@ -0,0 +1,23 @@
+import { AuthType, KeyLocation } from "./constants";
+export interface ApiConnectorConfiguration extends Record<any, any> {
+    ComponentType: string[];
+    APIName: string;
+    EndPoint: string;
+    AuthConfig: AuthConfig;
+}
+export interface AuthConfig {
+    AuthType: AuthType;
+}
+export interface BasicAuthConfig extends AuthConfig {
+    UserName: string;
+}
+export interface AADAuthConfig extends AuthConfig {
+    ReuseTeamsApp: boolean;
+    TenantId?: string;
+    ClientId?: string;
+}
+export interface APIKeyAuthConfig extends AuthConfig {
+    Name: string;
+    Location: KeyLocation;
+}
+//# sourceMappingURL=config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;IACjE,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,WAAW,CAAC;CACvB"}

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

@@ -0,0 +1,5 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=config.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/config.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC"}

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

@@ -2,6 +2,17 @@ export declare enum ComponentType {
     API = "api",
     BOT = "bot"
 }
+export declare enum AuthType {
+    BASIC = "basic",
+    APIKEY = "apikey",
+    AAD = "aad",
+    CERT = "cert",
+    CUSTOM = "custom"
+}
+export declare enum KeyLocation {
+    Header = "request header",
+    QueryParams = "query parameter"
+}
 export declare enum LanguageType {
     JS = "javascript",
     TS = "typescript"
@@ -13,13 +24,26 @@ export declare enum FileType {
 export declare class Constants {
     static readonly PLUGIN_NAME = "APIConnector";
     static readonly pluginNameShort = "api-connector";
+    static readonly headerCommentTemplate = "headerComment.template";
+    static readonly footerCommentTemplate = "footerComment.template";
+    static readonly templateEx = ".template";
+    static readonly envPrefix = "TEAMSFX_API_";
+    static readonly envFileName = ".env.teamsfx.local";
+    static readonly pkgJsonFile = "package.json";
+    static readonly pkgLockFile = "package-lock.json";
+    static readonly sdkName = "@microsoft/teamsfx";
+    static readonly sdkJsName = "@microsft/teams-js";
     static readonly questionKey: {
         componentsSelect: string;
         endpoint: string;
         apiName: string;
         apiType: string;
         apiUserName: string;
-        apiPassword: string;
+        apiAppType: string;
+        apiAppTenentId: string;
+        apiAppId: string;
+        apiAPIKeyLocation: string;
+        apiAPIKeyName: string;
     };
 }
 //# sourceMappingURL=constants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/constants.ts"],"names":[],"mappings":"AAIA,oBAAY,aAAa;IACvB,GAAG,QAAQ;IACX,GAAG,QAAQ;CACZ;AAED,oBAAY,YAAY;IACtB,EAAE,eAAe;IACjB,EAAE,eAAe;CAClB;AAED,oBAAY,QAAQ;IAClB,EAAE,OAAO;IACT,EAAE,OAAO;CACV;AACD,qBAAa,SAAS;IACpB,gBAAuB,WAAW,kBAAkB;IACpD,gBAAuB,eAAe,mBAAmB;IAEzD,gBAAuB,WAAW;;;;;;;MAOhC;CACH"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/constants.ts"],"names":[],"mappings":"AAIA,oBAAY,aAAa;IACvB,GAAG,QAAQ;IACX,GAAG,QAAQ;CACZ;AAED,oBAAY,QAAQ;IAClB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,MAAM,WAAW;CAClB;AAED,oBAAY,WAAW;IACrB,MAAM,mBAAmB;IACzB,WAAW,oBAAoB;CAChC;AAED,oBAAY,YAAY;IACtB,EAAE,eAAe;IACjB,EAAE,eAAe;CAClB;AAED,oBAAY,QAAQ;IAClB,EAAE,OAAO;IACT,EAAE,OAAO;CACV;AACD,qBAAa,SAAS;IACpB,gBAAuB,WAAW,kBAAkB;IACpD,gBAAuB,eAAe,mBAAmB;IACzD,gBAAuB,qBAAqB,4BAA4B;IACxE,gBAAuB,qBAAqB,4BAA4B;IACxE,gBAAuB,UAAU,eAAe;IAChD,gBAAuB,SAAS,kBAAkB;IAElD,gBAAuB,WAAW,wBAAwB;IAC1D,gBAAuB,WAAW,kBAAkB;IACpD,gBAAuB,WAAW,uBAAuB;IACzD,gBAAuB,OAAO,wBAAwB;IACtD,gBAAuB,SAAS,wBAAwB;IAExD,gBAAuB,WAAW;;;;;;;;;;;MAWhC;CACH"}

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

@@ -2,12 +2,25 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Constants = exports.FileType = exports.LanguageType = exports.ComponentType = void 0;
+exports.Constants = exports.FileType = exports.LanguageType = exports.KeyLocation = exports.AuthType = exports.ComponentType = void 0;
 var ComponentType;
 (function (ComponentType) {
     ComponentType["API"] = "api";
     ComponentType["BOT"] = "bot";
 })(ComponentType = exports.ComponentType || (exports.ComponentType = {}));
+var AuthType;
+(function (AuthType) {
+    AuthType["BASIC"] = "basic";
+    AuthType["APIKEY"] = "apikey";
+    AuthType["AAD"] = "aad";
+    AuthType["CERT"] = "cert";
+    AuthType["CUSTOM"] = "custom";
+})(AuthType = exports.AuthType || (exports.AuthType = {}));
+var KeyLocation;
+(function (KeyLocation) {
+    KeyLocation["Header"] = "request header";
+    KeyLocation["QueryParams"] = "query parameter";
+})(KeyLocation = exports.KeyLocation || (exports.KeyLocation = {}));
 var LanguageType;
 (function (LanguageType) {
     LanguageType["JS"] = "javascript";
@@ -23,12 +36,25 @@ class Constants {
 exports.Constants = Constants;
 Constants.PLUGIN_NAME = "APIConnector";
 Constants.pluginNameShort = "api-connector";
+Constants.headerCommentTemplate = "headerComment.template";
+Constants.footerCommentTemplate = "footerComment.template";
+Constants.templateEx = ".template";
+Constants.envPrefix = "TEAMSFX_API_";
+Constants.envFileName = ".env.teamsfx.local";
+Constants.pkgJsonFile = "package.json";
+Constants.pkgLockFile = "package-lock.json";
+Constants.sdkName = "@microsoft/teamsfx";
+Constants.sdkJsName = "@microsft/teams-js";
 Constants.questionKey = {
-    componentsSelect: "ComponentSelect",
-    endpoint: "api-connector-endpoint",
-    apiName: "api-connector-name",
-    apiType: "api-connector-auth-type",
-    apiUserName: "api-connector-user-name",
-    apiPassword: "api-connector-password",
+    componentsSelect: "component",
+    endpoint: "endpoint",
+    apiName: "alias",
+    apiType: "auth-type",
+    apiUserName: "user-name",
+    apiAppType: "app-type",
+    apiAppTenentId: "tenant-id",
+    apiAppId: "app-id",
+    apiAPIKeyLocation: "key-location",
+    apiAPIKeyName: "key-name", // for aad auth
 };
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,4BAAW,CAAA;IACX,4BAAW,CAAA;AACb,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB;AAED,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;AACnB,CAAC,EAHW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAGvB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,qBAAS,CAAA;IACT,qBAAS,CAAA;AACX,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AACD,MAAa,SAAS;;AAAtB,8BAYC;AAXwB,qBAAW,GAAG,cAAc,CAAC;AAC7B,yBAAe,GAAG,eAAe,CAAC;AAElC,qBAAW,GAAG;IACnC,gBAAgB,EAAE,iBAAiB;IACnC,QAAQ,EAAE,wBAAwB;IAClC,OAAO,EAAE,oBAAoB;IAC7B,OAAO,EAAE,yBAAyB;IAClC,WAAW,EAAE,yBAAyB;IACtC,WAAW,EAAE,wBAAwB;CACtC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,4BAAW,CAAA;IACX,4BAAW,CAAA;AACb,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB;AAED,IAAY,QAMX;AAND,WAAY,QAAQ;IAClB,2BAAe,CAAA;IACf,6BAAiB,CAAA;IACjB,uBAAW,CAAA;IACX,yBAAa,CAAA;IACb,6BAAiB,CAAA;AACnB,CAAC,EANW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAMnB;AAED,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,wCAAyB,CAAA;IACzB,8CAA+B,CAAA;AACjC,CAAC,EAHW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAGtB;AAED,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;AACnB,CAAC,EAHW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAGvB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,qBAAS,CAAA;IACT,qBAAS,CAAA;AACX,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AACD,MAAa,SAAS;;AAAtB,8BA0BC;AAzBwB,qBAAW,GAAG,cAAc,CAAC;AAC7B,yBAAe,GAAG,eAAe,CAAC;AAClC,+BAAqB,GAAG,wBAAwB,CAAC;AACjD,+BAAqB,GAAG,wBAAwB,CAAC;AACjD,oBAAU,GAAG,WAAW,CAAC;AACzB,mBAAS,GAAG,cAAc,CAAC;AAE3B,qBAAW,GAAG,oBAAoB,CAAC;AACnC,qBAAW,GAAG,cAAc,CAAC;AAC7B,qBAAW,GAAG,mBAAmB,CAAC;AAClC,iBAAO,GAAG,oBAAoB,CAAC;AAC/B,mBAAS,GAAG,oBAAoB,CAAC;AAEjC,qBAAW,GAAG;IACnC,gBAAgB,EAAE,WAAW;IAC7B,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,WAAW;IACpB,WAAW,EAAE,WAAW;IACxB,UAAU,EAAE,UAAU;IACtB,cAAc,EAAE,WAAW;IAC3B,QAAQ,EAAE,QAAQ;IAClB,iBAAiB,EAAE,cAAc;IACjC,aAAa,EAAE,UAAU,EAAE,eAAe;CAC3C,CAAC"}

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

@@ -0,0 +1,13 @@
+import { Json } from "@microsoft/teamsfx-api";
+import { FileChange } from "./result";
+export declare class DepsHandler {
+    private readonly projectRoot;
+    private readonly componentType;
+    constructor(workspaceFolder: string, componentType: string);
+    addPkgDeps(): Promise<FileChange | undefined>;
+    getDepsConfig(): Promise<Json>;
+    updateLocalPkgDepsVersion(pkgConfig: Json): Promise<FileChange | undefined>;
+    private sdkVersionCheck;
+    private caretPrereleases;
+}
+//# sourceMappingURL=depsHandler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"depsHandler.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/depsHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAK9C,OAAO,EAAiB,UAAU,EAAkB,MAAM,UAAU,CAAC;AAIrE,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;gBAC3B,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAK7C,UAAU,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAK7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B,yBAAyB,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IA+BxF,OAAO,CAAC,eAAe;IA4BvB,OAAO,CAAC,gBAAgB;CAczB"}

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

@@ -0,0 +1,93 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DepsHandler = void 0;
+const tslib_1 = require("tslib");
+const fs = tslib_1.__importStar(require("fs-extra"));
+const path = tslib_1.__importStar(require("path"));
+const semver_1 = tslib_1.__importDefault(require("semver"));
+const constants_1 = require("./constants");
+const result_1 = require("./result");
+const errors_1 = require("./errors");
+const telemetry_1 = require("./telemetry");
+const folder_1 = require("../../../folder");
+class DepsHandler {
+    constructor(workspaceFolder, componentType) {
+        this.projectRoot = workspaceFolder;
+        this.componentType = componentType;
+    }
+    async addPkgDeps() {
+        const depsConfig = await this.getDepsConfig();
+        return await this.updateLocalPkgDepsVersion(depsConfig);
+    }
+    async getDepsConfig() {
+        const configPath = path.join(folder_1.getTemplatesFolder(), "plugins", "resource", "apiconnector");
+        const sdkConfigPath = path.join(configPath, constants_1.Constants.pkgJsonFile);
+        const sdkContent = await fs.readJson(sdkConfigPath);
+        return sdkContent.dependencies;
+    }
+    async updateLocalPkgDepsVersion(pkgConfig) {
+        const localPkgPath = path.join(this.projectRoot, this.componentType, constants_1.Constants.pkgJsonFile);
+        if (!(await fs.pathExists(localPkgPath))) {
+            throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.localPkgFileNotExistError.name, errors_1.ErrorMessage.localPkgFileNotExistError.message(this.componentType));
+        }
+        const pkgContent = await fs.readJson(localPkgPath);
+        let needUpdate = false;
+        for (const pkgItem in pkgConfig) {
+            if (this.sdkVersionCheck(pkgContent.dependencies, pkgItem, pkgConfig[pkgItem])) {
+                pkgContent.dependencies[pkgItem] = pkgConfig[pkgItem];
+                needUpdate = true;
+            }
+        }
+        if (needUpdate) {
+            await fs.writeFile(localPkgPath, JSON.stringify(pkgContent, null, 4));
+            const telemetryProperties = {
+                [telemetry_1.Telemetry.properties.componentType]: this.componentType,
+            };
+            telemetry_1.TelemetryUtils.sendEvent(telemetry_1.Telemetry.stage.updatePkg, undefined, telemetryProperties);
+            return {
+                changeType: result_1.FileChangeType.Update,
+                filePath: localPkgPath,
+            }; // return modified files
+        }
+        return undefined;
+    }
+    sdkVersionCheck(deps, sdkName, sdkVersion) {
+        // sdk alpha version
+        if (this.caretPrereleases(deps[sdkName], sdkVersion)) {
+            return false;
+        }
+        // sdk not in dependencies.
+        else if (!deps[sdkName]) {
+            return true;
+        }
+        // local sdk version intersect with sdk version in config.
+        else if (semver_1.default.intersects(deps[sdkName], sdkVersion)) {
+            return false;
+        }
+        // local sdk version lager than sdk version in config.
+        else if (semver_1.default.gt(semver_1.default.minVersion(deps[sdkName]), semver_1.default.minVersion(sdkVersion))) {
+            return false;
+        }
+        else {
+            throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.sdkVersionImcompatibleError.name, errors_1.ErrorMessage.sdkVersionImcompatibleError.message(this.componentType, deps[sdkName], sdkVersion));
+        }
+    }
+    caretPrereleases(ver1, ver2) {
+        if (!semver_1.default.prerelease(ver1) || !semver_1.default.prerelease(ver2)) {
+            return false;
+        }
+        // semver.prerelease an prerelease version return alpha, beta or rc.
+        // example: semver.prerelease(0.6.0-alpha.12345.0) return ["alpha", "12345", "0"]
+        if (semver_1.default.prerelease(ver1)[0] != semver_1.default.prerelease(ver2)[0]) {
+            return false;
+        }
+        if (semver_1.default.satisfies(semver_1.default.coerce(ver1).version, `^${semver_1.default.coerce(ver2).version}`)) {
+            return true;
+        }
+        return false;
+    }
+}
+exports.DepsHandler = DepsHandler;
+//# sourceMappingURL=depsHandler.js.map

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

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

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

@@ -1,19 +1,21 @@
 import { LocalEnvs } from "../../../common/local/localEnvProvider";
-import { ApiConnectorConfiguration } from "./utils";
-import { ApiConnectorResult } from "./result";
+import { ApiConnectorConfiguration } from "./config";
+import { FileChange } from "./result";
 export declare class ApiDataManager {
     private apiConnector;
     updateLocalApiEnvs(localEnvs: LocalEnvs): LocalEnvs;
     addApiEnvs(config: ApiConnectorConfiguration): void;
+    addBasicEnvs(config: ApiConnectorConfiguration): void;
+    addAADEnvs(config: ApiConnectorConfiguration): void;
+    addAPIKeyEnvs(config: ApiConnectorConfiguration): void;
 }
 export declare class EnvHandler {
-    static readonly LocalEnvFileName: string;
     private readonly projectRoot;
     private readonly componentType;
     private apiDataManager;
     constructor(workspaceFolder: string, componentType: string);
     updateEnvs(config: ApiConnectorConfiguration): void;
-    saveLocalEnvFile(): Promise<ApiConnectorResult>;
+    saveLocalEnvFile(): Promise<FileChange>;
     private updateLocalApiEnvs;
 }
 //# sourceMappingURL=envHandler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"envHandler.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/envHandler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoB,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAK7D,qBAAa,cAAc;IACzB,OAAO,CAAC,YAAY,CAAqB;IAClC,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS;IAUnD,UAAU,CAAC,MAAM,EAAE,yBAAyB;CAoBpD;AACD,qBAAa,UAAU;IACrB,gBAAuB,gBAAgB,EAAE,MAAM,CAAwB;IACvE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,cAAc,CAAiB;gBAE3B,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAMnD,UAAU,CAAC,MAAM,EAAE,yBAAyB;IAItC,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAkC5D,OAAO,CAAC,kBAAkB;CAI3B"}
+{"version":3,"file":"envHandler.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/envHandler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoB,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAiB,yBAAyB,EAAmB,MAAM,UAAU,CAAC;AACrF,OAAO,EAAE,UAAU,EAAiC,MAAM,UAAU,CAAC;AAMrE,qBAAa,cAAc;IACzB,OAAO,CAAC,YAAY,CAAqB;IAClC,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS;IAmBnD,UAAU,CAAC,MAAM,EAAE,yBAAyB;IAgB5C,YAAY,CAAC,MAAM,EAAE,yBAAyB;IAU9C,UAAU,CAAC,MAAM,EAAE,yBAAyB;IAc5C,aAAa,CAAC,MAAM,EAAE,yBAAyB;CAMvD;AACD,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,cAAc,CAAiB;gBAE3B,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAMnD,UAAU,CAAC,MAAM,EAAE,yBAAyB;IAItC,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;IAkCpD,OAAO,CAAC,kBAAkB;CAI3B"}

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

@@ -10,15 +10,23 @@ const localEnvProvider_1 = require("../../../common/local/localEnvProvider");
 const result_1 = require("./result");
 const constants_1 = require("./constants");
 const errors_1 = require("./errors");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 class ApiDataManager {
     constructor() {
         this.apiConnector = {};
     }
     updateLocalApiEnvs(localEnvs) {
-        let customEnvs = localEnvs.customizedLocalEnvs;
+        const customEnvs = localEnvs.customizedLocalEnvs;
         for (const item in this.apiConnector) {
             const apis = this.apiConnector[item];
-            customEnvs = Object.assign(Object.assign({}, customEnvs), apis);
+            for (const [key, value] of Array.from(apis)) {
+                if (customEnvs[key]) {
+                    throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.envVarExistError.name, errors_1.ErrorMessage.envVarExistError.message(key));
+                }
+                else {
+                    customEnvs[key] = value;
+                }
+            }
         }
         localEnvs.customizedLocalEnvs = customEnvs;
         return localEnvs;
@@ -26,22 +34,47 @@ class ApiDataManager {
     addApiEnvs(config) {
         const apiName = config.APIName.toUpperCase();
         if (!this.apiConnector[apiName]) {
-            this.apiConnector[apiName] = {};
+            this.apiConnector[apiName] = new Map();
+        }
+        const endPoint = constants_1.Constants.envPrefix + apiName + "_ENDPOINT";
+        this.apiConnector[apiName].set(endPoint, config.EndPoint);
+        if (config.AuthConfig.AuthType === constants_1.AuthType.BASIC) {
+            this.addBasicEnvs(config);
         }
-        const endPoint = "API_" + apiName + "_ENDPOINT";
-        const authName = "API_" + apiName + "_AUTHENTICATION_TYPE";
-        const userName = "API_" + apiName + "_USERNAME";
-        const passWd = "API_" + apiName + "_PASSWORD";
-        if (config.ApiUserName) {
-            this.apiConnector[apiName][userName] = config.ApiUserName;
+        else if (config.AuthConfig.AuthType === constants_1.AuthType.AAD) {
+            this.addAADEnvs(config);
         }
-        if (config.ApiAuthType) {
-            this.apiConnector[apiName][authName] = config.ApiAuthType;
+        else if (config.AuthConfig.AuthType === constants_1.AuthType.APIKEY) {
+            this.addAPIKeyEnvs(config);
         }
-        if (config.EndPoint) {
-            this.apiConnector[apiName][endPoint] = config.EndPoint;
+    }
+    addBasicEnvs(config) {
+        const apiName = config.APIName.toUpperCase();
+        const apiConfig = this.apiConnector[apiName];
+        const userName = constants_1.Constants.envPrefix + apiName + "_USERNAME";
+        const passWd = constants_1.Constants.envPrefix + apiName + "_PASSWORD";
+        const authConfig = config.AuthConfig;
+        apiConfig.set(userName, authConfig.UserName);
+        apiConfig.set(passWd, "");
+    }
+    addAADEnvs(config) {
+        const apiName = config.APIName.toUpperCase();
+        const apiConfig = this.apiConnector[apiName];
+        const authConfig = config.AuthConfig;
+        if (!authConfig.ReuseTeamsApp) {
+            const tenantId = constants_1.Constants.envPrefix + apiName + "_TENANT_ID";
+            const clientId = constants_1.Constants.envPrefix + apiName + "_CLIENT_ID";
+            const clientSecret = constants_1.Constants.envPrefix + apiName + "_CLIENT_SECRET";
+            apiConfig.set(tenantId, authConfig.TenantId);
+            apiConfig.set(clientId, authConfig.ClientId);
+            apiConfig.set(clientSecret, "");
         }
-        this.apiConnector[apiName][passWd] = "";
+    }
+    addAPIKeyEnvs(config) {
+        const apiName = config.APIName.toUpperCase();
+        const apiConfig = this.apiConnector[apiName];
+        const apiKey = constants_1.Constants.envPrefix + apiName + "_API_KEY";
+        apiConfig.set(apiKey, "");
     }
 }
 exports.ApiDataManager = ApiDataManager;
@@ -55,15 +88,12 @@ class EnvHandler {
         this.apiDataManager.addApiEnvs(config);
     }
     async saveLocalEnvFile() {
-        // backup .env.teamsfx.local file with timestamp
-        const timestamp = Date.now();
-        const backupFileName = EnvHandler.LocalEnvFileName + "." + timestamp;
-        const srcFile = path.join(this.projectRoot, this.componentType, EnvHandler.LocalEnvFileName);
-        const tmpFile = path.join(this.projectRoot, this.componentType, backupFileName);
+        const srcFile = path.join(this.projectRoot, this.componentType, constants_1.Constants.envFileName);
+        let fileChangeType = result_1.FileChangeType.Update;
         if (!(await fs.pathExists(srcFile))) {
             await fs.createFile(srcFile);
+            fileChangeType = result_1.FileChangeType.Create;
         }
-        await fs.move(srcFile, tmpFile);
         // update localEnvs
         try {
             const provider = new localEnvProvider_1.LocalEnvProvider(this.projectRoot);
@@ -79,13 +109,15 @@ class EnvHandler {
             }
         }
         catch (err) {
-            await fs.move(tmpFile, srcFile);
+            if (err instanceof teamsfx_api_1.UserError) {
+                throw err;
+            }
             throw result_1.ResultFactory.SystemError(errors_1.ErrorMessage.ApiConnectorFileCreateFailError.name, errors_1.ErrorMessage.ApiConnectorFileCreateFailError.message(srcFile));
         }
-        finally {
-            await fs.remove(tmpFile);
-        }
-        return result_1.ResultFactory.Success();
+        return {
+            changeType: fileChangeType,
+            filePath: srcFile,
+        }; // return modified env file
     }
     updateLocalApiEnvs(localEnvs) {
         const res = this.apiDataManager.updateLocalApiEnvs(localEnvs);
@@ -93,5 +125,4 @@ class EnvHandler {
     }
 }
 exports.EnvHandler = EnvHandler;
-EnvHandler.LocalEnvFileName = ".env.teamsfx.local";
 //# sourceMappingURL=envHandler.js.map

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

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