@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.266fa3b9f.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/constants.d.ts +2 -1
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +2 -1
- package/build/common/constants.js.map +1 -1
- package/build/common/featureFlags.d.ts +3 -0
- package/build/common/featureFlags.d.ts.map +1 -0
- package/build/common/featureFlags.js +24 -0
- package/build/common/featureFlags.js.map +1 -0
- package/build/common/local/localEnvManager.d.ts +1 -1
- package/build/common/local/localEnvManager.d.ts.map +1 -1
- package/build/common/local/localEnvManager.js +1 -1
- package/build/common/local/localEnvManager.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts +1 -1
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +6 -4
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples-config.json +29 -15
- package/build/common/samples.d.ts +1 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +3 -2
- package/build/common/samples.js.map +1 -1
- package/build/common/telemetry.d.ts +9 -0
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +9 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts +4 -3
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +31 -28
- package/build/common/tools.js.map +1 -1
- package/build/core/FxCore.d.ts +3 -2
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +69 -13
- package/build/core/FxCore.js.map +1 -1
- package/build/core/environment.d.ts +1 -1
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +6 -1
- package/build/core/environment.js.map +1 -1
- package/build/core/error.d.ts +1 -0
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +5 -1
- package/build/core/error.js.map +1 -1
- package/build/core/middleware/aadManifestMigration.d.ts +3 -0
- package/build/core/middleware/aadManifestMigration.d.ts.map +1 -0
- package/build/core/middleware/aadManifestMigration.js +207 -0
- package/build/core/middleware/aadManifestMigration.js.map +1 -0
- package/build/core/middleware/consolidateLocalRemote.d.ts +2 -0
- package/build/core/middleware/consolidateLocalRemote.d.ts.map +1 -1
- package/build/core/middleware/consolidateLocalRemote.js +80 -51
- package/build/core/middleware/consolidateLocalRemote.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +11 -55
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/question.d.ts +2 -8
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +68 -52
- package/build/core/question.js.map +1 -1
- package/build/core/telemetry.d.ts +23 -0
- package/build/core/telemetry.d.ts.map +1 -0
- package/build/core/telemetry.js +46 -0
- package/build/core/telemetry.js.map +1 -0
- package/build/plugins/resource/aad/constants.d.ts +3 -0
- package/build/plugins/resource/aad/constants.d.ts.map +1 -1
- package/build/plugins/resource/aad/constants.js +3 -0
- package/build/plugins/resource/aad/constants.js.map +1 -1
- package/build/plugins/resource/aad/errors.d.ts +2 -0
- package/build/plugins/resource/aad/errors.d.ts.map +1 -1
- package/build/plugins/resource/aad/errors.js +15 -1
- package/build/plugins/resource/aad/errors.js.map +1 -1
- package/build/plugins/resource/aad/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/index.js +4 -0
- package/build/plugins/resource/aad/index.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts +3 -0
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +105 -19
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/aad/utils/configs.d.ts +2 -1
- package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/configs.js +18 -3
- package/build/plugins/resource/aad/utils/configs.js.map +1 -1
- package/build/plugins/resource/apiconnector/checker.d.ts +6 -0
- package/build/plugins/resource/apiconnector/checker.d.ts.map +1 -0
- package/build/plugins/resource/apiconnector/checker.js +54 -0
- package/build/plugins/resource/apiconnector/checker.js.map +1 -0
- package/build/plugins/resource/apiconnector/config.d.ts +23 -0
- package/build/plugins/resource/apiconnector/config.d.ts.map +1 -0
- package/build/plugins/resource/apiconnector/config.js +5 -0
- package/build/plugins/resource/apiconnector/config.js.map +1 -0
- package/build/plugins/resource/apiconnector/constants.d.ts +24 -0
- package/build/plugins/resource/apiconnector/constants.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/constants.js +33 -7
- package/build/plugins/resource/apiconnector/constants.js.map +1 -1
- package/build/plugins/resource/apiconnector/depsHandler.d.ts +12 -0
- package/build/plugins/resource/apiconnector/depsHandler.d.ts.map +1 -0
- package/build/plugins/resource/apiconnector/depsHandler.js +66 -0
- package/build/plugins/resource/apiconnector/depsHandler.js.map +1 -0
- package/build/plugins/resource/apiconnector/envHandler.d.ts +3 -2
- package/build/plugins/resource/apiconnector/envHandler.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/envHandler.js +35 -25
- package/build/plugins/resource/apiconnector/envHandler.js.map +1 -1
- package/build/plugins/resource/apiconnector/errors.d.ts +13 -1
- package/build/plugins/resource/apiconnector/errors.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/errors.js +19 -7
- package/build/plugins/resource/apiconnector/errors.js.map +1 -1
- package/build/plugins/resource/apiconnector/index.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/index.js +1 -8
- package/build/plugins/resource/apiconnector/index.js.map +1 -1
- package/build/plugins/resource/apiconnector/plugin.d.ts +12 -2
- package/build/plugins/resource/apiconnector/plugin.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/plugin.js +240 -31
- package/build/plugins/resource/apiconnector/plugin.js.map +1 -1
- package/build/plugins/resource/apiconnector/questions.d.ts +26 -3
- package/build/plugins/resource/apiconnector/questions.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/questions.js +100 -22
- package/build/plugins/resource/apiconnector/questions.js.map +1 -1
- package/build/plugins/resource/apiconnector/result.d.ts +2 -1
- package/build/plugins/resource/apiconnector/result.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/result.js.map +1 -1
- package/build/plugins/resource/apiconnector/sampleHandler.d.ts +1 -1
- package/build/plugins/resource/apiconnector/sampleHandler.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/sampleHandler.js +7 -3
- package/build/plugins/resource/apiconnector/sampleHandler.js.map +1 -1
- package/build/plugins/resource/apiconnector/utils.d.ts +18 -20
- package/build/plugins/resource/apiconnector/utils.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/utils.js +89 -16
- package/build/plugins/resource/apiconnector/utils.js.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.js +6 -5
- package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +1 -0
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +23 -1
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/index.js +17 -10
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts +2 -2
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.js +27 -5
- package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +3 -1
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.js +1 -1
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/plugin.js +5 -0
- package/build/plugins/resource/appstudio/v3/plugin.js.map +1 -1
- package/build/plugins/resource/bot/azureOps.d.ts +0 -1
- package/build/plugins/resource/bot/azureOps.d.ts.map +1 -1
- package/build/plugins/resource/bot/azureOps.js +0 -28
- package/build/plugins/resource/bot/azureOps.js.map +1 -1
- package/build/plugins/resource/bot/clientFactory.d.ts +0 -5
- package/build/plugins/resource/bot/clientFactory.d.ts.map +1 -1
- package/build/plugins/resource/bot/clientFactory.js +1 -29
- package/build/plugins/resource/bot/clientFactory.js.map +1 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.d.ts +1 -0
- package/build/plugins/resource/bot/configs/teamsBotConfig.d.ts.map +1 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.js +15 -13
- package/build/plugins/resource/bot/configs/teamsBotConfig.js.map +1 -1
- package/build/plugins/resource/bot/constants.d.ts +2 -9
- package/build/plugins/resource/bot/constants.d.ts.map +1 -1
- package/build/plugins/resource/bot/constants.js +1 -8
- package/build/plugins/resource/bot/constants.js.map +1 -1
- package/build/plugins/resource/bot/errors.d.ts +0 -18
- package/build/plugins/resource/bot/errors.d.ts.map +1 -1
- package/build/plugins/resource/bot/errors.js +1 -38
- package/build/plugins/resource/bot/errors.js.map +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/deployMgr.d.ts +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/deployMgr.d.ts.map +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/deployMgr.js +10 -4
- package/build/plugins/resource/bot/functionsHostedBot/deployMgr.js.map +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/plugin.js +2 -6
- package/build/plugins/resource/bot/functionsHostedBot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/languageStrategy.d.ts.map +1 -1
- package/build/plugins/resource/bot/languageStrategy.js +3 -1
- package/build/plugins/resource/bot/languageStrategy.js.map +1 -1
- package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/plugin.js +4 -1
- package/build/plugins/resource/bot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/question.d.ts +1 -0
- package/build/plugins/resource/bot/question.d.ts.map +1 -1
- package/build/plugins/resource/bot/question.js +2 -0
- package/build/plugins/resource/bot/question.js.map +1 -1
- package/build/plugins/resource/frontend/constants.d.ts +4 -0
- package/build/plugins/resource/frontend/constants.d.ts.map +1 -1
- package/build/plugins/resource/frontend/constants.js +6 -2
- package/build/plugins/resource/frontend/constants.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/env.js +2 -2
- package/build/plugins/resource/frontend/env.js.map +1 -1
- package/build/plugins/resource/frontend/ops/deploy.d.ts +3 -5
- package/build/plugins/resource/frontend/ops/deploy.d.ts.map +1 -1
- package/build/plugins/resource/frontend/ops/deploy.js +41 -7
- package/build/plugins/resource/frontend/ops/deploy.js.map +1 -1
- package/build/plugins/resource/frontend/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/plugin.js +5 -6
- package/build/plugins/resource/frontend/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.d.ts +1 -1
- package/build/plugins/resource/frontend/resources/errors.d.ts.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.js +4 -4
- package/build/plugins/resource/frontend/resources/errors.js.map +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js.map +1 -1
- package/build/plugins/resource/frontend/utils/progress-helper.d.ts +2 -2
- package/build/plugins/resource/frontend/utils/progress-helper.d.ts.map +1 -1
- package/build/plugins/resource/frontend/utils/progress-helper.js +4 -4
- package/build/plugins/resource/frontend/utils/progress-helper.js.map +1 -1
- package/build/plugins/resource/frontend/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v3/index.js +10 -13
- package/build/plugins/resource/frontend/v3/index.js.map +1 -1
- package/build/plugins/resource/sql/errors.d.ts.map +1 -1
- package/build/plugins/resource/sql/errors.js +29 -29
- package/build/plugins/resource/sql/errors.js.map +1 -1
- package/build/plugins/resource/sql/sqlClient.d.ts.map +1 -1
- package/build/plugins/resource/sql/sqlClient.js +2 -8
- package/build/plugins/resource/sql/sqlClient.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +15 -9
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +17 -2
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +20 -1
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launchNext.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launchNext.js +0 -26
- package/build/plugins/solution/fx-solution/debug/util/launchNext.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.d.ts +5 -3
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +62 -34
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.js +14 -5
- package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts +2 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js +146 -95
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +85 -57
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.js +21 -8
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +9 -1
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/package.json +5 -4
- package/resource/package.nls.json +133 -64
- package/resource/unify-config-change-logs.md +19 -0
- package/templates/core/README.md +46 -0
- package/templates/fallback/blazor-base.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.default.zip +0 -0
- package/templates/fallback/bot.js.command-and-response.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/{bot-msgext.js.default.zip → bot.js.m365.zip} +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/{bot-msgext.ts.default.zip → bot.ts.m365.zip} +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.notification.zip +0 -0
- package/templates/fallback/function-base.js.default.zip +0 -0
- package/templates/fallback/function-base.ts.default.zip +0 -0
- package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/fallback/tab.csharp.default.zip +0 -0
- package/templates/fallback/tab.js.default.zip +0 -0
- package/templates/fallback/tab.js.m365.zip +0 -0
- package/templates/fallback/tab.js.non-sso.zip +0 -0
- package/templates/fallback/tab.ts.default.zip +0 -0
- package/templates/fallback/tab.ts.m365.zip +0 -0
- package/templates/fallback/tab.ts.non-sso.zip +0 -0
- package/templates/plugins/resource/aad/auth/bot/README.md +63 -0
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +65 -0
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-start.html +177 -0
- package/templates/plugins/resource/aad/auth/bot/js/sso/showUserInfo.js +19 -0
- package/templates/plugins/resource/aad/auth/bot/js/sso/ssoDialog.js +173 -0
- package/templates/plugins/resource/aad/auth/bot/js/sso/teamsSsoBot.js +55 -0
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +65 -0
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-start.html +177 -0
- package/templates/plugins/resource/aad/auth/bot/ts/sso/showUserInfo.ts +24 -0
- package/templates/plugins/resource/aad/auth/bot/ts/sso/ssoDialog.ts +182 -0
- package/templates/plugins/resource/aad/auth/bot/ts/sso/teamsSsoBot.ts +69 -0
- package/templates/plugins/resource/aad/auth/tab/README.md +49 -0
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +58 -0
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +57 -0
- package/templates/plugins/resource/aad/auth/tab/js/sso/GetUserProfile.jsx +34 -0
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +58 -0
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +57 -0
- package/templates/plugins/resource/aad/auth/tab/ts/sso/GetUserProfile.tsx +34 -0
- package/templates/plugins/resource/aad/manifest/aad.template.json +1 -14
- package/templates/plugins/resource/apiconnector/package.json +6 -0
- package/templates/plugins/resource/apiconnector/sample/{ts/api-connector.template → comment.template} +13 -14
- package/templates/plugins/resource/apiconnector/sample/js/aad.template +26 -0
- package/templates/plugins/resource/apiconnector/sample/js/apiKey.template +19 -0
- package/templates/plugins/resource/apiconnector/sample/js/basic.template +14 -0
- package/templates/plugins/resource/apiconnector/sample/js/cert.template +15 -0
- package/templates/plugins/resource/apiconnector/sample/js/custom.template +39 -0
- package/templates/plugins/resource/apiconnector/sample/ts/aad.template +31 -0
- package/templates/plugins/resource/apiconnector/sample/ts/apiKey.template +16 -0
- package/templates/plugins/resource/apiconnector/sample/ts/basic.template +14 -0
- package/templates/plugins/resource/apiconnector/sample/ts/cert.template +17 -0
- package/templates/plugins/resource/apiconnector/sample/ts/custom.template +42 -0
- package/templates/plugins/resource/bot/bicep/botProvision.template.bicep +9 -0
- package/templates/plugins/resource/bot/bicep/funcHostedBotProvision.template.bicep +2 -0
- package/templates/plugins/resource/function/bicep/functionProvision.template.bicep +2 -0
- package/templates/plugins/resource/simpleauth/bicep/simpleAuthProvision.template.bicep +4 -0
- package/templates/plugins/resource/webapp/bicep/webappProvision.template.bicep +2 -0
- package/templates/core/README-auto-generated.md +0 -31
- package/templates/fallback/bot-msgext.csharp.default.zip +0 -0
- package/templates/fallback/msgext.js.default.zip +0 -0
- package/templates/fallback/msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/apiconnector/sample/js/api-connector.template +0 -30
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { AuthType, KeyLocation } from "./constants";
|
|
2
|
+
export interface ApiConnectorConfiguration extends Record<any, any> {
|
|
3
|
+
ComponentPath: string[];
|
|
4
|
+
APIName: string;
|
|
5
|
+
EndPoint: string;
|
|
6
|
+
AuthConfig: AuthConfig;
|
|
7
|
+
}
|
|
8
|
+
export interface AuthConfig {
|
|
9
|
+
AuthType: AuthType;
|
|
10
|
+
}
|
|
11
|
+
export interface BasicAuthConfig extends AuthConfig {
|
|
12
|
+
UserName: string;
|
|
13
|
+
}
|
|
14
|
+
export interface AADAuthConfig extends AuthConfig {
|
|
15
|
+
ReuseTeamsApp: boolean;
|
|
16
|
+
TenantId?: string;
|
|
17
|
+
ClientId?: string;
|
|
18
|
+
}
|
|
19
|
+
export interface APIKeyAuthConfig extends AuthConfig {
|
|
20
|
+
Name: string;
|
|
21
|
+
Location: KeyLocation;
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/config.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC"}
|
|
@@ -2,6 +2,17 @@ export declare enum ComponentType {
|
|
|
2
2
|
API = "api",
|
|
3
3
|
BOT = "bot"
|
|
4
4
|
}
|
|
5
|
+
export declare enum AuthType {
|
|
6
|
+
BASIC = "basic",
|
|
7
|
+
APIKEY = "apiKey",
|
|
8
|
+
AAD = "aad",
|
|
9
|
+
CERT = "cert",
|
|
10
|
+
CUSTOM = "custom"
|
|
11
|
+
}
|
|
12
|
+
export declare enum KeyLocation {
|
|
13
|
+
Header = "request header",
|
|
14
|
+
QueryParams = "query parameter"
|
|
15
|
+
}
|
|
5
16
|
export declare enum LanguageType {
|
|
6
17
|
JS = "javascript",
|
|
7
18
|
TS = "typescript"
|
|
@@ -13,6 +24,14 @@ export declare enum FileType {
|
|
|
13
24
|
export declare class Constants {
|
|
14
25
|
static readonly PLUGIN_NAME = "APIConnector";
|
|
15
26
|
static readonly pluginNameShort = "api-connector";
|
|
27
|
+
static readonly commentTemplate = "comment.template";
|
|
28
|
+
static readonly templateEx = ".template";
|
|
29
|
+
static readonly envPrefix = "TEAMSFX_API_";
|
|
30
|
+
static readonly envFileName = ".env.teamsfx.local";
|
|
31
|
+
static readonly pkgJsonFile = "package.json";
|
|
32
|
+
static readonly pkgLockFile = "package-lock.json";
|
|
33
|
+
static readonly sdkName = "@microsoft/teamsfx";
|
|
34
|
+
static readonly sdkJsName = "@microsft/teams-js";
|
|
16
35
|
static readonly questionKey: {
|
|
17
36
|
componentsSelect: string;
|
|
18
37
|
endpoint: string;
|
|
@@ -20,6 +39,11 @@ export declare class Constants {
|
|
|
20
39
|
apiType: string;
|
|
21
40
|
apiUserName: string;
|
|
22
41
|
apiPassword: string;
|
|
42
|
+
apiAppType: string;
|
|
43
|
+
apiAppTenentId: string;
|
|
44
|
+
apiAppId: string;
|
|
45
|
+
apiAPIKeyLocation: string;
|
|
46
|
+
apiAPIKeyName: string;
|
|
23
47
|
};
|
|
24
48
|
}
|
|
25
49
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +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;
|
|
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,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,eAAe,sBAAsB;IAC5D,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;;;;;;;;;;;;MAYhC;CACH"}
|
|
@@ -2,12 +2,25 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.Constants = exports.FileType = exports.LanguageType = exports.ComponentType = void 0;
|
|
5
|
+
exports.Constants = exports.FileType = exports.LanguageType = exports.KeyLocation = exports.AuthType = exports.ComponentType = void 0;
|
|
6
6
|
var ComponentType;
|
|
7
7
|
(function (ComponentType) {
|
|
8
8
|
ComponentType["API"] = "api";
|
|
9
9
|
ComponentType["BOT"] = "bot";
|
|
10
10
|
})(ComponentType = exports.ComponentType || (exports.ComponentType = {}));
|
|
11
|
+
var AuthType;
|
|
12
|
+
(function (AuthType) {
|
|
13
|
+
AuthType["BASIC"] = "basic";
|
|
14
|
+
AuthType["APIKEY"] = "apiKey";
|
|
15
|
+
AuthType["AAD"] = "aad";
|
|
16
|
+
AuthType["CERT"] = "cert";
|
|
17
|
+
AuthType["CUSTOM"] = "custom";
|
|
18
|
+
})(AuthType = exports.AuthType || (exports.AuthType = {}));
|
|
19
|
+
var KeyLocation;
|
|
20
|
+
(function (KeyLocation) {
|
|
21
|
+
KeyLocation["Header"] = "request header";
|
|
22
|
+
KeyLocation["QueryParams"] = "query parameter";
|
|
23
|
+
})(KeyLocation = exports.KeyLocation || (exports.KeyLocation = {}));
|
|
11
24
|
var LanguageType;
|
|
12
25
|
(function (LanguageType) {
|
|
13
26
|
LanguageType["JS"] = "javascript";
|
|
@@ -23,12 +36,25 @@ class Constants {
|
|
|
23
36
|
exports.Constants = Constants;
|
|
24
37
|
Constants.PLUGIN_NAME = "APIConnector";
|
|
25
38
|
Constants.pluginNameShort = "api-connector";
|
|
39
|
+
Constants.commentTemplate = "comment.template";
|
|
40
|
+
Constants.templateEx = ".template";
|
|
41
|
+
Constants.envPrefix = "TEAMSFX_API_";
|
|
42
|
+
Constants.envFileName = ".env.teamsfx.local";
|
|
43
|
+
Constants.pkgJsonFile = "package.json";
|
|
44
|
+
Constants.pkgLockFile = "package-lock.json";
|
|
45
|
+
Constants.sdkName = "@microsoft/teamsfx";
|
|
46
|
+
Constants.sdkJsName = "@microsft/teams-js";
|
|
26
47
|
Constants.questionKey = {
|
|
27
|
-
componentsSelect: "
|
|
28
|
-
endpoint: "
|
|
29
|
-
apiName: "
|
|
30
|
-
apiType: "
|
|
31
|
-
apiUserName: "
|
|
32
|
-
apiPassword: "
|
|
48
|
+
componentsSelect: "component",
|
|
49
|
+
endpoint: "endpoint",
|
|
50
|
+
apiName: "name",
|
|
51
|
+
apiType: "auth-type",
|
|
52
|
+
apiUserName: "user-name",
|
|
53
|
+
apiPassword: "password",
|
|
54
|
+
apiAppType: "app-type",
|
|
55
|
+
apiAppTenentId: "app-tenant-id",
|
|
56
|
+
apiAppId: "app-id",
|
|
57
|
+
apiAPIKeyLocation: "key-location",
|
|
58
|
+
apiAPIKeyName: "key-name",
|
|
33
59
|
};
|
|
34
60
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +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,
|
|
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,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,yBAAe,GAAG,kBAAkB,CAAC;AACrC,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,MAAM;IACf,OAAO,EAAE,WAAW;IACpB,WAAW,EAAE,WAAW;IACxB,WAAW,EAAE,UAAU;IACvB,UAAU,EAAE,UAAU;IACtB,cAAc,EAAE,eAAe;IAC/B,QAAQ,EAAE,QAAQ;IAClB,iBAAiB,EAAE,cAAc;IACjC,aAAa,EAAE,UAAU;CAC1B,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Json } from "@microsoft/teamsfx-api";
|
|
2
|
+
import { ApiConnectorResult } from "./result";
|
|
3
|
+
export declare class DepsHandler {
|
|
4
|
+
private readonly projectRoot;
|
|
5
|
+
private readonly componentType;
|
|
6
|
+
constructor(workspaceFolder: string, componentType: string);
|
|
7
|
+
addPkgDeps(): Promise<ApiConnectorResult>;
|
|
8
|
+
getDepsConfig(): Promise<Json>;
|
|
9
|
+
updateLocalPkgDepsVersion(pkgConfig: Json): Promise<ApiConnectorResult>;
|
|
10
|
+
private sdkVersionCheck;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=depsHandler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG7D,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,kBAAkB,CAAC;IAKzC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B,yBAAyB,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAsBpF,OAAO,CAAC,eAAe;CAuBxB"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
// Copyright (c) Microsoft Corporation.
|
|
2
|
+
// Licensed under the MIT license.
|
|
3
|
+
"use strict";
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.DepsHandler = void 0;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
7
|
+
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
8
|
+
const path = tslib_1.__importStar(require("path"));
|
|
9
|
+
const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
10
|
+
const constants_1 = require("./constants");
|
|
11
|
+
const result_1 = require("./result");
|
|
12
|
+
const errors_1 = require("./errors");
|
|
13
|
+
const folder_1 = require("../../../folder");
|
|
14
|
+
class DepsHandler {
|
|
15
|
+
constructor(workspaceFolder, componentType) {
|
|
16
|
+
this.projectRoot = workspaceFolder;
|
|
17
|
+
this.componentType = componentType;
|
|
18
|
+
}
|
|
19
|
+
async addPkgDeps() {
|
|
20
|
+
const depsConfig = await this.getDepsConfig();
|
|
21
|
+
return await this.updateLocalPkgDepsVersion(depsConfig);
|
|
22
|
+
}
|
|
23
|
+
async getDepsConfig() {
|
|
24
|
+
const configPath = path.join(folder_1.getTemplatesFolder(), "plugins", "resource", "apiconnector");
|
|
25
|
+
const sdkConfigPath = path.join(configPath, constants_1.Constants.pkgJsonFile);
|
|
26
|
+
const sdkContent = await fs.readJson(sdkConfigPath);
|
|
27
|
+
return sdkContent.dependencies;
|
|
28
|
+
}
|
|
29
|
+
async updateLocalPkgDepsVersion(pkgConfig) {
|
|
30
|
+
const localPkgPath = path.join(this.projectRoot, this.componentType, constants_1.Constants.pkgJsonFile);
|
|
31
|
+
if (!(await fs.pathExists(localPkgPath))) {
|
|
32
|
+
throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.localPkgFileNotExistError.name, errors_1.ErrorMessage.localPkgFileNotExistError.message(this.componentType));
|
|
33
|
+
}
|
|
34
|
+
const pkgContent = await fs.readJson(localPkgPath);
|
|
35
|
+
let needUpdate = false;
|
|
36
|
+
for (const pkgItem in pkgConfig) {
|
|
37
|
+
if (this.sdkVersionCheck(pkgContent.dependencies, pkgItem, pkgConfig[pkgItem])) {
|
|
38
|
+
pkgContent.dependencies[pkgItem] = pkgConfig[pkgItem];
|
|
39
|
+
needUpdate = true;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (needUpdate) {
|
|
43
|
+
await fs.writeFile(localPkgPath, JSON.stringify(pkgContent, null, 4));
|
|
44
|
+
}
|
|
45
|
+
return result_1.ResultFactory.Success();
|
|
46
|
+
}
|
|
47
|
+
sdkVersionCheck(deps, sdkName, sdkVersion) {
|
|
48
|
+
// sdk not in dependencies.
|
|
49
|
+
if (!deps[sdkName]) {
|
|
50
|
+
return true;
|
|
51
|
+
}
|
|
52
|
+
// local sdk version intersect with sdk version in config.
|
|
53
|
+
else if (semver_1.default.intersects(deps[sdkName], sdkVersion)) {
|
|
54
|
+
return false;
|
|
55
|
+
}
|
|
56
|
+
// local sdk version lager than sdk version in config.
|
|
57
|
+
else if (semver_1.default.gt(semver_1.default.minVersion(deps[sdkName]), semver_1.default.minVersion(sdkVersion))) {
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.sdkVersionImcompatibleError.name, errors_1.ErrorMessage.sdkVersionImcompatibleError.message(this.componentType, deps[sdkName], sdkVersion));
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
exports.DepsHandler = DepsHandler;
|
|
66
|
+
//# sourceMappingURL=depsHandler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"depsHandler.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/depsHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { LocalEnvs } from "../../../common/local/localEnvProvider";
|
|
2
|
-
import { ApiConnectorConfiguration } from "./
|
|
2
|
+
import { ApiConnectorConfiguration } from "./config";
|
|
3
3
|
import { ApiConnectorResult } from "./result";
|
|
4
4
|
export declare class ApiDataManager {
|
|
5
5
|
private apiConnector;
|
|
6
6
|
updateLocalApiEnvs(localEnvs: LocalEnvs): LocalEnvs;
|
|
7
7
|
addApiEnvs(config: ApiConnectorConfiguration): void;
|
|
8
|
+
addBasicEnvs(config: ApiConnectorConfiguration): void;
|
|
9
|
+
addAADEnvs(config: ApiConnectorConfiguration): void;
|
|
8
10
|
}
|
|
9
11
|
export declare class EnvHandler {
|
|
10
|
-
static readonly LocalEnvFileName: string;
|
|
11
12
|
private readonly projectRoot;
|
|
12
13
|
private readonly componentType;
|
|
13
14
|
private apiDataManager;
|
|
@@ -1 +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,
|
|
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,EAAiB,yBAAyB,EAAmB,MAAM,UAAU,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAK7D,qBAAa,cAAc;IACzB,OAAO,CAAC,YAAY,CAAqB;IAClC,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS;IAYnD,UAAU,CAAC,MAAM,EAAE,yBAAyB;IAgB5C,YAAY,CAAC,MAAM,EAAE,yBAAyB;IAU9C,UAAU,CAAC,MAAM,EAAE,yBAAyB;CAapD;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,kBAAkB,CAAC;IA0B5D,OAAO,CAAC,kBAAkB;CAI3B"}
|
|
@@ -15,10 +15,12 @@ class ApiDataManager {
|
|
|
15
15
|
this.apiConnector = {};
|
|
16
16
|
}
|
|
17
17
|
updateLocalApiEnvs(localEnvs) {
|
|
18
|
-
|
|
18
|
+
const customEnvs = localEnvs.customizedLocalEnvs;
|
|
19
19
|
for (const item in this.apiConnector) {
|
|
20
20
|
const apis = this.apiConnector[item];
|
|
21
|
-
|
|
21
|
+
for (const [key, value] of Array.from(apis)) {
|
|
22
|
+
customEnvs[key] = value;
|
|
23
|
+
}
|
|
22
24
|
}
|
|
23
25
|
localEnvs.customizedLocalEnvs = customEnvs;
|
|
24
26
|
return localEnvs;
|
|
@@ -26,22 +28,40 @@ class ApiDataManager {
|
|
|
26
28
|
addApiEnvs(config) {
|
|
27
29
|
const apiName = config.APIName.toUpperCase();
|
|
28
30
|
if (!this.apiConnector[apiName]) {
|
|
29
|
-
this.apiConnector[apiName] =
|
|
31
|
+
this.apiConnector[apiName] = new Map();
|
|
30
32
|
}
|
|
31
|
-
const endPoint =
|
|
32
|
-
const authName =
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
if (config.
|
|
36
|
-
this.
|
|
33
|
+
const endPoint = constants_1.Constants.envPrefix + apiName + "_ENDPOINT";
|
|
34
|
+
const authName = constants_1.Constants.envPrefix + apiName + "_AUTHENTICATION_TYPE";
|
|
35
|
+
this.apiConnector[apiName].set(authName, config.AuthConfig.AuthType);
|
|
36
|
+
this.apiConnector[apiName].set(endPoint, config.EndPoint);
|
|
37
|
+
if (config.AuthConfig.AuthType === constants_1.AuthType.BASIC) {
|
|
38
|
+
this.addBasicEnvs(config);
|
|
37
39
|
}
|
|
38
|
-
if (config.
|
|
39
|
-
this.
|
|
40
|
+
else if (config.AuthConfig.AuthType === constants_1.AuthType.AAD) {
|
|
41
|
+
this.addAADEnvs(config);
|
|
40
42
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
+
}
|
|
44
|
+
addBasicEnvs(config) {
|
|
45
|
+
const apiName = config.APIName.toUpperCase();
|
|
46
|
+
const apiConfig = this.apiConnector[apiName];
|
|
47
|
+
const userName = constants_1.Constants.envPrefix + apiName + "_USERNAME";
|
|
48
|
+
const passWd = constants_1.Constants.envPrefix + apiName + "_PASSWORD";
|
|
49
|
+
const authConfig = config.AuthConfig;
|
|
50
|
+
apiConfig.set(userName, authConfig.UserName);
|
|
51
|
+
apiConfig.set(passWd, "");
|
|
52
|
+
}
|
|
53
|
+
addAADEnvs(config) {
|
|
54
|
+
const apiName = config.APIName.toUpperCase();
|
|
55
|
+
const apiConfig = this.apiConnector[apiName];
|
|
56
|
+
const authConfig = config.AuthConfig;
|
|
57
|
+
if (!authConfig.ReuseTeamsApp) {
|
|
58
|
+
const tenantId = constants_1.Constants.envPrefix + apiName + "_TENANT_ID";
|
|
59
|
+
const clientId = constants_1.Constants.envPrefix + apiName + "_CLIENT_ID";
|
|
60
|
+
const clientSecret = constants_1.Constants.envPrefix + apiName + "_CLIENT_SECRET";
|
|
61
|
+
apiConfig.set(tenantId, authConfig.TenantId);
|
|
62
|
+
apiConfig.set(clientId, authConfig.ClientId);
|
|
63
|
+
apiConfig.set(clientSecret, "");
|
|
43
64
|
}
|
|
44
|
-
this.apiConnector[apiName][passWd] = "";
|
|
45
65
|
}
|
|
46
66
|
}
|
|
47
67
|
exports.ApiDataManager = ApiDataManager;
|
|
@@ -55,15 +75,10 @@ class EnvHandler {
|
|
|
55
75
|
this.apiDataManager.addApiEnvs(config);
|
|
56
76
|
}
|
|
57
77
|
async saveLocalEnvFile() {
|
|
58
|
-
|
|
59
|
-
const timestamp = Date.now();
|
|
60
|
-
const backupFileName = EnvHandler.LocalEnvFileName + "." + timestamp;
|
|
61
|
-
const srcFile = path.join(this.projectRoot, this.componentType, EnvHandler.LocalEnvFileName);
|
|
62
|
-
const tmpFile = path.join(this.projectRoot, this.componentType, backupFileName);
|
|
78
|
+
const srcFile = path.join(this.projectRoot, this.componentType, constants_1.Constants.envFileName);
|
|
63
79
|
if (!(await fs.pathExists(srcFile))) {
|
|
64
80
|
await fs.createFile(srcFile);
|
|
65
81
|
}
|
|
66
|
-
await fs.move(srcFile, tmpFile);
|
|
67
82
|
// update localEnvs
|
|
68
83
|
try {
|
|
69
84
|
const provider = new localEnvProvider_1.LocalEnvProvider(this.projectRoot);
|
|
@@ -79,12 +94,8 @@ class EnvHandler {
|
|
|
79
94
|
}
|
|
80
95
|
}
|
|
81
96
|
catch (err) {
|
|
82
|
-
await fs.move(tmpFile, srcFile);
|
|
83
97
|
throw result_1.ResultFactory.SystemError(errors_1.ErrorMessage.ApiConnectorFileCreateFailError.name, errors_1.ErrorMessage.ApiConnectorFileCreateFailError.message(srcFile));
|
|
84
98
|
}
|
|
85
|
-
finally {
|
|
86
|
-
await fs.remove(tmpFile);
|
|
87
|
-
}
|
|
88
99
|
return result_1.ResultFactory.Success();
|
|
89
100
|
}
|
|
90
101
|
updateLocalApiEnvs(localEnvs) {
|
|
@@ -93,5 +104,4 @@ class EnvHandler {
|
|
|
93
104
|
}
|
|
94
105
|
}
|
|
95
106
|
exports.EnvHandler = EnvHandler;
|
|
96
|
-
EnvHandler.LocalEnvFileName = ".env.teamsfx.local";
|
|
97
107
|
//# sourceMappingURL=envHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envHandler.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/envHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,qDAA+B;AAC/B,mDAA6B;AAC7B,6EAAqF;AAErF,qCAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"envHandler.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/envHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export declare class ErrorMessage {
|
|
|
5
5
|
};
|
|
6
6
|
static readonly ApiConnectorInputError: {
|
|
7
7
|
name: string;
|
|
8
|
-
message: () => string;
|
|
8
|
+
message: (key: string) => string;
|
|
9
9
|
};
|
|
10
10
|
static readonly ApiConnectorPathError: {
|
|
11
11
|
name: string;
|
|
@@ -31,5 +31,17 @@ export declare class ErrorMessage {
|
|
|
31
31
|
name: string;
|
|
32
32
|
message: () => string;
|
|
33
33
|
};
|
|
34
|
+
static readonly generateApiConFilesError: {
|
|
35
|
+
name: string;
|
|
36
|
+
message: (reason: string) => string;
|
|
37
|
+
};
|
|
38
|
+
static readonly sdkVersionImcompatibleError: {
|
|
39
|
+
name: string;
|
|
40
|
+
message: (component: string, localVersion: string, targetVersion: string) => string;
|
|
41
|
+
};
|
|
42
|
+
static readonly localPkgFileNotExistError: {
|
|
43
|
+
name: string;
|
|
44
|
+
message: (component: string) => string;
|
|
45
|
+
};
|
|
34
46
|
}
|
|
35
47
|
//# sourceMappingURL=errors.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"AAIA,qBAAa,YAAY;IACvB,gBAAuB,mBAAmB;;;MAIxC;IACF,gBAAuB,sBAAsB;;uBAE5B,MAAM;MAErB;IAEF,gBAAuB,qBAAqB;;4BAEtB,MAAM;MAE1B;IAEF,gBAAuB,+BAA+B;;4BAEhC,MAAM;MAK1B;IAEF,gBAAuB,sBAAsB;;4BAEvB,MAAM;MAK1B;IAEF,gBAAuB,yBAAyB;;4BAE1B,MAAM,UAAU,MAAM;MAM1C;IAEF,gBAAuB,yBAAyB;;;MAI9C;IAEF,gBAAuB,yBAAyB;;;MAI9C;IAEF,gBAAuB,wBAAwB;;0BAE3B,MAAM;MAKxB;IAEF,gBAAuB,2BAA2B;;6BAE3B,MAAM,gBAAgB,MAAM,iBAAiB,MAAM;MAOxE;IAEF,gBAAuB,yBAAyB;;6BAEzB,MAAM;MAK3B;CACH"}
|
|
@@ -9,23 +9,23 @@ class ErrorMessage {
|
|
|
9
9
|
exports.ErrorMessage = ErrorMessage;
|
|
10
10
|
ErrorMessage.InvalidProjectError = {
|
|
11
11
|
name: "InvalidProjectError",
|
|
12
|
-
message: () => localizeUtils_1.getLocalizedString(`
|
|
12
|
+
message: () => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.InvalidProjectError.name}`),
|
|
13
13
|
};
|
|
14
14
|
ErrorMessage.ApiConnectorInputError = {
|
|
15
15
|
name: "ApiConnectorInputError",
|
|
16
|
-
message: () => localizeUtils_1.getLocalizedString(`
|
|
16
|
+
message: (key) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.ApiConnectorInputError.name}`, key),
|
|
17
17
|
};
|
|
18
18
|
ErrorMessage.ApiConnectorPathError = {
|
|
19
19
|
name: "ApiConnectorPathNotExistError",
|
|
20
|
-
message: (pathName) => localizeUtils_1.getLocalizedString(`
|
|
20
|
+
message: (pathName) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.ApiConnectorPathError.name}`, pathName),
|
|
21
21
|
};
|
|
22
22
|
ErrorMessage.ApiConnectorFileCreateFailError = {
|
|
23
23
|
name: "ApiConnectorCreateFileFail",
|
|
24
|
-
message: (pathName) => localizeUtils_1.getLocalizedString(`
|
|
24
|
+
message: (pathName) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.ApiConnectorFileCreateFailError.name}`, pathName),
|
|
25
25
|
};
|
|
26
26
|
ErrorMessage.ApiConnectorRouteError = {
|
|
27
27
|
name: "ApiConnectorFunctionRouteError",
|
|
28
|
-
message: (funcName) => localizeUtils_1.getLocalizedString(`
|
|
28
|
+
message: (funcName) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.ApiConnectorRouteError.name}`, funcName),
|
|
29
29
|
};
|
|
30
30
|
ErrorMessage.SampleCodeCreateFailError = {
|
|
31
31
|
name: "SampleCodeCreateFailError",
|
|
@@ -33,10 +33,22 @@ ErrorMessage.SampleCodeCreateFailError = {
|
|
|
33
33
|
};
|
|
34
34
|
ErrorMessage.NoValidCompoentExistError = {
|
|
35
35
|
name: "NoValidCompoentExistError",
|
|
36
|
-
message: () => localizeUtils_1.getLocalizedString(`
|
|
36
|
+
message: () => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.NoValidCompoentExistError.name}`),
|
|
37
37
|
};
|
|
38
38
|
ErrorMessage.NoActivePluginsExistError = {
|
|
39
39
|
name: "NoActivePluginsExistError",
|
|
40
|
-
message: () => localizeUtils_1.getLocalizedString(`
|
|
40
|
+
message: () => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.NoActivePluginsExistError.name}`),
|
|
41
|
+
};
|
|
42
|
+
ErrorMessage.generateApiConFilesError = {
|
|
43
|
+
name: "ScaffoldApiFilesError",
|
|
44
|
+
message: (reason) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.generateApiConFilesError.name}`, reason),
|
|
45
|
+
};
|
|
46
|
+
ErrorMessage.sdkVersionImcompatibleError = {
|
|
47
|
+
name: "SDKVersionImcompatibleError",
|
|
48
|
+
message: (component, localVersion, targetVersion) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.sdkVersionImcompatibleError.name}`, component, localVersion, targetVersion),
|
|
49
|
+
};
|
|
50
|
+
ErrorMessage.localPkgFileNotExistError = {
|
|
51
|
+
name: "pkgFileNotExistError",
|
|
52
|
+
message: (component) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.localPkgFileNotExistError.name}`, component),
|
|
41
53
|
};
|
|
42
54
|
//# sourceMappingURL=errors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AACb,iEAAmE;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AACb,iEAAmE;AACnE,MAAa,YAAY;;AAAzB,oCAsFC;AArFwB,gCAAmB,GAAG;IAC3C,IAAI,EAAE,qBAAqB;IAC3B,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAAC,sBAAsB,YAAY,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;CACpF,CAAC;AACqB,mCAAsB,GAAG;IAC9C,IAAI,EAAE,wBAAwB;IAC9B,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CACvB,kCAAkB,CAAC,sBAAsB,YAAY,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC;CAC5F,CAAC;AAEqB,kCAAqB,GAAG;IAC7C,IAAI,EAAE,+BAA+B;IACrC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAAC,sBAAsB,YAAY,CAAC,qBAAqB,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC;CAChG,CAAC;AAEqB,4CAA+B,GAAG;IACvD,IAAI,EAAE,4BAA4B;IAClC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,+BAA+B,CAAC,IAAI,EAAE,EACzE,QAAQ,CACT;CACJ,CAAC;AAEqB,mCAAsB,GAAG;IAC9C,IAAI,EAAE,gCAAgC;IACtC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAChE,QAAQ,CACT;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,CAAC,QAAgB,EAAE,MAAc,EAAE,EAAE,CAC5C,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,EACnE,QAAQ,EACR,MAAM,CACP;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAAC,sBAAsB,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC;CAC1F,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAAC,sBAAsB,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC;CAC1F,CAAC;AAEqB,qCAAwB,GAAG;IAChD,IAAI,EAAE,uBAAuB;IAC7B,OAAO,EAAE,CAAC,MAAc,EAAE,EAAE,CAC1B,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,wBAAwB,CAAC,IAAI,EAAE,EAClE,MAAM,CACP;CACJ,CAAC;AAEqB,wCAA2B,GAAG;IACnD,IAAI,EAAE,6BAA6B;IACnC,OAAO,EAAE,CAAC,SAAiB,EAAE,YAAoB,EAAE,aAAqB,EAAE,EAAE,CAC1E,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,2BAA2B,CAAC,IAAI,EAAE,EACrE,SAAS,EACT,YAAY,EACZ,aAAa,CACd;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,sBAAsB;IAC5B,OAAO,EAAE,CAAC,SAAiB,EAAE,EAAE,CAC7B,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,EACnE,SAAS,CACV;CACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,MAAM,EACN,IAAI,EACJ,eAAe,EAEf,EAAE,EAEF,IAAI,EAEJ,aAAa,EAEd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAG1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAG7D,qBACa,oBAAqB,YAAW,cAAc;IACzD,IAAI,SAA+B;IACnC,WAAW,SAA6B;IACxC,gBAAgB,EAAE,gBAAgB,CAA0B;IAE5D,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAItC,uBAAuB,CAClC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,MAAM,EACN,IAAI,EACJ,eAAe,EAEf,EAAE,EAEF,IAAI,EAEJ,aAAa,EAEd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAG1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAG7D,qBACa,oBAAqB,YAAW,cAAc;IACzD,IAAI,SAA+B;IACnC,WAAW,SAA6B;IACxC,gBAAgB,EAAE,gBAAgB,CAA0B;IAE5D,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAItC,uBAAuB,CAClC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;IAIxB,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;CAU/B"}
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.ApiConnectorPluginV2 = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
7
|
const typedi_1 = require("typedi");
|
|
9
8
|
const ResourcePluginContainer_1 = require("../../solution/fx-solution/ResourcePluginContainer");
|
|
10
9
|
const plugin_1 = require("./plugin");
|
|
@@ -20,13 +19,7 @@ let ApiConnectorPluginV2 = class ApiConnectorPluginV2 {
|
|
|
20
19
|
return true;
|
|
21
20
|
}
|
|
22
21
|
async getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider) {
|
|
23
|
-
|
|
24
|
-
const activeResourcePlugins = (_a = ctx.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins;
|
|
25
|
-
if (!activeResourcePlugins) {
|
|
26
|
-
throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.NoActivePluginsExistError.name, errors_1.ErrorMessage.NoActivePluginsExistError.message());
|
|
27
|
-
}
|
|
28
|
-
const res = this.apiConnectorImpl.generateQuestion(activeResourcePlugins);
|
|
29
|
-
return teamsfx_api_1.ok(res);
|
|
22
|
+
return await this.apiConnectorImpl.generateQuestion(ctx, inputs);
|
|
30
23
|
}
|
|
31
24
|
async executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenProvider) {
|
|
32
25
|
if (func.method != "connectExistingApi") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAeb,mCAAiC;AACjC,gGAAuF;AACvF,qCAA4C;AAG5C,qCAA6D;AAC7D,qCAAwC;AAGxC,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QACE,SAAI,GAAG,2BAA2B,CAAC;QACnC,gBAAW,GAAG,yBAAyB,CAAC;QACxC,qBAAgB,GAAqB,IAAI,yBAAgB,EAAE,CAAC;IAiC9D,CAAC;IA/BC,QAAQ,CAAC,eAAgC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAClC,GAAY,EACZ,MAAc,EACd,IAAU,EACV,OAAmC,EACnC,aAA4B;QAE5B,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,GAAY,EACZ,MAAc,EACd,IAAU,EACV,aAAmB,EACnB,OAAqB,EACrB,aAA4B;QAE5B,IAAI,IAAI,CAAC,MAAM,IAAI,oBAAoB,EAAE;YACvC,MAAM,sBAAa,CAAC,WAAW,CAC7B,qBAAY,CAAC,sBAAsB,CAAC,IAAI,EACxC,qBAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CACzD,CAAC;SACH;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,sBAAa,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;CACF,CAAA;AApCY,oBAAoB;IADhC,gBAAO,CAAC,2CAAiB,CAAC,kBAAkB,CAAC;GACjC,oBAAoB,CAoChC;AApCY,oDAAoB"}
|
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
import { Inputs, QTreeNode } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { Context } from "@microsoft/teamsfx-api/build/v2";
|
|
3
|
-
import { ApiConnectorResult } from "./result";
|
|
3
|
+
import { ApiConnectorResult, QesutionResult } from "./result";
|
|
4
4
|
export declare class ApiConnectorImpl {
|
|
5
5
|
scaffold(ctx: Context, inputs: Inputs): Promise<ApiConnectorResult>;
|
|
6
|
+
private scaffoldInComponent;
|
|
7
|
+
private backupExistingFiles;
|
|
8
|
+
private removeSampleFilesWhenRestore;
|
|
9
|
+
private getAuthConfigFromInputs;
|
|
6
10
|
private getUserDataFromInputs;
|
|
7
11
|
private scaffoldEnvFileToComponent;
|
|
8
12
|
private scaffoldSampleCodeToComponent;
|
|
9
|
-
|
|
13
|
+
private addSDKDependency;
|
|
14
|
+
private getNotificationMsg;
|
|
15
|
+
generateQuestion(ctx: Context, inputs: Inputs): Promise<QesutionResult>;
|
|
16
|
+
buildAuthTypeQuestion(ctx: Context): QTreeNode;
|
|
17
|
+
buildBasicAuthQuestion(): QTreeNode;
|
|
18
|
+
buildAADAuthQuestion(ctx: Context): QTreeNode;
|
|
19
|
+
buildAPIKeyAuthQuestion(): QTreeNode;
|
|
10
20
|
}
|
|
11
21
|
//# sourceMappingURL=plugin.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,MAAM,EACN,SAAS,EAKV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAgB1D,OAAO,EAAE,kBAAkB,EAAiB,cAAc,EAAE,MAAM,UAAU,CAAC;AA8B7E,qBAAa,gBAAgB;IACd,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAuElE,mBAAmB;YAWnB,mBAAmB;YAgBnB,4BAA4B;IAW1C,OAAO,CAAC,uBAAuB;IAyD/B,OAAO,CAAC,qBAAqB;YAiBf,0BAA0B;YAW1B,6BAA6B;YAW7B,gBAAgB;IAQ9B,OAAO,CAAC,kBAAkB;IAmCb,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkD7E,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS;IAoB9C,sBAAsB,IAAI,SAAS;IAMnC,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS;IAuB7C,uBAAuB,IAAI,SAAS;CAuB5C"}
|