@microsoft/teamsfx-core 1.5.0 → 1.5.1-alpha.3fc0dea41.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 +7 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +8 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/index.d.ts +1 -0
- package/build/common/index.d.ts.map +1 -1
- package/build/common/index.js +1 -0
- package/build/common/index.js.map +1 -1
- package/build/common/local/constants.d.ts +5 -0
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +6 -1
- package/build/common/local/constants.js.map +1 -1
- package/build/common/local/localEnvManager.d.ts.map +1 -1
- package/build/common/local/localEnvManager.js +3 -2
- package/build/common/local/localEnvManager.js.map +1 -1
- package/build/common/local/projectSettingsHelper.d.ts +1 -0
- package/build/common/local/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/local/projectSettingsHelper.js +9 -5
- package/build/common/local/projectSettingsHelper.js.map +1 -1
- package/build/common/localSettingsProvider.d.ts +1 -1
- package/build/common/localSettingsProvider.d.ts.map +1 -1
- package/build/common/localSettingsProvider.js +4 -1
- package/build/common/localSettingsProvider.js.map +1 -1
- package/build/common/localizeUtils.d.ts +3 -0
- package/build/common/localizeUtils.d.ts.map +1 -0
- package/build/common/localizeUtils.js +38 -0
- package/build/common/localizeUtils.js.map +1 -0
- package/build/common/projectSettingsHelper.d.ts +11 -0
- package/build/common/projectSettingsHelper.d.ts.map +1 -0
- package/build/common/projectSettingsHelper.js +134 -0
- package/build/common/projectSettingsHelper.js.map +1 -0
- package/build/common/template-utils/templatesActions.d.ts.map +1 -1
- package/build/common/template-utils/templatesActions.js +3 -2
- package/build/common/template-utils/templatesActions.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts +8 -2
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +62 -10
- package/build/common/tools.js.map +1 -1
- package/build/core/FxCore.d.ts +78 -0
- package/build/core/FxCore.d.ts.map +1 -0
- package/build/core/FxCore.js +1305 -0
- package/build/core/FxCore.js.map +1 -0
- package/build/core/SolutionPluginContainer.d.ts.map +1 -1
- package/build/core/SolutionPluginContainer.js.map +1 -1
- package/build/core/collaborator.d.ts +1 -4
- package/build/core/collaborator.d.ts.map +1 -1
- package/build/core/collaborator.js +56 -77
- package/build/core/collaborator.js.map +1 -1
- package/build/core/downloadSample.d.ts +2 -2
- package/build/core/downloadSample.d.ts.map +1 -1
- package/build/core/downloadSample.js +6 -5
- package/build/core/downloadSample.js.map +1 -1
- package/build/core/environment.d.ts +4 -2
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +50 -43
- package/build/core/environment.js.map +1 -1
- package/build/core/error.d.ts +27 -12
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +45 -33
- package/build/core/error.js.map +1 -1
- package/build/core/globalVars.d.ts +12 -0
- package/build/core/globalVars.d.ts.map +1 -0
- package/build/core/globalVars.js +41 -0
- package/build/core/globalVars.js.map +1 -0
- package/build/core/index.d.ts +4 -101
- package/build/core/index.d.ts.map +1 -1
- package/build/core/index.js +5 -1377
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts +1 -0
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +17 -12
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/envInfoLoader.d.ts +1 -1
- package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoader.js +28 -21
- package/build/core/middleware/envInfoLoader.js.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.js +2 -3
- package/build/core/middleware/envInfoLoaderV3.js.map +1 -1
- package/build/core/middleware/envInfoWriter.js +3 -4
- package/build/core/middleware/envInfoWriter.js.map +1 -1
- package/build/core/middleware/envInfoWriterV3.js +3 -4
- package/build/core/middleware/envInfoWriterV3.js.map +1 -1
- package/build/core/middleware/errorHandler.d.ts.map +1 -1
- package/build/core/middleware/errorHandler.js +7 -5
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/localSettingsLoader.js +3 -4
- package/build/core/middleware/localSettingsLoader.js.map +1 -1
- package/build/core/middleware/localSettingsWriter.d.ts.map +1 -1
- package/build/core/middleware/localSettingsWriter.js +4 -4
- package/build/core/middleware/localSettingsWriter.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts +1 -1
- package/build/core/middleware/projectMigrator.d.ts.map +1 -1
- package/build/core/middleware/projectMigrator.js +52 -57
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.d.ts +1 -1
- package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +12 -10
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectSettingsWriter.js +2 -2
- package/build/core/middleware/projectSettingsWriter.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +78 -48
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/solutionLoader.d.ts +1 -1
- package/build/core/middleware/solutionLoader.d.ts.map +1 -1
- package/build/core/middleware/solutionLoader.js.map +1 -1
- package/build/core/middleware/solutionLoaderV3.d.ts +1 -1
- package/build/core/middleware/solutionLoaderV3.d.ts.map +1 -1
- package/build/core/middleware/solutionLoaderV3.js.map +1 -1
- package/build/core/pvm/broker.js +1 -1
- package/build/core/pvm/broker.js.map +1 -1
- package/build/core/question.d.ts +10 -7
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +156 -109
- package/build/core/question.js.map +1 -1
- package/build/core/types.d.ts +14 -0
- package/build/core/types.d.ts.map +1 -0
- package/build/core/types.js +5 -0
- package/build/core/types.js.map +1 -0
- package/build/plugins/resource/aad/aadAppClient.d.ts.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.js +8 -9
- package/build/plugins/resource/aad/aadAppClient.js.map +1 -1
- package/build/plugins/resource/aad/aadAppManifestManager.d.ts +9 -0
- package/build/plugins/resource/aad/aadAppManifestManager.d.ts.map +1 -0
- package/build/plugins/resource/aad/aadAppManifestManager.js +78 -0
- package/build/plugins/resource/aad/aadAppManifestManager.js.map +1 -0
- package/build/plugins/resource/aad/appStudio.js +2 -2
- package/build/plugins/resource/aad/appStudio.js.map +1 -1
- package/build/plugins/resource/aad/constants.d.ts +5 -5
- package/build/plugins/resource/aad/constants.d.ts.map +1 -1
- package/build/plugins/resource/aad/constants.js +10 -9
- package/build/plugins/resource/aad/constants.js.map +1 -1
- package/build/plugins/resource/aad/errors.d.ts +19 -19
- package/build/plugins/resource/aad/errors.d.ts.map +1 -1
- package/build/plugins/resource/aad/errors.js +44 -48
- 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 +2 -6
- package/build/plugins/resource/aad/index.js.map +1 -1
- package/build/plugins/resource/aad/interfaces/AADApplication.d.ts +122 -0
- package/build/plugins/resource/aad/interfaces/AADApplication.d.ts.map +1 -0
- package/build/plugins/resource/aad/interfaces/AADApplication.js +3 -0
- package/build/plugins/resource/aad/interfaces/AADApplication.js.map +1 -0
- package/build/plugins/resource/aad/interfaces/AADManifest.d.ts +111 -0
- package/build/plugins/resource/aad/interfaces/AADManifest.d.ts.map +1 -0
- package/build/plugins/resource/aad/interfaces/AADManifest.js +3 -0
- package/build/plugins/resource/aad/interfaces/AADManifest.js.map +1 -0
- package/build/plugins/resource/aad/permissions/index.d.ts +5 -0
- package/build/plugins/resource/aad/permissions/index.d.ts.map +1 -0
- package/build/plugins/resource/aad/permissions/index.js +38 -0
- package/build/plugins/resource/aad/permissions/index.js.map +1 -0
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +21 -22
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/aad/utils/aadManifestHelper.d.ts +7 -0
- package/build/plugins/resource/aad/utils/aadManifestHelper.d.ts.map +1 -0
- package/build/plugins/resource/aad/utils/aadManifestHelper.js +150 -0
- package/build/plugins/resource/aad/utils/aadManifestHelper.js.map +1 -0
- package/build/plugins/resource/aad/utils/configs.d.ts +18 -1
- package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/configs.js +128 -7
- package/build/plugins/resource/aad/utils/configs.js.map +1 -1
- package/build/plugins/resource/aad/utils/telemetry.js +3 -3
- package/build/plugins/resource/aad/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/aad/v3/index.d.ts +1 -5
- package/build/plugins/resource/aad/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/v3/index.js +8 -42
- package/build/plugins/resource/aad/v3/index.js.map +1 -1
- package/build/plugins/resource/apim/constants.d.ts +8 -7
- package/build/plugins/resource/apim/constants.d.ts.map +1 -1
- package/build/plugins/resource/apim/constants.js +55 -55
- package/build/plugins/resource/apim/constants.js.map +1 -1
- package/build/plugins/resource/apim/error.d.ts +0 -1
- package/build/plugins/resource/apim/error.d.ts.map +1 -1
- package/build/plugins/resource/apim/error.js +20 -24
- package/build/plugins/resource/apim/error.js.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.js +2 -2
- package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +11 -0
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +12 -1
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/errors.d.ts +9 -33
- package/build/plugins/resource/appstudio/errors.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/errors.js +37 -64
- package/build/plugins/resource/appstudio/errors.js.map +1 -1
- package/build/plugins/resource/appstudio/index.d.ts +1 -1
- package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/index.js +12 -9
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts +10 -4
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.js +147 -63
- package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts +2 -2
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +110 -58
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/questions.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/questions.js +5 -4
- package/build/plugins/resource/appstudio/questions.js.map +1 -1
- package/build/plugins/resource/appstudio/utils/utils.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/utils/utils.js +2 -1
- package/build/plugins/resource/appstudio/utils/utils.js.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.d.ts +2 -3
- package/build/plugins/resource/appstudio/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.js +1 -2
- package/build/plugins/resource/appstudio/v2/index.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.d.ts +2 -2
- package/build/plugins/resource/appstudio/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.js +2 -2
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/plugin.d.ts +2 -2
- package/build/plugins/resource/appstudio/v3/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/plugin.js +3 -3
- package/build/plugins/resource/appstudio/v3/plugin.js.map +1 -1
- package/build/plugins/resource/bot/aadRegistration.d.ts.map +1 -1
- package/build/plugins/resource/bot/aadRegistration.js +4 -8
- package/build/plugins/resource/bot/aadRegistration.js.map +1 -1
- package/build/plugins/resource/bot/appStudio/appStudio.d.ts.map +1 -1
- package/build/plugins/resource/bot/appStudio/appStudio.js +5 -8
- package/build/plugins/resource/bot/appStudio/appStudio.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 +2 -21
- package/build/plugins/resource/bot/azureOps.js.map +1 -1
- package/build/plugins/resource/bot/configs/localDebugConfig.d.ts.map +1 -1
- package/build/plugins/resource/bot/configs/localDebugConfig.js +13 -38
- package/build/plugins/resource/bot/configs/localDebugConfig.js.map +1 -1
- package/build/plugins/resource/bot/configs/scaffoldConfig.d.ts +11 -0
- package/build/plugins/resource/bot/configs/scaffoldConfig.d.ts.map +1 -1
- package/build/plugins/resource/bot/configs/scaffoldConfig.js +55 -6
- package/build/plugins/resource/bot/configs/scaffoldConfig.js.map +1 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.d.ts.map +1 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.js +8 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.js.map +1 -1
- package/build/plugins/resource/bot/constants.d.ts +25 -2
- package/build/plugins/resource/bot/constants.d.ts.map +1 -1
- package/build/plugins/resource/bot/constants.js +27 -3
- package/build/plugins/resource/bot/constants.js.map +1 -1
- package/build/plugins/resource/bot/enums/pluginActRoles.d.ts +2 -1
- package/build/plugins/resource/bot/enums/pluginActRoles.d.ts.map +1 -1
- package/build/plugins/resource/bot/enums/pluginActRoles.js +1 -0
- package/build/plugins/resource/bot/enums/pluginActRoles.js.map +1 -1
- package/build/plugins/resource/bot/errors.d.ts +44 -23
- package/build/plugins/resource/bot/errors.d.ts.map +1 -1
- package/build/plugins/resource/bot/errors.js +57 -44
- package/build/plugins/resource/bot/errors.js.map +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/plugin.d.ts +7 -0
- package/build/plugins/resource/bot/functionsHostedBot/plugin.d.ts.map +1 -0
- package/build/plugins/resource/bot/functionsHostedBot/plugin.js +39 -0
- package/build/plugins/resource/bot/functionsHostedBot/plugin.js.map +1 -0
- package/build/plugins/resource/bot/index.d.ts +8 -3
- package/build/plugins/resource/bot/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/index.js +84 -31
- package/build/plugins/resource/bot/index.js.map +1 -1
- package/build/plugins/resource/bot/languageStrategy.d.ts +4 -1
- package/build/plugins/resource/bot/languageStrategy.d.ts.map +1 -1
- package/build/plugins/resource/bot/languageStrategy.js +30 -3
- package/build/plugins/resource/bot/languageStrategy.js.map +1 -1
- package/build/plugins/resource/bot/plugin.d.ts +3 -6
- package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/plugin.js +42 -110
- package/build/plugins/resource/bot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/question.d.ts +12 -0
- package/build/plugins/resource/bot/question.d.ts.map +1 -0
- package/build/plugins/resource/bot/question.js +69 -0
- package/build/plugins/resource/bot/question.js.map +1 -0
- package/build/plugins/resource/bot/resources/messages.d.ts +34 -56
- package/build/plugins/resource/bot/resources/messages.d.ts.map +1 -1
- package/build/plugins/resource/bot/resources/messages.js +58 -73
- package/build/plugins/resource/bot/resources/messages.js.map +1 -1
- package/build/plugins/resource/bot/resources/strings.d.ts +17 -28
- package/build/plugins/resource/bot/resources/strings.d.ts.map +1 -1
- package/build/plugins/resource/bot/resources/strings.js +19 -30
- package/build/plugins/resource/bot/resources/strings.js.map +1 -1
- package/build/plugins/resource/bot/utils/common.d.ts +5 -1
- package/build/plugins/resource/bot/utils/common.d.ts.map +1 -1
- package/build/plugins/resource/bot/utils/common.js +19 -1
- package/build/plugins/resource/bot/utils/common.js.map +1 -1
- package/build/plugins/resource/bot/utils/retryHandler.d.ts +1 -1
- package/build/plugins/resource/bot/utils/retryHandler.d.ts.map +1 -1
- package/build/plugins/resource/bot/utils/retryHandler.js.map +1 -1
- package/build/plugins/resource/bot/utils/telemetry-helper.d.ts.map +1 -1
- package/build/plugins/resource/bot/utils/telemetry-helper.js +3 -1
- package/build/plugins/resource/bot/utils/telemetry-helper.js.map +1 -1
- package/build/plugins/resource/bot/v2/index.d.ts +3 -1
- package/build/plugins/resource/bot/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/index.js +6 -0
- package/build/plugins/resource/bot/v2/index.js.map +1 -1
- package/build/plugins/resource/bot/v3/index.d.ts +2 -1
- package/build/plugins/resource/bot/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v3/index.js +15 -1
- package/build/plugins/resource/bot/v3/index.js.map +1 -1
- package/build/plugins/resource/cicd/constants.d.ts +39 -0
- package/build/plugins/resource/cicd/constants.d.ts.map +1 -0
- package/build/plugins/resource/cicd/constants.js +52 -0
- package/build/plugins/resource/cicd/constants.js.map +1 -0
- package/build/plugins/resource/cicd/errors.d.ts +24 -0
- package/build/plugins/resource/cicd/errors.d.ts.map +1 -0
- package/build/plugins/resource/cicd/errors.js +48 -0
- package/build/plugins/resource/cicd/errors.js.map +1 -0
- package/build/plugins/resource/cicd/index.d.ts +17 -0
- package/build/plugins/resource/cicd/index.d.ts.map +1 -0
- package/build/plugins/resource/cicd/index.js +117 -0
- package/build/plugins/resource/cicd/index.js.map +1 -0
- package/build/plugins/resource/cicd/logger.d.ts +10 -0
- package/build/plugins/resource/cicd/logger.d.ts.map +1 -0
- package/build/plugins/resource/cicd/logger.js +27 -0
- package/build/plugins/resource/cicd/logger.js.map +1 -0
- package/build/plugins/resource/cicd/plugin.d.ts +10 -0
- package/build/plugins/resource/cicd/plugin.d.ts.map +1 -0
- package/build/plugins/resource/cicd/plugin.js +78 -0
- package/build/plugins/resource/cicd/plugin.js.map +1 -0
- package/build/plugins/resource/cicd/providers/azdoProvider.d.ts +6 -0
- package/build/plugins/resource/cicd/providers/azdoProvider.d.ts.map +1 -0
- package/build/plugins/resource/cicd/providers/azdoProvider.js +25 -0
- package/build/plugins/resource/cicd/providers/azdoProvider.js.map +1 -0
- package/build/plugins/resource/cicd/providers/enums.d.ts +12 -0
- package/build/plugins/resource/cicd/providers/enums.d.ts.map +1 -0
- package/build/plugins/resource/cicd/providers/enums.js +19 -0
- package/build/plugins/resource/cicd/providers/enums.js.map +1 -0
- package/build/plugins/resource/cicd/providers/factory.d.ts +6 -0
- package/build/plugins/resource/cicd/providers/factory.d.ts.map +1 -0
- package/build/plugins/resource/cicd/providers/factory.js +28 -0
- package/build/plugins/resource/cicd/providers/factory.js.map +1 -0
- package/build/plugins/resource/cicd/providers/githubProvider.d.ts +6 -0
- package/build/plugins/resource/cicd/providers/githubProvider.d.ts.map +1 -0
- package/build/plugins/resource/cicd/providers/githubProvider.js +25 -0
- package/build/plugins/resource/cicd/providers/githubProvider.js.map +1 -0
- package/build/plugins/resource/cicd/providers/jenkinsProvider.d.ts +6 -0
- package/build/plugins/resource/cicd/providers/jenkinsProvider.d.ts.map +1 -0
- package/build/plugins/resource/cicd/providers/jenkinsProvider.js +25 -0
- package/build/plugins/resource/cicd/providers/jenkinsProvider.js.map +1 -0
- package/build/plugins/resource/cicd/providers/provider.d.ts +11 -0
- package/build/plugins/resource/cicd/providers/provider.d.ts.map +1 -0
- package/build/plugins/resource/cicd/providers/provider.js +92 -0
- package/build/plugins/resource/cicd/providers/provider.js.map +1 -0
- package/build/plugins/resource/cicd/questions.d.ts +14 -0
- package/build/plugins/resource/cicd/questions.d.ts.map +1 -0
- package/build/plugins/resource/cicd/questions.js +45 -0
- package/build/plugins/resource/cicd/questions.js.map +1 -0
- package/build/plugins/resource/cicd/result.d.ts +11 -0
- package/build/plugins/resource/cicd/result.d.ts.map +1 -0
- package/build/plugins/resource/cicd/result.js +23 -0
- package/build/plugins/resource/cicd/result.js.map +1 -0
- package/build/plugins/resource/cicd/utils/buildScripts.d.ts +3 -0
- package/build/plugins/resource/cicd/utils/buildScripts.d.ts.map +1 -0
- package/build/plugins/resource/cicd/utils/buildScripts.js +34 -0
- package/build/plugins/resource/cicd/utils/buildScripts.js.map +1 -0
- package/build/plugins/resource/cicd/utils/telemetry-helper.d.ts +29 -0
- package/build/plugins/resource/cicd/utils/telemetry-helper.d.ts.map +1 -0
- package/build/plugins/resource/cicd/utils/telemetry-helper.js +46 -0
- package/build/plugins/resource/cicd/utils/telemetry-helper.js.map +1 -0
- package/build/plugins/resource/frontend/configs.js +4 -4
- package/build/plugins/resource/frontend/configs.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/ops/scaffold.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/ops/scaffold.js +1 -2
- package/build/plugins/resource/frontend/dotnet/ops/scaffold.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.d.ts +2 -2
- package/build/plugins/resource/frontend/dotnet/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/env.d.ts.map +1 -1
- package/build/plugins/resource/frontend/env.js +2 -3
- package/build/plugins/resource/frontend/env.js.map +1 -1
- package/build/plugins/resource/frontend/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/index.js +3 -3
- package/build/plugins/resource/frontend/index.js.map +1 -1
- package/build/plugins/resource/frontend/ops/scaffold.d.ts.map +1 -1
- package/build/plugins/resource/frontend/ops/scaffold.js +1 -1
- package/build/plugins/resource/frontend/ops/scaffold.js.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.d.ts +5 -4
- package/build/plugins/resource/frontend/resources/errors.d.ts.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.js +50 -65
- package/build/plugins/resource/frontend/resources/errors.js.map +1 -1
- package/build/plugins/resource/frontend/resources/messages.d.ts +0 -2
- package/build/plugins/resource/frontend/resources/messages.d.ts.map +1 -1
- package/build/plugins/resource/frontend/resources/messages.js +0 -2
- package/build/plugins/resource/frontend/resources/messages.js.map +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.d.ts +1 -0
- package/build/plugins/resource/frontend/resources/templateInfo.d.ts.map +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js +3 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js.map +1 -1
- package/build/plugins/resource/frontend/utils/telemetry-helper.d.ts +1 -1
- package/build/plugins/resource/frontend/utils/telemetry-helper.d.ts.map +1 -1
- package/build/plugins/resource/frontend/utils/telemetry-helper.js +2 -3
- package/build/plugins/resource/frontend/utils/telemetry-helper.js.map +1 -1
- package/build/plugins/resource/frontend/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v2/index.js.map +1 -1
- package/build/plugins/resource/frontend/v3/error.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v3/error.js +8 -20
- package/build/plugins/resource/frontend/v3/error.js.map +1 -1
- package/build/plugins/resource/function/index.d.ts.map +1 -1
- package/build/plugins/resource/function/index.js +1 -2
- package/build/plugins/resource/function/index.js.map +1 -1
- package/build/plugins/resource/function/ops/scaffold.d.ts.map +1 -1
- package/build/plugins/resource/function/ops/scaffold.js +1 -1
- package/build/plugins/resource/function/ops/scaffold.js.map +1 -1
- package/build/plugins/resource/function/plugin.d.ts +0 -2
- package/build/plugins/resource/function/plugin.d.ts.map +1 -1
- package/build/plugins/resource/function/plugin.js +2 -50
- package/build/plugins/resource/function/plugin.js.map +1 -1
- package/build/plugins/resource/function/resources/errors.d.ts +2 -15
- package/build/plugins/resource/function/resources/errors.d.ts.map +1 -1
- package/build/plugins/resource/function/resources/errors.js +40 -74
- package/build/plugins/resource/function/resources/errors.js.map +1 -1
- package/build/plugins/resource/function/utils/telemetry-helper.d.ts +1 -2
- package/build/plugins/resource/function/utils/telemetry-helper.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/telemetry-helper.js +2 -3
- package/build/plugins/resource/function/utils/telemetry-helper.js.map +1 -1
- package/build/plugins/resource/function/v3/error.d.ts +1 -1
- package/build/plugins/resource/function/v3/error.d.ts.map +1 -1
- package/build/plugins/resource/function/v3/error.js +12 -23
- package/build/plugins/resource/function/v3/error.js.map +1 -1
- package/build/plugins/resource/function/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/function/v3/index.js +1 -1
- package/build/plugins/resource/function/v3/index.js.map +1 -1
- package/build/plugins/resource/identity/constants.d.ts +2 -1
- package/build/plugins/resource/identity/constants.d.ts.map +1 -1
- package/build/plugins/resource/identity/constants.js +2 -1
- package/build/plugins/resource/identity/constants.js.map +1 -1
- package/build/plugins/resource/identity/index.d.ts +4 -16
- package/build/plugins/resource/identity/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/index.js +46 -119
- package/build/plugins/resource/identity/index.js.map +1 -1
- package/build/plugins/resource/identity/utils/telemetryUtil.d.ts +3 -3
- package/build/plugins/resource/identity/utils/telemetryUtil.d.ts.map +1 -1
- package/build/plugins/resource/identity/utils/telemetryUtil.js +6 -6
- package/build/plugins/resource/identity/utils/telemetryUtil.js.map +1 -1
- package/build/plugins/resource/identity/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/v2/index.js.map +1 -1
- package/build/plugins/resource/identity/v3/index.d.ts +0 -2
- package/build/plugins/resource/identity/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/v3/index.js +0 -2
- package/build/plugins/resource/identity/v3/index.js.map +1 -1
- package/build/plugins/resource/index.d.ts +1 -0
- package/build/plugins/resource/index.d.ts.map +1 -1
- package/build/plugins/resource/index.js +1 -0
- package/build/plugins/resource/index.js.map +1 -1
- package/build/plugins/resource/simpleauth/constants.d.ts +1 -1
- package/build/plugins/resource/simpleauth/constants.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/constants.js +4 -3
- package/build/plugins/resource/simpleauth/constants.js.map +1 -1
- package/build/plugins/resource/simpleauth/errors.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/errors.js +13 -12
- package/build/plugins/resource/simpleauth/errors.js.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.js +2 -13
- package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
- package/build/plugins/resource/simpleauth/utils/common.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/utils/common.js +17 -50
- package/build/plugins/resource/simpleauth/utils/common.js.map +1 -1
- package/build/plugins/resource/spfx/error.d.ts.map +1 -1
- package/build/plugins/resource/spfx/error.js +8 -9
- package/build/plugins/resource/spfx/error.js.map +1 -1
- package/build/plugins/resource/spfx/index.d.ts.map +1 -1
- package/build/plugins/resource/spfx/index.js +3 -29
- package/build/plugins/resource/spfx/index.js.map +1 -1
- package/build/plugins/resource/spfx/plugin.d.ts.map +1 -1
- package/build/plugins/resource/spfx/plugin.js +149 -78
- package/build/plugins/resource/spfx/plugin.js.map +1 -1
- package/build/plugins/resource/spfx/utils/constants.d.ts +11 -6
- package/build/plugins/resource/spfx/utils/constants.d.ts.map +1 -1
- package/build/plugins/resource/spfx/utils/constants.js +15 -8
- package/build/plugins/resource/spfx/utils/constants.js.map +1 -1
- package/build/plugins/resource/spfx/utils/progress-helper.d.ts +3 -0
- package/build/plugins/resource/spfx/utils/progress-helper.d.ts.map +1 -1
- package/build/plugins/resource/spfx/utils/progress-helper.js +11 -0
- package/build/plugins/resource/spfx/utils/progress-helper.js.map +1 -1
- package/build/plugins/resource/spfx/utils/questions.d.ts.map +1 -1
- package/build/plugins/resource/spfx/utils/questions.js +11 -4
- package/build/plugins/resource/spfx/utils/questions.js.map +1 -1
- package/build/plugins/resource/spfx/utils/utils.js +2 -2
- package/build/plugins/resource/spfx/utils/utils.js.map +1 -1
- package/build/plugins/resource/spfx/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/spfx/v3/index.js +2 -14
- package/build/plugins/resource/spfx/v3/index.js.map +1 -1
- package/build/plugins/resource/spfx/v3/plugin.d.ts.map +1 -1
- package/build/plugins/resource/spfx/v3/plugin.js +9 -8
- package/build/plugins/resource/spfx/v3/plugin.js.map +1 -1
- package/build/plugins/resource/sql/constants.d.ts +0 -6
- package/build/plugins/resource/sql/constants.d.ts.map +1 -1
- package/build/plugins/resource/sql/constants.js +0 -6
- package/build/plugins/resource/sql/constants.js.map +1 -1
- package/build/plugins/resource/sql/errors.d.ts +0 -10
- package/build/plugins/resource/sql/errors.d.ts.map +1 -1
- package/build/plugins/resource/sql/errors.js +18 -27
- package/build/plugins/resource/sql/errors.js.map +1 -1
- package/build/plugins/resource/sql/questions.d.ts.map +1 -1
- package/build/plugins/resource/sql/questions.js +4 -3
- package/build/plugins/resource/sql/questions.js.map +1 -1
- package/build/plugins/resource/sql/sqlClient.d.ts.map +1 -1
- package/build/plugins/resource/sql/sqlClient.js +8 -2
- package/build/plugins/resource/sql/sqlClient.js.map +1 -1
- package/build/plugins/resource/sql/utils/checkInput.d.ts.map +1 -1
- package/build/plugins/resource/sql/utils/checkInput.js +11 -11
- package/build/plugins/resource/sql/utils/checkInput.js.map +1 -1
- package/build/plugins/resource/sql/utils/message.d.ts +0 -17
- package/build/plugins/resource/sql/utils/message.d.ts.map +1 -1
- package/build/plugins/resource/sql/utils/message.js +0 -17
- package/build/plugins/resource/sql/utils/message.js.map +1 -1
- package/build/plugins/resource/utils4v2.d.ts +4 -0
- package/build/plugins/resource/utils4v2.d.ts.map +1 -1
- package/build/plugins/resource/utils4v2.js +30 -6
- package/build/plugins/resource/utils4v2.js.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts +1 -0
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js +1 -0
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +19 -14
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/constants.d.ts +5 -0
- package/build/plugins/solution/fx-solution/debug/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/constants.js +7 -1
- package/build/plugins/solution/fx-solution/debug/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js +18 -12
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/scaffolding.js +24 -41
- package/build/plugins/solution/fx-solution/debug/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launch.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launch.js +5 -1
- package/build/plugins/solution/fx-solution/debug/util/launch.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launchNext.d.ts +2 -0
- package/build/plugins/solution/fx-solution/debug/util/launchNext.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launchNext.js +116 -1
- package/build/plugins/solution/fx-solution/debug/util/launchNext.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/tasksNext.d.ts +2 -1
- package/build/plugins/solution/fx-solution/debug/util/tasksNext.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/tasksNext.js +151 -3
- package/build/plugins/solution/fx-solution/debug/util/tasksNext.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.d.ts +16 -4
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +59 -78
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts +5 -11
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +50 -59
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/types.d.ts +10 -0
- package/build/plugins/solution/fx-solution/types.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/types.js +12 -0
- package/build/plugins/solution/fx-solution/types.js.map +1 -0
- package/build/plugins/solution/fx-solution/utils/progressHelper.d.ts +0 -3
- package/build/plugins/solution/fx-solution/utils/progressHelper.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/utils/progressHelper.js +4 -8
- package/build/plugins/solution/fx-solution/utils/progressHelper.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/adaptor.js +6 -6
- package/build/plugins/solution/fx-solution/v2/adaptor.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/checkPermission.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/checkPermission.js +20 -13
- package/build/plugins/solution/fx-solution/v2/checkPermission.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.js +2 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.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 +8 -10
- package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js +52 -24
- 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 +27 -11
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/grantPermission.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/grantPermission.js +16 -16
- package/build/plugins/solution/fx-solution/v2/grantPermission.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.js +24 -17
- package/build/plugins/solution/fx-solution/v2/listCollaborator.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 +20 -15
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js +10 -3
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js +12 -6
- package/build/plugins/solution/fx-solution/v2/publish.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.js +21 -21
- package/build/plugins/solution/fx-solution/v2/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +21 -11
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addFeature.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addFeature.js +8 -15
- package/build/plugins/solution/fx-solution/v3/addFeature.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/deploy.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/deploy.js +5 -7
- package/build/plugins/solution/fx-solution/v3/deploy.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provision.js +34 -21
- package/build/plugins/solution/fx-solution/v3/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/publish.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/publish.js +4 -1
- package/build/plugins/solution/fx-solution/v3/publish.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/userTask.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/userTask.js +12 -11
- package/build/plugins/solution/fx-solution/v3/userTask.js.map +1 -1
- package/build/plugins/solution/spfx-solution/addFeature.d.ts.map +1 -1
- package/build/plugins/solution/spfx-solution/addFeature.js +2 -2
- package/build/plugins/solution/spfx-solution/addFeature.js.map +1 -1
- package/package.json +9 -9
- package/resource/package.nls.json +515 -0
- package/templates/core/README-auto-generated.md +0 -0
- package/templates/plugins/resource/aad/manifest/aad.template.json +116 -0
- package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep +14 -8
- package/templates/plugins/resource/bot/bot.csharp.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.js.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.ts.default.zip +0 -0
- package/templates/plugins/resource/cicd/azdo/README.md +48 -0
- package/templates/plugins/resource/cicd/azdo/cd.yml +55 -0
- package/templates/plugins/resource/cicd/azdo/ci.yml +37 -0
- package/templates/plugins/resource/cicd/azdo/provision.yml +54 -0
- package/templates/plugins/resource/cicd/azdo/publish.yml +46 -0
- package/templates/plugins/resource/cicd/github/README.md +48 -0
- package/templates/plugins/resource/cicd/github/cd.yml +71 -0
- package/templates/plugins/resource/cicd/github/ci.yml +34 -0
- package/templates/plugins/resource/cicd/github/provision.yml +65 -0
- package/templates/plugins/resource/cicd/github/publish.yml +47 -0
- package/templates/plugins/resource/cicd/jenkins/Jenkinsfile.cd +78 -0
- package/templates/plugins/resource/cicd/jenkins/Jenkinsfile.ci +34 -0
- package/templates/plugins/resource/cicd/jenkins/Jenkinsfile.provision +79 -0
- package/templates/plugins/resource/cicd/jenkins/Jenkinsfile.publish +57 -0
- package/templates/plugins/resource/cicd/jenkins/README.md +45 -0
- package/templates/plugins/resource/dotnet/blazor-base.csharp.default.zip +0 -0
- package/templates/plugins/resource/frontend/tab.csharp.default.zip +0 -0
- package/templates/plugins/resource/frontend/tab.js.default.zip +0 -0
- package/templates/plugins/resource/frontend/tab.ts.default.zip +0 -0
- package/templates/plugins/resource/function/function-base.js.default.zip +0 -0
- package/templates/plugins/resource/function/function-base.ts.default.zip +0 -0
- package/templates/plugins/resource/function/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/plugins/resource/function/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/build/common/fileUtils.d.ts +0 -2
- package/build/common/fileUtils.d.ts.map +0 -1
- package/build/common/fileUtils.js +0 -46
- package/build/common/fileUtils.js.map +0 -1
- package/build/common/projectSettingsValidator.d.ts +0 -3
- package/build/common/projectSettingsValidator.d.ts.map +0 -1
- package/build/common/projectSettingsValidator.js +0 -54
- package/build/common/projectSettingsValidator.js.map +0 -1
- package/build/core/tools.d.ts +0 -8
- package/build/core/tools.d.ts.map +0 -1
- package/build/core/tools.js +0 -72
- package/build/core/tools.js.map +0 -1
- package/build/core/utils.d.ts +0 -3
- package/build/core/utils.d.ts.map +0 -1
- package/build/core/utils.js +0 -10
- package/build/core/utils.js.map +0 -1
- package/build/plugins/resource/aad/utils/common.d.ts +0 -19
- package/build/plugins/resource/aad/utils/common.d.ts.map +0 -1
- package/build/plugins/resource/aad/utils/common.js +0 -132
- package/build/plugins/resource/aad/utils/common.js.map +0 -1
- package/build/plugins/resource/frontend/dotnet/error-factory.d.ts +0 -10
- package/build/plugins/resource/frontend/dotnet/error-factory.d.ts.map +0 -1
- package/build/plugins/resource/frontend/dotnet/error-factory.js +0 -20
- package/build/plugins/resource/frontend/dotnet/error-factory.js.map +0 -1
- package/build/plugins/resource/identity/config.d.ts +0 -11
- package/build/plugins/resource/identity/config.d.ts.map +0 -1
- package/build/plugins/resource/identity/config.js +0 -17
- package/build/plugins/resource/identity/config.js.map +0 -1
- package/build/plugins/resource/identity/errors.d.ts +0 -11
- package/build/plugins/resource/identity/errors.d.ts.map +0 -1
- package/build/plugins/resource/identity/errors.js +0 -15
- package/build/plugins/resource/identity/errors.js.map +0 -1
- package/build/plugins/resource/identity/results.d.ts +0 -10
- package/build/plugins/resource/identity/results.d.ts.map +0 -1
- package/build/plugins/resource/identity/results.js +0 -18
- package/build/plugins/resource/identity/results.js.map +0 -1
- package/build/plugins/resource/identity/utils/commonUtils.d.ts +0 -2
- package/build/plugins/resource/identity/utils/commonUtils.d.ts.map +0 -1
- package/build/plugins/resource/identity/utils/commonUtils.js +0 -10
- package/build/plugins/resource/identity/utils/commonUtils.js.map +0 -1
- package/build/plugins/resource/identity/utils/contextUtils.d.ts +0 -5
- package/build/plugins/resource/identity/utils/contextUtils.d.ts.map +0 -1
- package/build/plugins/resource/identity/utils/contextUtils.js +0 -11
- package/build/plugins/resource/identity/utils/contextUtils.js.map +0 -1
- package/build/plugins/resource/identity/utils/messages.d.ts +0 -10
- package/build/plugins/resource/identity/utils/messages.d.ts.map +0 -1
- package/build/plugins/resource/identity/utils/messages.js +0 -15
- package/build/plugins/resource/identity/utils/messages.js.map +0 -1
- package/resource/strings.json +0 -103
- package/templates/plugins/resource/bot/bot-msgext.csharp.default.zip +0 -0
- package/templates/plugins/resource/bot/bot-msgext.js.default.zip +0 -0
- package/templates/plugins/resource/bot/bot-msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/bot/msgext.js.default.zip +0 -0
- package/templates/plugins/resource/bot/msgext.ts.default.zip +0 -0
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.grantPermission = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
4
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
6
5
|
const common_1 = require("../../../../common");
|
|
7
6
|
const constants_1 = require("../constants");
|
|
@@ -13,14 +12,14 @@ const executor_2 = require("./executor");
|
|
|
13
12
|
const collaborationUtil_1 = require("./collaborationUtil");
|
|
14
13
|
const utils_1 = require("./utils");
|
|
15
14
|
const __1 = require("..");
|
|
16
|
-
const util = tslib_1.__importStar(require("util"));
|
|
17
15
|
const typedi_1 = require("typedi");
|
|
16
|
+
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
18
17
|
async function grantPermissionImpl(param, envState, envName, telemetryReporter, ui, graphTokenProvider, logProvider, platform, email) {
|
|
19
18
|
var _a, _b;
|
|
20
19
|
telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.GrantPermissionStart, {
|
|
21
20
|
[constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
|
|
22
21
|
});
|
|
23
|
-
const progressBar = ui === null || ui === void 0 ? void 0 : ui.createProgressBar(
|
|
22
|
+
const progressBar = ui === null || ui === void 0 ? void 0 : ui.createProgressBar(localizeUtils_1.getLocalizedString("core.collaboration.GrantingPermission"), 1);
|
|
24
23
|
try {
|
|
25
24
|
const result = await collaborationUtil_1.CollaborationUtil.getCurrentUserInfo(graphTokenProvider);
|
|
26
25
|
if (result.isErr()) {
|
|
@@ -40,31 +39,31 @@ async function grantPermissionImpl(param, envState, envName, telemetryReporter,
|
|
|
40
39
|
});
|
|
41
40
|
}
|
|
42
41
|
if (!email || email === result.value.userPrincipalName) {
|
|
43
|
-
return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnUserError(new Error(
|
|
42
|
+
return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnUserError(new Error(localizeUtils_1.getLocalizedString("core.collaboration.EmailCannotBeEmptyOrSame")), constants_1.SolutionSource, constants_1.SolutionError.EmailCannotBeEmptyOrSame), telemetryReporter));
|
|
44
43
|
}
|
|
45
44
|
const userInfo = await collaborationUtil_1.CollaborationUtil.getUserInfo(graphTokenProvider, email);
|
|
46
45
|
if (!userInfo) {
|
|
47
|
-
return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnUserError(new Error(
|
|
46
|
+
return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnUserError(new Error(localizeUtils_1.getLocalizedString("core.collaboration.CannotFindUserInCurrentTenant")), constants_1.SolutionSource, constants_1.SolutionError.CannotFindUserInCurrentTenant), telemetryReporter));
|
|
48
47
|
}
|
|
49
48
|
progressBar === null || progressBar === void 0 ? void 0 : progressBar.start();
|
|
50
|
-
progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(
|
|
49
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(localizeUtils_1.getLocalizedString("core.collaboration.GrantPermissionForUser", email));
|
|
51
50
|
if (platform === teamsfx_api_1.Platform.CLI) {
|
|
52
51
|
const aadAppTenantId = (_a = envState.get(constants_1.PluginNames.SOLUTION)) === null || _a === void 0 ? void 0 : _a.get(__1.REMOTE_TEAMS_APP_TENANT_ID);
|
|
53
52
|
if (!envName) {
|
|
54
|
-
return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnSystemError(new Error(
|
|
53
|
+
return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnSystemError(new Error(localizeUtils_1.getLocalizedString("core.collaboration.FailedToGetEnvName")), constants_1.SolutionSource, constants_1.SolutionError.FailedToGetEnvName), telemetryReporter));
|
|
55
54
|
}
|
|
56
55
|
const message = [
|
|
57
56
|
{
|
|
58
|
-
content:
|
|
57
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.AccountToGrantPermission"),
|
|
59
58
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
60
59
|
},
|
|
61
60
|
{ content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
62
61
|
{
|
|
63
|
-
content:
|
|
62
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.StartingGrantPermission"),
|
|
64
63
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
65
64
|
},
|
|
66
65
|
{ content: `${envName}\n`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
67
|
-
{ content:
|
|
66
|
+
{ content: localizeUtils_1.getLocalizedString("core.collaboration.TenantId"), color: teamsfx_api_1.Colors.BRIGHT_WHITE },
|
|
68
67
|
{ content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
69
68
|
];
|
|
70
69
|
ui === null || ui === void 0 ? void 0 : ui.showMessage("info", message, false);
|
|
@@ -74,7 +73,7 @@ async function grantPermissionImpl(param, envState, envName, telemetryReporter,
|
|
|
74
73
|
: await executeGrantPermissionsV2(param.ctx, param.inputs, param.envInfo, param.tokenProvider, userInfo);
|
|
75
74
|
let errorMsg = "";
|
|
76
75
|
if (errors.length > 0) {
|
|
77
|
-
errorMsg +=
|
|
76
|
+
errorMsg += localizeUtils_1.getLocalizedString("core.collaboration.FailedToGrantPermission", email);
|
|
78
77
|
for (const fxError of errors) {
|
|
79
78
|
errorMsg += fxError.error.message + "\n";
|
|
80
79
|
}
|
|
@@ -84,12 +83,12 @@ async function grantPermissionImpl(param, envState, envName, telemetryReporter,
|
|
|
84
83
|
const message = [
|
|
85
84
|
{ content: `${(_b = permission.roles) === null || _b === void 0 ? void 0 : _b.join(",")} `, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
86
85
|
{
|
|
87
|
-
content:
|
|
86
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.PermissionHasBeenGrantTo"),
|
|
88
87
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
89
88
|
},
|
|
90
89
|
{ content: permission.name, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
91
90
|
{
|
|
92
|
-
content:
|
|
91
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.GrantPermissionResourceId"),
|
|
93
92
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
94
93
|
},
|
|
95
94
|
{ content: `${permission.resourceId}`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
@@ -97,10 +96,11 @@ async function grantPermissionImpl(param, envState, envName, telemetryReporter,
|
|
|
97
96
|
ui === null || ui === void 0 ? void 0 : ui.showMessage("info", message, false);
|
|
98
97
|
}
|
|
99
98
|
if (collaborationUtil_1.CollaborationUtil.isSpfxProject(param.ctx)) {
|
|
100
|
-
ui === null || ui === void 0 ? void 0 : ui.showMessage("info",
|
|
99
|
+
ui === null || ui === void 0 ? void 0 : ui.showMessage("info", localizeUtils_1.getLocalizedString("core.collaboration.SharePointTip") +
|
|
100
|
+
constants_1.SharePointManageSiteAdminHelpLink, false);
|
|
101
101
|
}
|
|
102
102
|
else {
|
|
103
|
-
ui === null || ui === void 0 ? void 0 : ui.showMessage("info",
|
|
103
|
+
ui === null || ui === void 0 ? void 0 : ui.showMessage("info", localizeUtils_1.getLocalizedString("core.collaboration.AzureTip") + constants_1.AzureRoleAssignmentsHelpLink, false);
|
|
104
104
|
}
|
|
105
105
|
if (errorMsg) {
|
|
106
106
|
ui === null || ui === void 0 ? void 0 : ui.showMessage("error", errorMsg, false);
|
|
@@ -139,7 +139,7 @@ async function grantPermission(param) {
|
|
|
139
139
|
else {
|
|
140
140
|
const configMap = teamsfx_api_1.ConfigMap.fromJSON(param.envInfo.state);
|
|
141
141
|
if (!configMap) {
|
|
142
|
-
return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(
|
|
142
|
+
return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(localizeUtils_1.getLocalizedString("core.collaboration.FailedToConvertProfile") +
|
|
143
143
|
JSON.stringify(param.envInfo.state)), constants_1.PluginNames.SOLUTION, constants_1.SolutionError.InternelError));
|
|
144
144
|
}
|
|
145
145
|
const envState = utils4v2_1.flattenConfigMap(configMap);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grantPermission.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/grantPermission.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"grantPermission.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/grantPermission.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listCollaborator.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/listCollaborator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAKP,MAAM,EAGN,eAAe,EACf,EAAE,EAEF,GAAG,EACH,aAAa,EAOd,MAAM,wBAAwB,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"listCollaborator.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/listCollaborator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAKP,MAAM,EAGN,eAAe,EACf,EAAE,EAEF,GAAG,EACH,aAAa,EAOd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAKL,sBAAsB,EAEvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,uDAAuD,CAAC;AAelF,OAAO,EAAE,cAAc,EAAqB,MAAM,qBAAqB,CAAC;AAQxE,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,SAAS,GAClB,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CA6BxD;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,eAAe,EACpB,QAAQ,EAAE,SAAS,GAClB,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CA+BxD;AA+MD,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC,CAmDlD"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.listCollaborator = exports.executeListCollaboratorV1 = exports.executeListCollaboratorV2 = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
4
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
6
5
|
const common_1 = require("../../../../common");
|
|
7
6
|
const constants_1 = require("../constants");
|
|
@@ -13,8 +12,7 @@ const collaborationUtil_1 = require("./collaborationUtil");
|
|
|
13
12
|
const utils_1 = require("./utils");
|
|
14
13
|
const typedi_1 = require("typedi");
|
|
15
14
|
const utils4v2_1 = require("../../../resource/utils4v2");
|
|
16
|
-
const
|
|
17
|
-
const util = tslib_1.__importStar(require("util"));
|
|
15
|
+
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
18
16
|
async function executeListCollaboratorV2(ctx, inputs, envInfo, tokenProvider, userInfo) {
|
|
19
17
|
const plugins = [
|
|
20
18
|
typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin),
|
|
@@ -92,14 +90,14 @@ async function listCollaboratorImpl(param, envState, envName, telemetryReporter,
|
|
|
92
90
|
}
|
|
93
91
|
const userInfo = result.value;
|
|
94
92
|
if (!envName) {
|
|
95
|
-
return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListCollaborator, teamsfx_api_1.returnSystemError(new Error(
|
|
93
|
+
return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListCollaborator, teamsfx_api_1.returnSystemError(new Error(localizeUtils_1.getLocalizedString("core.collaboration.FailedToGetEnvName")), constants_1.SolutionSource, constants_1.SolutionError.FailedToGetEnvName), telemetryReporter));
|
|
96
94
|
}
|
|
97
95
|
const [results, errors] = param.apiVersion === 1
|
|
98
96
|
? await executeListCollaboratorV1(param.ctx, userInfo)
|
|
99
97
|
: await executeListCollaboratorV2(param.ctx, param.inputs, param.envInfo, param.tokenProvider, userInfo);
|
|
100
98
|
let errorMsg = "";
|
|
101
99
|
if (errors.length > 0) {
|
|
102
|
-
errorMsg +=
|
|
100
|
+
errorMsg += localizeUtils_1.getLocalizedString("core.collaboration.FailedToListCollaborators");
|
|
103
101
|
for (const fxError of errors) {
|
|
104
102
|
errorMsg += fxError.error.message + "\n";
|
|
105
103
|
}
|
|
@@ -113,7 +111,7 @@ async function listCollaboratorImpl(param, envState, envName, telemetryReporter,
|
|
|
113
111
|
const collaborators = [];
|
|
114
112
|
const teamsAppId = (_b = (_a = teamsAppOwners[0]) === null || _a === void 0 ? void 0 : _a.resourceId) !== null && _b !== void 0 ? _b : "";
|
|
115
113
|
const aadAppId = (_d = (_c = aadOwners[0]) === null || _c === void 0 ? void 0 : _c.resourceId) !== null && _d !== void 0 ? _d : "";
|
|
116
|
-
const aadAppTenantId = (_e = envState.get(constants_1.PluginNames.SOLUTION)) === null || _e === void 0 ? void 0 : _e.get(
|
|
114
|
+
const aadAppTenantId = (_e = envState.get(constants_1.PluginNames.SOLUTION)) === null || _e === void 0 ? void 0 : _e.get(constants_1.REMOTE_TEAMS_APP_TENANT_ID);
|
|
117
115
|
for (const teamsAppOwner of teamsAppOwners) {
|
|
118
116
|
const aadOwner = aadOwners.find((owner) => owner.userObjectId === teamsAppOwner.userObjectId);
|
|
119
117
|
collaborators.push({
|
|
@@ -128,35 +126,44 @@ async function listCollaboratorImpl(param, envState, envName, telemetryReporter,
|
|
|
128
126
|
if (platform === teamsfx_api_1.Platform.CLI || platform === teamsfx_api_1.Platform.VSCode) {
|
|
129
127
|
const message = [
|
|
130
128
|
{
|
|
131
|
-
content:
|
|
129
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.ListingM365Permission"),
|
|
132
130
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
133
131
|
},
|
|
134
132
|
{
|
|
135
|
-
content:
|
|
133
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.AccountUsedToCheck"),
|
|
136
134
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
137
135
|
},
|
|
138
136
|
{ content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
139
137
|
{
|
|
140
|
-
content:
|
|
138
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.StartingListAllTeamsAppOwners"),
|
|
141
139
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
142
140
|
},
|
|
143
141
|
{ content: `${envName}\n`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
144
|
-
{ content:
|
|
142
|
+
{ content: localizeUtils_1.getLocalizedString("core.collaboration.TenantId"), color: teamsfx_api_1.Colors.BRIGHT_WHITE },
|
|
145
143
|
{ content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
146
|
-
{
|
|
144
|
+
{
|
|
145
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.M365TeamsAppId"),
|
|
146
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
147
|
+
},
|
|
147
148
|
{ content: teamsAppId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
148
149
|
];
|
|
149
150
|
if (isAadActivated) {
|
|
150
|
-
message.push({
|
|
151
|
+
message.push({
|
|
152
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.SsoAadAppId"),
|
|
153
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
154
|
+
}, { content: aadAppId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `)\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
|
|
151
155
|
}
|
|
152
156
|
else {
|
|
153
157
|
message.push({ content: ")\n", color: teamsfx_api_1.Colors.BRIGHT_WHITE });
|
|
154
158
|
}
|
|
155
159
|
for (const collaborator of collaborators) {
|
|
156
|
-
message.push({
|
|
160
|
+
message.push({
|
|
161
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.TeamsAppOwner"),
|
|
162
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
163
|
+
}, { content: collaborator.userPrincipalName, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `. `, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
|
|
157
164
|
if (isAadActivated && !collaborator.isAadOwner) {
|
|
158
165
|
message.push({
|
|
159
|
-
content:
|
|
166
|
+
content: localizeUtils_1.getLocalizedString("core.collaboration.NotOwnerOfSsoAadApp"),
|
|
160
167
|
color: teamsfx_api_1.Colors.BRIGHT_YELLOW,
|
|
161
168
|
});
|
|
162
169
|
}
|
|
@@ -166,9 +173,9 @@ async function listCollaboratorImpl(param, envState, envName, telemetryReporter,
|
|
|
166
173
|
ui === null || ui === void 0 ? void 0 : ui.showMessage("info", message, false);
|
|
167
174
|
}
|
|
168
175
|
else if (platform === teamsfx_api_1.Platform.VSCode) {
|
|
169
|
-
ui === null || ui === void 0 ? void 0 : ui.showMessage("info",
|
|
176
|
+
ui === null || ui === void 0 ? void 0 : ui.showMessage("info", localizeUtils_1.getLocalizedString("core.collaboration.ListCollaboratorsSuccess", collaborationUtil_1.CollaborationUtil.isSpfxProject(param.ctx)
|
|
170
177
|
? ""
|
|
171
|
-
:
|
|
178
|
+
: localizeUtils_1.getLocalizedString("core.collaboration.WithAadApp")), false);
|
|
172
179
|
logProvider === null || logProvider === void 0 ? void 0 : logProvider.info(message);
|
|
173
180
|
}
|
|
174
181
|
}
|
|
@@ -200,7 +207,7 @@ async function listCollaborator(param) {
|
|
|
200
207
|
else {
|
|
201
208
|
const configMap = teamsfx_api_1.ConfigMap.fromJSON(param.envInfo.state);
|
|
202
209
|
if (!configMap) {
|
|
203
|
-
return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(
|
|
210
|
+
return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(localizeUtils_1.getLocalizedString("core.collaboration.FailedToConvertProfile") +
|
|
204
211
|
JSON.stringify(param.envInfo.state)), constants_1.PluginNames.SOLUTION, constants_1.SolutionError.InternelError));
|
|
205
212
|
}
|
|
206
213
|
const envState = utils4v2_1.flattenConfigMap(configMap);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listCollaborator.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/listCollaborator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"listCollaborator.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/listCollaborator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,OAAO,EAEP,aAAa,EAEb,EAAE,EAEF,MAAM,EACN,IAAI,EAGL,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,OAAO,EAEP,aAAa,EAEb,EAAE,EAEF,MAAM,EACN,IAAI,EAGL,MAAM,wBAAwB,CAAC;AAiChC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA+OhC"}
|
|
@@ -7,7 +7,6 @@ const tools_1 = require("../../../../common/tools");
|
|
|
7
7
|
const executor_1 = require("./executor");
|
|
8
8
|
const utils_1 = require("./utils");
|
|
9
9
|
const constants_1 = require("../constants");
|
|
10
|
-
const util = tslib_1.__importStar(require("util"));
|
|
11
10
|
const lodash_1 = tslib_1.__importStar(require("lodash"));
|
|
12
11
|
const constants_2 = require("../../../../common/constants");
|
|
13
12
|
const adaptor_1 = require("./adaptor");
|
|
@@ -16,11 +15,12 @@ const typedi_1 = tslib_1.__importDefault(require("typedi"));
|
|
|
16
15
|
const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
|
|
17
16
|
const permissionRequest_1 = require("../../../../core/permissionRequest");
|
|
18
17
|
const constants_3 = require("../../../resource/appstudio/constants");
|
|
19
|
-
const utils_2 = require("../../../../core/utils");
|
|
20
18
|
const constants_4 = require("../v3/constants");
|
|
21
19
|
const provision_1 = require("../v3/provision");
|
|
22
20
|
const ResourceGroupHelper_1 = require("../utils/ResourceGroupHelper");
|
|
23
21
|
const solutionGlobalVars_1 = require("../v3/solutionGlobalVars");
|
|
22
|
+
const projectSettingsHelper_1 = require("../../../../common/projectSettingsHelper");
|
|
23
|
+
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
24
24
|
async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
25
25
|
var _a, _b, _c, _d;
|
|
26
26
|
const azureSolutionSettings = utils_1.getAzureSolutionSettings(ctx);
|
|
@@ -55,12 +55,14 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
55
55
|
solutionConfig.teamsAppTenantId = tenantIdInToken;
|
|
56
56
|
}
|
|
57
57
|
if (utils_1.isAzureProject(azureSolutionSettings)) {
|
|
58
|
-
if (ctx.
|
|
59
|
-
ctx.permissionRequestProvider
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
58
|
+
if (projectSettingsHelper_1.hasAAD(ctx.projectSetting)) {
|
|
59
|
+
if (ctx.permissionRequestProvider === undefined) {
|
|
60
|
+
ctx.permissionRequestProvider = new permissionRequest_1.PermissionRequestFileProvider(inputs.projectPath);
|
|
61
|
+
}
|
|
62
|
+
const result = await utils_1.ensurePermissionRequest(azureSolutionSettings, ctx.permissionRequestProvider);
|
|
63
|
+
if (result.isErr()) {
|
|
64
|
+
return teamsfx_api_1.err(result.error);
|
|
65
|
+
}
|
|
64
66
|
}
|
|
65
67
|
// ask common question and fill in solution config
|
|
66
68
|
const solutionConfigRes = await provision_1.fillInAzureConfigs(ctx, inputsNew, envInfo, tokenProvider);
|
|
@@ -80,7 +82,7 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
80
82
|
}
|
|
81
83
|
}
|
|
82
84
|
}
|
|
83
|
-
const pureExistingApp =
|
|
85
|
+
const pureExistingApp = projectSettingsHelper_1.isPureExistingApp(ctx.projectSetting);
|
|
84
86
|
envInfo.state[constants_1.GLOBAL_CONFIG][constants_1.SOLUTION_PROVISION_SUCCEEDED] = false;
|
|
85
87
|
const solutionInputs = utils_1.extractSolutionInputs(envInfo.state[constants_1.GLOBAL_CONFIG]);
|
|
86
88
|
// for minimized teamsfx project, there is only one plugin (app studio)
|
|
@@ -103,12 +105,12 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
103
105
|
};
|
|
104
106
|
});
|
|
105
107
|
// call provisionResources
|
|
106
|
-
(_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(
|
|
108
|
+
(_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(localizeUtils_1.getLocalizedString("core.provision.StartNotice", constants_2.PluginDisplayName.Solution));
|
|
107
109
|
const provisionResult = await executor_1.executeConcurrently(provisionThunks, ctx.logProvider);
|
|
108
110
|
if (provisionResult.kind === "failure" || provisionResult.kind === "partialSuccess") {
|
|
109
111
|
return teamsfx_api_1.err(provisionResult.error);
|
|
110
112
|
}
|
|
111
|
-
(_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(
|
|
113
|
+
(_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(localizeUtils_1.getLocalizedString("core.provision.ProvisionFinishNotice", constants_2.PluginDisplayName.Solution));
|
|
112
114
|
const teamsAppId = envInfo.state[constants_1.PluginNames.APPST][constants_3.Constants.TEAMS_APP_ID];
|
|
113
115
|
solutionGlobalVars_1.solutionGlobalVars.TeamsAppId = teamsAppId;
|
|
114
116
|
solutionInputs.remoteTeamsAppId = teamsAppId;
|
|
@@ -154,10 +156,10 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
154
156
|
});
|
|
155
157
|
//call configResource
|
|
156
158
|
const configureResourceResult = await executor_1.executeConcurrently(configureResourceThunks, ctx.logProvider);
|
|
157
|
-
(_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(
|
|
159
|
+
(_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(localizeUtils_1.getLocalizedString("core.provision.configurationFinishNotice", constants_2.PluginDisplayName.Solution));
|
|
158
160
|
if (configureResourceResult.kind === "failure" ||
|
|
159
161
|
configureResourceResult.kind === "partialSuccess") {
|
|
160
|
-
const msg =
|
|
162
|
+
const msg = localizeUtils_1.getLocalizedString("core.provision.failNotice", ctx.projectSetting.appName);
|
|
161
163
|
ctx.logProvider.error(msg);
|
|
162
164
|
solutionInputs[constants_1.SOLUTION_PROVISION_SUCCEEDED] = false;
|
|
163
165
|
return teamsfx_api_1.err(configureResourceResult.error);
|
|
@@ -166,10 +168,10 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
166
168
|
if (envInfo.state[constants_1.GLOBAL_CONFIG] && envInfo.state[constants_1.GLOBAL_CONFIG][constants_1.ARM_TEMPLATE_OUTPUT]) {
|
|
167
169
|
delete envInfo.state[constants_1.GLOBAL_CONFIG][constants_1.ARM_TEMPLATE_OUTPUT];
|
|
168
170
|
}
|
|
171
|
+
const msg = localizeUtils_1.getLocalizedString("core.provision.successNotice", ctx.projectSetting.appName);
|
|
172
|
+
(_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(msg);
|
|
169
173
|
if (!pureExistingApp) {
|
|
170
174
|
const url = tools_1.getResourceGroupInPortal(solutionInputs.subscriptionId, solutionInputs.tenantId, solutionInputs.resourceGroupName);
|
|
171
|
-
const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, ctx.projectSetting.appName);
|
|
172
|
-
(_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(msg);
|
|
173
175
|
if (url) {
|
|
174
176
|
const title = "View Provisioned Resources";
|
|
175
177
|
ctx.userInteraction.showMessage("info", msg, false, title).then((result) => {
|
|
@@ -183,6 +185,9 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
183
185
|
ctx.userInteraction.showMessage("info", msg, false);
|
|
184
186
|
}
|
|
185
187
|
}
|
|
188
|
+
else {
|
|
189
|
+
ctx.userInteraction.showMessage("info", msg, false);
|
|
190
|
+
}
|
|
186
191
|
envInfo.state[constants_1.GLOBAL_CONFIG][constants_1.SOLUTION_PROVISION_SUCCEEDED] = true;
|
|
187
192
|
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
188
193
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":";;;;AAAA,wDAYgC;AAChC,
|
|
1
|
+
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionLocal.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAwBhC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"provisionLocal.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAwBhC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,SAAS,GAClB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAwJrC"}
|
|
@@ -11,10 +11,11 @@ const typedi_1 = tslib_1.__importDefault(require("typedi"));
|
|
|
11
11
|
const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
|
|
12
12
|
const environment_1 = require("../../../../core/environment");
|
|
13
13
|
const permissionRequest_1 = require("../../../../core/permissionRequest");
|
|
14
|
-
const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
|
|
15
14
|
const provisionLocal_1 = require("../debug/provisionLocal");
|
|
16
15
|
const tools_1 = require("../../../../common/tools");
|
|
16
|
+
const projectSettingsHelper_1 = require("../../../../common/projectSettingsHelper");
|
|
17
17
|
async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider, envInfo) {
|
|
18
|
+
var _a;
|
|
18
19
|
if (inputs.projectPath === undefined) {
|
|
19
20
|
return new teamsfx_api_1.v2.FxFailure(teamsfx_api_1.returnSystemError(new Error("projectPath is undefined"), "Solution", constants_1.SolutionError.InternelError));
|
|
20
21
|
}
|
|
@@ -38,13 +39,19 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider,
|
|
|
38
39
|
localDebugTenantId = envInfo === null || envInfo === void 0 ? void 0 : envInfo.state.solution.teamsAppTenantId;
|
|
39
40
|
}
|
|
40
41
|
else {
|
|
41
|
-
|
|
42
|
+
if (!localSettings.teamsApp)
|
|
43
|
+
localSettings.teamsApp = {};
|
|
44
|
+
localDebugTenantId = (_a = localSettings.teamsApp) === null || _a === void 0 ? void 0 : _a.tenantId;
|
|
42
45
|
}
|
|
43
46
|
const m365TenantMatches = await utils_1.checkWhetherLocalDebugM365TenantMatches(localDebugTenantId, tokenProvider.appStudioToken);
|
|
44
47
|
if (m365TenantMatches.isErr()) {
|
|
45
48
|
return new teamsfx_api_1.v2.FxFailure(m365TenantMatches.error);
|
|
46
49
|
}
|
|
47
|
-
const
|
|
50
|
+
const pureExistingApp = projectSettingsHelper_1.isPureExistingApp(ctx.projectSetting);
|
|
51
|
+
// for minimized teamsfx project, there is only one plugin (app studio)
|
|
52
|
+
const plugins = pureExistingApp
|
|
53
|
+
? [typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin)]
|
|
54
|
+
: utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
48
55
|
const provisionLocalResourceThunks = plugins
|
|
49
56
|
.filter((plugin) => !lodash_1.isUndefined(plugin.provisionLocalResource))
|
|
50
57
|
.map((plugin) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":";;;;AAAA,wDAOgC;AAChC,yCAAiD;AACjD,mCAOiB;AACjB,4CAA0E;AAC1E,mCAAqC;AACrC,4DAA+B;AAC/B,wEAA+D;AAC/D,8DAAkE;AAClE,0EAAmF;
|
|
1
|
+
{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAEtB,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAEtB,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAgBhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAwChC"}
|