@microsoft/teamsfx-core 2.0.7-alpha.8120e652f.0 → 2.0.7-alpha.8d8f5a0bb.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 +5 -1
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +5 -1
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/constant/helpLink.d.ts +1 -1
- package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -1
- package/build/common/deps-checker/constant/helpLink.js +1 -1
- package/build/common/deps-checker/constant/helpLink.js.map +1 -1
- package/build/common/featureFlags.d.ts +3 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +15 -2
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +1 -2
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts +3 -2
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +44 -15
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts +3 -0
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +29 -1
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/projectTypeChecker.d.ts.map +1 -1
- package/build/common/projectTypeChecker.js +1 -2
- package/build/common/projectTypeChecker.js.map +1 -1
- package/build/common/samples.d.ts +4 -3
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +85 -41
- package/build/common/samples.js.map +1 -1
- package/build/common/telemetry.d.ts +3 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +2 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +1 -0
- package/build/common/tools.d.ts +1 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +7 -4
- package/build/common/tools.js.map +1 -1
- package/build/common/wrappedAxiosClient.d.ts +59 -0
- package/build/common/wrappedAxiosClient.d.ts.map +1 -0
- package/build/common/wrappedAxiosClient.js +247 -0
- package/build/common/wrappedAxiosClient.js.map +1 -0
- package/build/component/configManager/lifecycle.js +1 -1
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constant/commonConstant.d.ts +5 -0
- package/build/component/constant/commonConstant.d.ts.map +1 -1
- package/build/component/constant/commonConstant.js +7 -1
- package/build/component/constant/commonConstant.js.map +1 -1
- package/build/component/coordinator/index.d.ts +12 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +92 -21
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +0 -2
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +11 -11
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/update.d.ts +1 -1
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +10 -8
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts +1 -0
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +16 -2
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts +1 -2
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +29 -34
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.d.ts.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js +2 -3
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js.map +1 -1
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts +2 -1
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/constants.d.ts +2 -1
- package/build/component/driver/apiKey/utility/constants.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/constants.js +3 -2
- package/build/component/driver/apiKey/utility/constants.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts +2 -2
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +18 -18
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +9 -11
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +5 -5
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +6 -6
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +8 -8
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/m365/acquire.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +9 -10
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js +1 -2
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +0 -2
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +33 -9
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +142 -112
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.js +3 -24
- package/build/component/driver/teamsApp/clients/authSvcClient.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +0 -2
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +7 -0
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +7 -0
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +0 -2
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +3 -0
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +61 -14
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts +4 -0
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +7 -0
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationDetailsResponse.d.ts +21 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationDetailsResponse.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationDetailsResponse.js +5 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationDetailsResponse.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResponse.d.ts +17 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResponse.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResponse.js +16 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResponse.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResultsResponse.d.ts +41 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResultsResponse.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResultsResponse.js +5 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResultsResponse.js.map +1 -0
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +3 -5
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +17 -0
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +8 -0
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -0
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +63 -0
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -0
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +0 -31
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +1 -53
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +0 -1
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +0 -1
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/feature/collaboration.d.ts +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +10 -12
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +4 -2
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +50 -18
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +5 -3
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +67 -25
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +1 -1
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +4 -4
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts +5 -0
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +28 -26
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +5 -16
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +46 -87
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.d.ts +1 -0
- package/build/component/generator/officeAddin/config/projectProperties.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.js +1 -0
- package/build/component/generator/officeAddin/config/projectProperties.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts +1 -4
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.js +4 -11
- package/build/component/generator/officeAddin/config/projectsJsonData.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +13 -7
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts +2 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +21 -10
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts +9 -0
- package/build/component/generator/officeXMLAddin/generator.d.ts.map +1 -0
- package/build/component/generator/officeXMLAddin/generator.js +90 -0
- package/build/component/generator/officeXMLAddin/generator.js.map +1 -0
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts +36 -0
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts.map +1 -0
- package/build/component/generator/officeXMLAddin/projectConfig.js +127 -0
- package/build/component/generator/officeXMLAddin/projectConfig.js.map +1 -0
- package/build/component/generator/spfx/error.d.ts +1 -0
- package/build/component/generator/spfx/error.d.ts.map +1 -1
- package/build/component/generator/spfx/error.js +11 -1
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts +1 -0
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +33 -0
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +2 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +2 -0
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts +2 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.js +1 -0
- package/build/component/generator/spfx/utils/telemetryEvents.js.map +1 -1
- package/build/component/generator/utils.d.ts +2 -1
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +35 -16
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/middleware/envMW.d.ts.map +1 -1
- package/build/component/middleware/envMW.js +9 -6
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts +2 -0
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +46 -31
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/utils/envUtil.d.ts +2 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +23 -0
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/pathUtils.js +1 -1
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +21 -12
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.js +3 -3
- package/build/core/collaborator.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +6 -1
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/error/arm.d.ts.map +1 -1
- package/build/error/arm.js +0 -2
- package/build/error/arm.js.map +1 -1
- package/build/error/common.d.ts +4 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +36 -2
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +17 -6
- package/build/error/deploy.js.map +1 -1
- package/build/error/teamsApp.d.ts.map +1 -1
- package/build/error/teamsApp.js +4 -2
- package/build/error/teamsApp.js.map +1 -1
- package/build/index.d.ts +0 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -3
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +1 -0
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +2 -1
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +37 -2
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +514 -62
- package/build/question/create.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +20 -6
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +56 -11
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +2 -1
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +11 -1
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +10 -0
- package/build/question/questionNames.js.map +1 -1
- package/package.json +8 -8
- package/resource/package.nls.json +163 -80
- package/resource/yaml-schema/v1.3/yaml.schema.json +6 -43
- package/resource/yaml-schema/v1.4/yaml.schema.json +1588 -0
- package/resource/yaml-schema/yaml.schema.json +1588 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Enable SSO.txt +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts +0 -7
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +0 -1
- package/build/common/spec-parser/adaptiveCardGenerator.js +0 -168
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +0 -1
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts +0 -15
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts.map +0 -1
- package/build/common/spec-parser/adaptiveCardWrapper.js +0 -98
- package/build/common/spec-parser/adaptiveCardWrapper.js.map +0 -1
- package/build/common/spec-parser/constants.d.ts +0 -41
- package/build/common/spec-parser/constants.d.ts.map +0 -1
- package/build/common/spec-parser/constants.js +0 -95
- package/build/common/spec-parser/constants.js.map +0 -1
- package/build/common/spec-parser/index.browser.d.ts +0 -6
- package/build/common/spec-parser/index.browser.d.ts.map +0 -1
- package/build/common/spec-parser/index.browser.js +0 -16
- package/build/common/spec-parser/index.browser.js.map +0 -1
- package/build/common/spec-parser/index.d.ts +0 -5
- package/build/common/spec-parser/index.d.ts.map +0 -1
- package/build/common/spec-parser/index.js +0 -16
- package/build/common/spec-parser/index.js.map +0 -1
- package/build/common/spec-parser/interfaces.d.ts +0 -180
- package/build/common/spec-parser/interfaces.d.ts.map +0 -1
- package/build/common/spec-parser/interfaces.js +0 -51
- package/build/common/spec-parser/interfaces.js.map +0 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +0 -7
- package/build/common/spec-parser/manifestUpdater.d.ts.map +0 -1
- package/build/common/spec-parser/manifestUpdater.js +0 -98
- package/build/common/spec-parser/manifestUpdater.js.map +0 -1
- package/build/common/spec-parser/specFilter.d.ts +0 -3
- package/build/common/spec-parser/specFilter.d.ts.map +0 -1
- package/build/common/spec-parser/specFilter.js +0 -40
- package/build/common/spec-parser/specFilter.js.map +0 -1
- package/build/common/spec-parser/specParser.browser.d.ts +0 -46
- package/build/common/spec-parser/specParser.browser.d.ts.map +0 -1
- package/build/common/spec-parser/specParser.browser.js +0 -139
- package/build/common/spec-parser/specParser.browser.js.map +0 -1
- package/build/common/spec-parser/specParser.d.ts +0 -46
- package/build/common/spec-parser/specParser.d.ts.map +0 -1
- package/build/common/spec-parser/specParser.js +0 -244
- package/build/common/spec-parser/specParser.js.map +0 -1
- package/build/common/spec-parser/specParserError.d.ts +0 -6
- package/build/common/spec-parser/specParserError.d.ts.map +0 -1
- package/build/common/spec-parser/specParserError.js +0 -13
- package/build/common/spec-parser/specParserError.js.map +0 -1
- package/build/common/spec-parser/utils.d.ts +0 -43
- package/build/common/spec-parser/utils.d.ts.map +0 -1
- package/build/common/spec-parser/utils.js +0 -587
- package/build/common/spec-parser/utils.js.map +0 -1
|
@@ -8,7 +8,6 @@ const tslib_1 = require("tslib");
|
|
|
8
8
|
* @author Qianhao Dong <qidon@microsoft.com>
|
|
9
9
|
*/
|
|
10
10
|
const IBotRegistration_1 = require("./interfaces/IBotRegistration");
|
|
11
|
-
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
12
11
|
const commonConstant_1 = require("../../../constant/commonConstant");
|
|
13
12
|
const appStudioClient_1 = require("../../../driver/teamsApp/clients/appStudioClient");
|
|
14
13
|
const constants_1 = require("../../../driver/teamsApp/constants");
|
|
@@ -20,8 +19,8 @@ const retryHandler_1 = require("../retryHandler");
|
|
|
20
19
|
const strings_1 = require("../strings");
|
|
21
20
|
const globalVars_1 = require("../../../../core/globalVars");
|
|
22
21
|
const hooks_1 = require("@feathersjs/hooks");
|
|
23
|
-
const
|
|
24
|
-
function handleBotFrameworkError(e, apiName
|
|
22
|
+
const wrappedAxiosClient_1 = require("../../../../common/wrappedAxiosClient");
|
|
23
|
+
function handleBotFrameworkError(e, apiName) {
|
|
25
24
|
var _a, _b, _c, _d;
|
|
26
25
|
if (((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === commonConstant_1.HttpStatusCode.NOTFOUND) {
|
|
27
26
|
return undefined; // Stands for NotFound.
|
|
@@ -37,13 +36,13 @@ function handleBotFrameworkError(e, apiName, telemetryProperties) {
|
|
|
37
36
|
}
|
|
38
37
|
else {
|
|
39
38
|
e.teamsfxUrlName = constants_2.TeamsFxUrlNames[apiName];
|
|
40
|
-
throw appStudioClient_1.AppStudioClient.wrapException(e, apiName
|
|
39
|
+
throw appStudioClient_1.AppStudioClient.wrapException(e, apiName);
|
|
41
40
|
}
|
|
42
41
|
}
|
|
43
42
|
class AppStudioClient {
|
|
44
43
|
static newAxiosInstance(accessToken) {
|
|
45
44
|
accessToken = errors_1.CheckThrowSomethingMissing(strings_1.ConfigNames.APPSTUDIO_TOKEN, accessToken);
|
|
46
|
-
const instance =
|
|
45
|
+
const instance = wrappedAxiosClient_1.WrappedAxiosClient.create({
|
|
47
46
|
headers: {
|
|
48
47
|
post: {
|
|
49
48
|
Authorization: `Bearer ${accessToken}`,
|
|
@@ -55,10 +54,6 @@ class AppStudioClient {
|
|
|
55
54
|
},
|
|
56
55
|
},
|
|
57
56
|
});
|
|
58
|
-
instance.interceptors.request.use(function (config) {
|
|
59
|
-
config.params = Object.assign({ teamstoolkit: true }, config.params);
|
|
60
|
-
return config;
|
|
61
|
-
});
|
|
62
57
|
return instance;
|
|
63
58
|
}
|
|
64
59
|
/**
|
|
@@ -69,16 +64,11 @@ class AppStudioClient {
|
|
|
69
64
|
AppStudioClient.baseUrl = region;
|
|
70
65
|
}
|
|
71
66
|
static async getBotRegistration(token, botId) {
|
|
72
|
-
const telemetryProperties = {
|
|
73
|
-
[telemetry_1.TelemetryProperty.BotId]: botId,
|
|
74
|
-
};
|
|
75
|
-
appStudioClient_1.AppStudioClient.sendStartEvent(constants_1.APP_STUDIO_API_NAMES.GET_BOT, telemetryProperties);
|
|
76
67
|
const axiosInstance = AppStudioClient.newAxiosInstance(token);
|
|
77
68
|
try {
|
|
78
69
|
const response = await retryHandler_1.RetryHandler.Retry(() => axiosInstance.get(`${AppStudioClient.baseUrl}/api/botframework/${botId}`));
|
|
79
70
|
if (common_1.isHappyResponse(response)) {
|
|
80
71
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
81
|
-
appStudioClient_1.AppStudioClient.sendSuccessEvent(constants_1.APP_STUDIO_API_NAMES.GET_BOT, telemetryProperties);
|
|
82
72
|
return response.data; // response cannot be undefined as it's checked in isHappyResponse.
|
|
83
73
|
}
|
|
84
74
|
else {
|
|
@@ -87,21 +77,41 @@ class AppStudioClient {
|
|
|
87
77
|
}
|
|
88
78
|
}
|
|
89
79
|
catch (e) {
|
|
90
|
-
handleBotFrameworkError(e, constants_1.APP_STUDIO_API_NAMES.GET_BOT
|
|
80
|
+
handleBotFrameworkError(e, constants_1.APP_STUDIO_API_NAMES.GET_BOT);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
static async listBots(token) {
|
|
84
|
+
const axiosInstance = AppStudioClient.newAxiosInstance(token);
|
|
85
|
+
try {
|
|
86
|
+
const response = await retryHandler_1.RetryHandler.Retry(() => axiosInstance.get(`${AppStudioClient.baseUrl}/api/botframework`));
|
|
87
|
+
if (common_1.isHappyResponse(response)) {
|
|
88
|
+
return response.data; // response cannot be undefined as it's checked in isHappyResponse.
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
// Defensive code and it should never reach here.
|
|
92
|
+
throw new Error("Failed to get data");
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
catch (e) {
|
|
96
|
+
handleBotFrameworkError(e, constants_1.APP_STUDIO_API_NAMES.LIST_BOT);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
static async deleteBot(token, botId) {
|
|
100
|
+
const axiosInstance = AppStudioClient.newAxiosInstance(token);
|
|
101
|
+
try {
|
|
102
|
+
await retryHandler_1.RetryHandler.Retry(() => axiosInstance.delete(`${AppStudioClient.baseUrl}/api/botframework/${botId}`));
|
|
103
|
+
}
|
|
104
|
+
catch (e) {
|
|
105
|
+
handleBotFrameworkError(e, constants_1.APP_STUDIO_API_NAMES.DELETE_BOT);
|
|
91
106
|
}
|
|
92
107
|
}
|
|
93
108
|
static async createBotRegistration(token, registration, checkExistence = true, context) {
|
|
94
|
-
var _a
|
|
95
|
-
const telemetryProperties = {
|
|
96
|
-
[telemetry_1.TelemetryProperty.BotId]: (_a = registration.botId) !== null && _a !== void 0 ? _a : "",
|
|
97
|
-
};
|
|
98
|
-
appStudioClient_1.AppStudioClient.sendStartEvent(constants_1.APP_STUDIO_API_NAMES.CREATE_BOT, telemetryProperties);
|
|
109
|
+
var _a;
|
|
99
110
|
const axiosInstance = AppStudioClient.newAxiosInstance(token);
|
|
100
111
|
if (registration.botId && checkExistence) {
|
|
101
112
|
const botReg = await AppStudioClient.getBotRegistration(token, registration.botId);
|
|
102
113
|
if (botReg) {
|
|
103
|
-
(
|
|
104
|
-
appStudioClient_1.AppStudioClient.sendSuccessEvent(constants_1.APP_STUDIO_API_NAMES.CREATE_BOT, telemetryProperties);
|
|
114
|
+
(_a = context === null || context === void 0 ? void 0 : context.logProvider) === null || _a === void 0 ? void 0 : _a.info(messages_1.Messages.BotResourceExist("Appstudio"));
|
|
105
115
|
return;
|
|
106
116
|
}
|
|
107
117
|
}
|
|
@@ -110,10 +120,9 @@ class AppStudioClient {
|
|
|
110
120
|
if (!common_1.isHappyResponse(response)) {
|
|
111
121
|
throw new errors_1.ProvisionError(strings_1.CommonStrings.APP_STUDIO_BOT_REGISTRATION);
|
|
112
122
|
}
|
|
113
|
-
appStudioClient_1.AppStudioClient.sendSuccessEvent(constants_1.APP_STUDIO_API_NAMES.CREATE_BOT, telemetryProperties);
|
|
114
123
|
}
|
|
115
124
|
catch (e) {
|
|
116
|
-
handleBotFrameworkError(e, constants_1.APP_STUDIO_API_NAMES.CREATE_BOT
|
|
125
|
+
handleBotFrameworkError(e, constants_1.APP_STUDIO_API_NAMES.CREATE_BOT);
|
|
117
126
|
}
|
|
118
127
|
return;
|
|
119
128
|
}
|
|
@@ -130,11 +139,6 @@ class AppStudioClient {
|
|
|
130
139
|
return;
|
|
131
140
|
}
|
|
132
141
|
static async updateBotRegistration(token, botReg) {
|
|
133
|
-
var _a;
|
|
134
|
-
const telemetryProperties = {
|
|
135
|
-
[telemetry_1.TelemetryProperty.BotId]: (_a = botReg.botId) !== null && _a !== void 0 ? _a : "",
|
|
136
|
-
};
|
|
137
|
-
appStudioClient_1.AppStudioClient.sendStartEvent(constants_1.APP_STUDIO_API_NAMES.UPDATE_BOT, telemetryProperties);
|
|
138
142
|
const axiosInstance = AppStudioClient.newAxiosInstance(token);
|
|
139
143
|
try {
|
|
140
144
|
const response = await retryHandler_1.RetryHandler.Retry(() =>
|
|
@@ -143,10 +147,9 @@ class AppStudioClient {
|
|
|
143
147
|
if (!common_1.isHappyResponse(response)) {
|
|
144
148
|
throw new errors_1.ConfigUpdatingError(strings_1.ConfigNames.MESSAGE_ENDPOINT);
|
|
145
149
|
}
|
|
146
|
-
appStudioClient_1.AppStudioClient.sendSuccessEvent(constants_1.APP_STUDIO_API_NAMES.UPDATE_BOT, telemetryProperties);
|
|
147
150
|
}
|
|
148
151
|
catch (e) {
|
|
149
|
-
handleBotFrameworkError(e, constants_1.APP_STUDIO_API_NAMES.UPDATE_BOT
|
|
152
|
+
handleBotFrameworkError(e, constants_1.APP_STUDIO_API_NAMES.UPDATE_BOT);
|
|
150
153
|
}
|
|
151
154
|
return;
|
|
152
155
|
}
|
|
@@ -158,6 +161,18 @@ tslib_1.__decorate([
|
|
|
158
161
|
tslib_1.__metadata("design:paramtypes", [String, String]),
|
|
159
162
|
tslib_1.__metadata("design:returntype", Promise)
|
|
160
163
|
], AppStudioClient, "getBotRegistration", null);
|
|
164
|
+
tslib_1.__decorate([
|
|
165
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Teams", component: "AppStudioClient" })]),
|
|
166
|
+
tslib_1.__metadata("design:type", Function),
|
|
167
|
+
tslib_1.__metadata("design:paramtypes", [String]),
|
|
168
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
169
|
+
], AppStudioClient, "listBots", null);
|
|
170
|
+
tslib_1.__decorate([
|
|
171
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Teams", component: "AppStudioClient" })]),
|
|
172
|
+
tslib_1.__metadata("design:type", Function),
|
|
173
|
+
tslib_1.__metadata("design:paramtypes", [String, String]),
|
|
174
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
175
|
+
], AppStudioClient, "deleteBot", null);
|
|
161
176
|
tslib_1.__decorate([
|
|
162
177
|
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Teams", component: "AppStudioClient" })]),
|
|
163
178
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appStudioClient.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,oEAAiF;
|
|
1
|
+
{"version":3,"file":"appStudioClient.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,8 @@ declare class EnvUtil {
|
|
|
31
31
|
object2map(obj: DotenvOutput): Map<string, string>;
|
|
32
32
|
map2object(map: Map<string, string>): DotenvOutput;
|
|
33
33
|
extractEnvNameFromFileName(inputFileName: string): string | undefined;
|
|
34
|
+
resetEnv(projectPath: string, env: string, ignoreKeys: string[]): Promise<void>;
|
|
35
|
+
resetEnvFile(envFilePath: string, ignoreKeys: string[]): Promise<void>;
|
|
34
36
|
}
|
|
35
37
|
export declare const envUtil: EnvUtil;
|
|
36
38
|
declare type DotenvParsedLine = string | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":";AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAelE,oBAAY,YAAY,GAAG;IACzB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAeF,cAAM,OAAO;IACX;;;;;;;;;OASG;IACG,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,EACvB,MAAM,UAAO,GACZ,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAkFnC,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"envUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":";AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAelE,oBAAY,YAAY,GAAG;IACzB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAeF,cAAM,OAAO;IACX;;;;;;;;;OASG;IACG,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,EACvB,MAAM,UAAO,GACZ,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAkFnC,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IASjF,QAAQ,CACN,qBAAqB,EAAE,MAAM,CAAC,UAAU,GAAG,YAAY,EACvD,oBAAoB,EAAE,YAAY;IASpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAkEhC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAc1F,UAAU,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAOlD,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY;IAQlD,0BAA0B,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAO/D,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/E,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAW7E;AAED,eAAO,MAAM,OAAO,SAAgB,CAAC;AAGrC,aAAK,gBAAgB,GACjB,MAAM,GACN;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,CAAA;CAAE,CAAC;AACxE,UAAU,iBAAiB;IACzB,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC3B,GAAG,EAAE,YAAY,CAAC;CACnB;AAED,cAAM,UAAU;IACd,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,iBAAiB;IA6CpD,SAAS,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;CAmC7C;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC;AAE3C,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAUvD"}
|
|
@@ -115,6 +115,7 @@ class EnvUtil {
|
|
|
115
115
|
async loadEnvFile(dotEnvFilePath) {
|
|
116
116
|
const parseResult = exports.dotenvUtil.deserialize(await fs_extra_1.default.readFile(dotEnvFilePath, { encoding: "utf8" }));
|
|
117
117
|
this.mergeEnv(process.env, parseResult.obj);
|
|
118
|
+
globalVars_1.globalVars.envFilePath = dotEnvFilePath;
|
|
118
119
|
return teamsfx_api_1.ok(parseResult.obj);
|
|
119
120
|
}
|
|
120
121
|
mergeEnv(envWithHigherPriority, envWithLowerPriority) {
|
|
@@ -233,6 +234,28 @@ class EnvUtil {
|
|
|
233
234
|
const envName = matches && matches[1];
|
|
234
235
|
return envName || undefined;
|
|
235
236
|
}
|
|
237
|
+
async resetEnv(projectPath, env, ignoreKeys) {
|
|
238
|
+
const envFilePathRes = await pathUtils_1.pathUtils.getEnvFilePath(projectPath, env);
|
|
239
|
+
if (envFilePathRes.isErr())
|
|
240
|
+
return;
|
|
241
|
+
const envFilePath = envFilePathRes.value;
|
|
242
|
+
if (!envFilePath)
|
|
243
|
+
return;
|
|
244
|
+
await this.resetEnvFile(envFilePath, ignoreKeys);
|
|
245
|
+
const dotEnvSecretFilePath = envFilePath + ".user";
|
|
246
|
+
if (await fs_extra_1.default.pathExists(dotEnvSecretFilePath)) {
|
|
247
|
+
await this.resetEnvFile(dotEnvSecretFilePath, ignoreKeys);
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
async resetEnvFile(envFilePath, ignoreKeys) {
|
|
251
|
+
const parseResult = exports.dotenvUtil.deserialize(await fs_extra_1.default.readFile(envFilePath, { encoding: "utf8" }));
|
|
252
|
+
for (const key of Object.keys(parseResult.obj)) {
|
|
253
|
+
if (!ignoreKeys.includes(key)) {
|
|
254
|
+
parseResult.obj[key] = "";
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
await fs_extra_1.default.writeFile(envFilePath, exports.dotenvUtil.serialize(parseResult), { encoding: "utf8" });
|
|
258
|
+
}
|
|
236
259
|
}
|
|
237
260
|
exports.envUtil = new EnvUtil();
|
|
238
261
|
const NEW_LINE_SPLITTER = /\r?\n/;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envUtil.js","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"envUtil.js","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ const parser_1 = require("../configManager/parser");
|
|
|
13
13
|
const environmentName_1 = require("../../core/environmentName");
|
|
14
14
|
class PathUtils {
|
|
15
15
|
getYmlFilePath(projectPath, env) {
|
|
16
|
-
const envName = env || process.env.TEAMSFX_ENV;
|
|
16
|
+
const envName = env || process.env.TEAMSFX_ENV || "dev";
|
|
17
17
|
if (!envName)
|
|
18
18
|
throw new common_1.MissingRequiredInputError("env", "PathUtils");
|
|
19
19
|
const ymlPath = path.join(projectPath, envName === environmentName_1.environmentNameManager.getLocalEnvName()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkE;AAClE,gEAA0B;AAC1B,mDAA6B;AAC7B,kEAA0D;AAC1D,+CAAyF;AACzF,oDAAqD;AACrD,gEAAoE;AAEpE,MAAM,SAAS;IACb,cAAc,CAAC,WAAmB,EAAE,GAAY;QAC9C,MAAM,OAAO,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkE;AAClE,gEAA0B;AAC1B,mDAA6B;AAC7B,kEAA0D;AAC1D,+CAAyF;AACzF,oDAAqD;AACrD,gEAAoE;AAEpE,MAAM,SAAS;IACb,cAAc,CAAC,WAAmB,EAAE,GAAY;QAC9C,MAAM,OAAO,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,KAAK,CAAC;QACxD,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,kCAAyB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CACvB,WAAW,EACX,OAAO,KAAK,wCAAsB,CAAC,eAAe,EAAE;YAClD,CAAC,CAAC,4BAAU,CAAC,eAAe;YAC5B,CAAC,CAAC,OAAO,KAAK,wCAAsB,CAAC,kBAAkB,EAAE;gBACzD,CAAC,CAAC,4BAAU,CAAC,kBAAkB;gBAC/B,CAAC,CAAC,4BAAU,CAAC,UAAU,CAC1B,CAAC;QACF,IAAI,kBAAE,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YAC9B,OAAO,OAAO,CAAC;SAChB;QACD,IAAI,wCAAsB,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE;YACvD,MAAM,IAAI,iCAAwB,CAAC,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;SACzD;aAAM;YACL,MAAM,IAAI,iCAAwB,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SAC/D;IACH,CAAC;IACD,KAAK,CAAC,gBAAgB,CAAC,WAAmB;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,MAAM,mBAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,QAAQ,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC;QACpC,IAAI,CAAC,YAAY,CAAC,qBAAqB;YAAE,YAAY,CAAC,qBAAqB,GAAG,OAAO,CAAC;QACtF,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,qBAAqB,CAAC;YACvE,CAAC,CAAC,YAAY,CAAC,qBAAqB;YACpC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,qBAAqB,CAAC,CAAC;QAC/D,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAAE,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,gBAAE,CAAC,aAAa,CAAC,CAAC;IAC3B,CAAC;IACD,KAAK,CAAC,cAAc,CAClB,WAAmB,EACnB,GAAW;QAEX,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAClE,IAAI,gBAAgB,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAC1C,IAAI,CAAC,UAAU;YAAE,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,EAAE,CAAC,CAAC;QACzD,OAAO,gBAAE,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;CACF;AAEY,QAAA,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FxCore.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EAIZ,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,IAAI,EACJ,OAAO,EACP,UAAU,EACV,MAAM,EACN,qBAAqB,EAErB,oBAAoB,EAGpB,MAAM,EACN,KAAK,EACL,cAAc,EACd,KAAK,EAGN,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAI3C,OAAO,kBAAkB,CAAC;AAQ1B,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAE1F,OAAO,EAAE,iBAAiB,EAAsB,MAAM,8BAA8B,CAAC;AAIrF,OAAO,EAAE,UAAU,EAAiB,MAAM,sCAAsC,CAAC;AAcjF,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,yCAAyC,CAAC;AAejD,OAAO,EACL,WAAW,
|
|
1
|
+
{"version":3,"file":"FxCore.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"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"}
|
package/build/core/FxCore.js
CHANGED
|
@@ -19,7 +19,7 @@ const localizeUtils_1 = require("../common/localizeUtils");
|
|
|
19
19
|
const launchHelper_1 = require("../common/m365/launchHelper");
|
|
20
20
|
const projectSettingsHelper_1 = require("../common/projectSettingsHelper");
|
|
21
21
|
const projectTypeChecker_1 = require("../common/projectTypeChecker");
|
|
22
|
-
const
|
|
22
|
+
const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
|
|
23
23
|
const telemetry_1 = require("../common/telemetry");
|
|
24
24
|
const versionMetadata_1 = require("../common/versionMetadata");
|
|
25
25
|
const parser_1 = require("../component/configManager/parser");
|
|
@@ -47,6 +47,7 @@ const yml_1 = require("../error/yml");
|
|
|
47
47
|
const create_1 = require("../question/create");
|
|
48
48
|
const other_1 = require("../question/other");
|
|
49
49
|
const questionNames_1 = require("../question/questionNames");
|
|
50
|
+
const constants_3 = require("../question/constants");
|
|
50
51
|
const callback_1 = require("./callback");
|
|
51
52
|
const collaborator_1 = require("./collaborator");
|
|
52
53
|
const crypto_1 = require("./crypto");
|
|
@@ -820,26 +821,34 @@ class FxCore {
|
|
|
820
821
|
const newOperations = inputs[questionNames_1.QuestionNames.ApiOperation];
|
|
821
822
|
const url = (_a = inputs[questionNames_1.QuestionNames.ApiSpecLocation]) !== null && _a !== void 0 ? _a : (_b = inputs.openAIPluginManifest) === null || _b === void 0 ? void 0 : _b.api.url;
|
|
822
823
|
const manifestPath = inputs[questionNames_1.QuestionNames.ManifestPath];
|
|
824
|
+
const isPlugin = inputs[questionNames_1.QuestionNames.Capabilities] === constants_3.copilotPluginApiSpecOptionId;
|
|
823
825
|
// Get API spec file path from manifest
|
|
824
826
|
const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
|
|
825
827
|
if (manifestRes.isErr()) {
|
|
826
828
|
return teamsfx_api_1.err(manifestRes.error);
|
|
827
829
|
}
|
|
828
|
-
const apiSpecificationFile = manifestRes.value.composeExtensions[0].apiSpecificationFile;
|
|
829
|
-
const outputAPISpecPath = path.join(path.dirname(manifestPath), apiSpecificationFile);
|
|
830
830
|
// Merge existing operations in manifest.json
|
|
831
|
-
const specParser = new
|
|
831
|
+
const specParser = new m365_spec_parser_1.SpecParser(url, {
|
|
832
832
|
allowAPIKeyAuth: featureFlags_1.isApiKeyEnabled(),
|
|
833
833
|
allowMultipleParameters: featureFlags_1.isMultipleParametersEnabled(),
|
|
834
834
|
});
|
|
835
|
-
const existingOperationIds = ManifestUtils_1.manifestUtils.getOperationIds(manifestRes.value);
|
|
836
835
|
const apiResultList = await specParser.list();
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
|
|
836
|
+
let existingOperations;
|
|
837
|
+
let outputAPISpecPath;
|
|
838
|
+
if (isPlugin) {
|
|
839
|
+
existingOperations = await helper_1.listPluginExistingOperations(manifestRes.value, manifestPath, inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath]);
|
|
840
|
+
if (!inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath]) {
|
|
841
|
+
return teamsfx_api_1.err(new common_2.MissingRequiredInputError(questionNames_1.QuestionNames.DestinationApiSpecFilePath));
|
|
842
842
|
}
|
|
843
|
+
outputAPISpecPath = inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath];
|
|
844
|
+
}
|
|
845
|
+
else {
|
|
846
|
+
const existingOperationIds = ManifestUtils_1.manifestUtils.getOperationIds(manifestRes.value);
|
|
847
|
+
existingOperations = apiResultList
|
|
848
|
+
.filter((operation) => existingOperationIds.includes(operation.operationId))
|
|
849
|
+
.map((operation) => operation.api);
|
|
850
|
+
const apiSpecificationFile = manifestRes.value.composeExtensions[0].apiSpecificationFile;
|
|
851
|
+
outputAPISpecPath = path.join(path.dirname(manifestPath), apiSpecificationFile);
|
|
843
852
|
}
|
|
844
853
|
const operations = [...existingOperations, ...newOperations];
|
|
845
854
|
const adaptiveCardFolder = path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ResponseTemplatesFolderName);
|
|
@@ -890,7 +899,7 @@ class FxCore {
|
|
|
890
899
|
}
|
|
891
900
|
catch (e) {
|
|
892
901
|
let error;
|
|
893
|
-
if (e instanceof
|
|
902
|
+
if (e instanceof m365_spec_parser_1.SpecParserError) {
|
|
894
903
|
error = helper_1.convertSpecParserErrorToFxError(e);
|
|
895
904
|
}
|
|
896
905
|
else {
|
|
@@ -911,7 +920,7 @@ class FxCore {
|
|
|
911
920
|
}
|
|
912
921
|
}
|
|
913
922
|
async copilotPluginListOperations(inputs) {
|
|
914
|
-
return await helper_1.listOperations(utils_2.createContextV3(), inputs.manifest, inputs.apiSpecUrl, inputs
|
|
923
|
+
return await helper_1.listOperations(utils_2.createContextV3(), inputs.manifest, inputs.apiSpecUrl, inputs, inputs.includeExistingAPIs, inputs.shouldLogWarning);
|
|
915
924
|
}
|
|
916
925
|
/**
|
|
917
926
|
* check project type info
|