@microsoft/teamsfx-core 2.0.9-rc-hotfix.2 → 2.0.10-alpha.288b4cdfa.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/client/teamsDevPortalClient.d.ts +127 -0
- package/build/client/teamsDevPortalClient.d.ts.map +1 -0
- package/build/client/teamsDevPortalClient.js +934 -0
- package/build/client/teamsDevPortalClient.js.map +1 -0
- package/build/common/azureUtils.d.ts +3 -0
- package/build/common/azureUtils.d.ts.map +1 -0
- package/build/common/azureUtils.js +50 -0
- package/build/common/azureUtils.js.map +1 -0
- package/build/common/constants.d.ts +11 -1
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +44 -3
- package/build/common/constants.js.map +1 -1
- package/build/common/featureFlags.d.ts +4 -5
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +2 -10
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/globalState.js +3 -3
- package/build/{core → common}/globalVars.d.ts +2 -1
- package/build/common/globalVars.d.ts.map +1 -0
- package/build/{core → common}/globalVars.js +11 -1
- package/build/common/globalVars.js.map +1 -0
- package/build/common/localizeUtils.js +1 -1
- package/build/common/localizeUtils.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts +5 -0
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +31 -1
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/requestUtils.d.ts +4 -0
- package/build/common/requestUtils.d.ts.map +1 -0
- package/build/common/requestUtils.js +52 -0
- package/build/common/requestUtils.js.map +1 -0
- package/build/common/samples.d.ts +6 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +4 -4
- package/build/common/samples.js.map +1 -1
- package/build/common/stringUtils.d.ts +8 -0
- package/build/common/stringUtils.d.ts.map +1 -1
- package/build/common/stringUtils.js +63 -1
- package/build/common/stringUtils.js.map +1 -1
- package/build/common/telemetry.d.ts +30 -11
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +79 -74
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts +1 -31
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +6 -245
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts +1 -3
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +5 -14
- package/build/common/utils.js.map +1 -1
- package/build/common/wrappedAxiosClient.js +5 -5
- package/build/common/wrappedAxiosClient.js.map +1 -1
- package/build/component/configManager/lifecycle.js +1 -1
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.js +1 -1
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constants.d.ts +3 -223
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +4 -247
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +74 -72
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/deps-checker/checkerFactory.d.ts.map +1 -0
- package/build/component/deps-checker/checkerFactory.js.map +1 -0
- package/build/{common → component}/deps-checker/constant/helpLink.d.ts +0 -3
- package/build/component/deps-checker/constant/helpLink.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/constant/helpLink.js +1 -6
- package/build/component/deps-checker/constant/helpLink.js.map +1 -0
- package/build/component/deps-checker/constant/index.d.ts.map +1 -0
- package/build/component/deps-checker/constant/index.js.map +1 -0
- package/build/component/deps-checker/constant/message.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/constant/message.js +1 -1
- package/build/component/deps-checker/constant/message.js.map +1 -0
- package/build/component/deps-checker/constant/telemetry.d.ts.map +1 -0
- package/build/component/deps-checker/constant/telemetry.js.map +1 -0
- package/build/component/deps-checker/coreDepsLoggerAdapter.d.ts.map +1 -0
- package/build/component/deps-checker/coreDepsLoggerAdapter.js.map +1 -0
- package/build/component/deps-checker/coreDepsTelemetryAdapter.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/coreDepsTelemetryAdapter.js +4 -4
- package/build/component/deps-checker/coreDepsTelemetryAdapter.js.map +1 -0
- package/build/component/deps-checker/depsChecker.d.ts.map +1 -0
- package/build/component/deps-checker/depsChecker.js.map +1 -0
- package/build/component/deps-checker/depsError.d.ts.map +1 -0
- package/build/component/deps-checker/depsError.js.map +1 -0
- package/build/component/deps-checker/depsLogger.d.ts.map +1 -0
- package/build/component/deps-checker/depsLogger.js.map +1 -0
- package/build/component/deps-checker/depsManager.d.ts.map +1 -0
- package/build/component/deps-checker/depsManager.js.map +1 -0
- package/build/component/deps-checker/depsTelemetry.d.ts.map +1 -0
- package/build/component/deps-checker/depsTelemetry.js.map +1 -0
- package/build/component/deps-checker/index.d.ts.map +1 -0
- package/build/component/deps-checker/index.js.map +1 -0
- package/build/component/deps-checker/internal/dotnetChecker.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/internal/dotnetChecker.js +1 -1
- package/build/component/deps-checker/internal/dotnetChecker.js.map +1 -0
- package/build/component/deps-checker/internal/funcToolChecker.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/internal/funcToolChecker.js +4 -4
- package/build/component/deps-checker/internal/funcToolChecker.js.map +1 -0
- package/build/component/deps-checker/internal/nodeChecker.d.ts.map +1 -0
- package/build/component/deps-checker/internal/nodeChecker.js.map +1 -0
- package/build/component/deps-checker/internal/testToolChecker.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/internal/testToolChecker.js +1 -1
- package/build/component/deps-checker/internal/testToolChecker.js.map +1 -0
- package/build/component/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -0
- package/build/{common → component}/deps-checker/internal/vxTestAppChecker.js +9 -3
- package/build/component/deps-checker/internal/vxTestAppChecker.js.map +1 -0
- package/build/component/deps-checker/util/cpUtils.d.ts.map +1 -0
- package/build/component/deps-checker/util/cpUtils.js.map +1 -0
- package/build/component/deps-checker/util/downloadHelper.d.ts.map +1 -0
- package/build/component/deps-checker/util/downloadHelper.js.map +1 -0
- package/build/component/deps-checker/util/fileHelper.d.ts.map +1 -0
- package/build/component/deps-checker/util/fileHelper.js.map +1 -0
- package/build/component/deps-checker/util/index.d.ts.map +1 -0
- package/build/component/deps-checker/util/index.js.map +1 -0
- package/build/component/deps-checker/util/progressIndicator.d.ts.map +1 -0
- package/build/component/deps-checker/util/progressIndicator.js.map +1 -0
- package/build/component/deps-checker/util/system.d.ts.map +1 -0
- package/build/component/deps-checker/util/system.js.map +1 -0
- package/build/component/developerPortalScaffoldUtils.d.ts +1 -5
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +71 -87
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +17 -18
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +10 -10
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.d.ts +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.d.ts.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js +11 -11
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/add/addWebPart.d.ts +2 -2
- package/build/component/driver/add/addWebPart.d.ts.map +1 -1
- package/build/component/driver/add/addWebPart.js +29 -29
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +16 -16
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/update.d.ts +1 -1
- package/build/component/driver/apiKey/update.d.ts.map +1 -1
- package/build/component/driver/apiKey/update.js +15 -15
- package/build/component/driver/apiKey/update.js.map +1 -1
- package/build/component/driver/arm/deployImpl.js +1 -1
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.d.ts.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +25 -5
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/util/handleError.js +2 -2
- package/build/component/driver/arm/util/handleError.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts +4 -4
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +13 -13
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +19 -18
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js +1 -1
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/error/funcInstallationUserError.js +1 -1
- package/build/component/driver/devTool/error/funcInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/error/testToolInstallationUserError.js +1 -1
- package/build/component/driver/devTool/error/testToolInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts +1 -1
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +6 -6
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/m365/acquire.js +4 -4
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js +5 -5
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.d.ts.map +1 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.js +3 -3
- package/build/component/driver/middleware/addStartAndEndTelemetry.js.map +1 -1
- package/build/component/driver/oauth/create.d.ts +1 -1
- package/build/component/driver/oauth/create.d.ts.map +1 -1
- package/build/component/driver/oauth/create.js +23 -24
- package/build/component/driver/oauth/create.js.map +1 -1
- package/build/component/driver/oauth/update.d.ts +1 -1
- package/build/component/driver/oauth/update.d.ts.map +1 -1
- package/build/component/driver/oauth/update.js +15 -15
- package/build/component/driver/oauth/update.js.map +1 -1
- package/build/component/driver/oauth/utility/utility.js +2 -2
- package/build/component/driver/oauth/utility/utility.js.map +1 -1
- package/build/component/driver/script/scriptDriver.js +1 -1
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +25 -25
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +7 -4
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +60 -60
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +16 -16
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +0 -2
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +14 -24
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts +2 -2
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +19 -19
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +21 -21
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.js +8 -8
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +29 -22
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +34 -34
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +0 -9
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +0 -9
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +1 -1
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +2 -5
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +18 -18
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.d.ts +3 -3
- package/build/component/driver/teamsApp/validateTestCases.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.js +20 -19
- package/build/component/driver/teamsApp/validateTestCases.js.map +1 -1
- package/build/component/driver/util/utils.d.ts +3 -0
- package/build/component/driver/util/utils.d.ts.map +1 -1
- package/build/component/driver/util/utils.js +16 -1
- package/build/component/driver/util/utils.js.map +1 -1
- package/build/component/driver/util/wrapUtil.d.ts.map +1 -1
- package/build/component/driver/util/wrapUtil.js +8 -5
- package/build/component/driver/util/wrapUtil.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +25 -24
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/feature/sso.js +4 -3
- package/build/component/feature/sso.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +10 -2
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +222 -98
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +5 -14
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +60 -110
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +7 -7
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +1 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +8 -16
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/generatorProvider.d.ts.map +1 -1
- package/build/component/generator/generatorProvider.js +6 -2
- package/build/component/generator/generatorProvider.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +2 -2
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +37 -36
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts +5 -0
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +37 -0
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts +9 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeXMLAddin/generator.js +74 -11
- package/build/component/generator/officeXMLAddin/generator.js.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts +2 -4
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.js +1 -11
- package/build/component/generator/officeXMLAddin/projectConfig.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +8 -7
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +3 -2
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/error.d.ts +0 -1
- package/build/component/generator/spfx/error.d.ts.map +1 -1
- package/build/component/generator/spfx/error.js +1 -5
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts +2 -2
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +27 -29
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +0 -13
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +1 -16
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetry-helper.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/telemetry-helper.js +11 -9
- package/build/component/generator/spfx/utils/telemetry-helper.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.d.ts +1 -1
- package/build/component/generator/spfx/utils/utils.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +1 -1
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/templates/ssrTabGenerator.d.ts.map +1 -1
- package/build/component/generator/templates/ssrTabGenerator.js +5 -5
- package/build/component/generator/templates/ssrTabGenerator.js.map +1 -1
- package/build/component/generator/templates/templateGenerator.d.ts +3 -3
- package/build/component/generator/templates/templateGenerator.d.ts.map +1 -1
- package/build/component/generator/templates/templateGenerator.js +4 -6
- package/build/component/generator/templates/templateGenerator.js.map +1 -1
- package/build/component/generator/templates/templateNames.d.ts +2 -0
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +112 -109
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.js +9 -9
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/component/generator/utils.d.ts +4 -12
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +48 -79
- package/build/component/generator/utils.js.map +1 -1
- package/build/{common → component}/local/constants.d.ts +1 -0
- package/build/component/local/constants.d.ts.map +1 -0
- package/build/{common → component}/local/constants.js +1 -0
- package/build/component/local/constants.js.map +1 -0
- package/build/component/local/index.d.ts.map +1 -0
- package/build/component/local/index.js.map +1 -0
- package/build/component/local/localCertificateManager.d.ts.map +1 -0
- package/build/{common → component}/local/localCertificateManager.js +2 -2
- package/build/component/local/localCertificateManager.js.map +1 -0
- package/build/component/local/localEnvManager.d.ts.map +1 -0
- package/build/component/local/localEnvManager.js.map +1 -0
- package/build/component/local/localTelemetryReporter.d.ts.map +1 -0
- package/build/{common → component}/local/localTelemetryReporter.js +1 -1
- package/build/component/local/localTelemetryReporter.js.map +1 -0
- package/build/component/local/npmLogHelper.d.ts.map +1 -0
- package/build/component/local/npmLogHelper.js.map +1 -0
- package/build/component/local/packageJsonHelper.d.ts.map +1 -0
- package/build/component/local/packageJsonHelper.js.map +1 -0
- package/build/component/local/portChecker.d.ts.map +1 -0
- package/build/{common → component}/local/portChecker.js +2 -2
- package/build/component/local/portChecker.js.map +1 -0
- package/build/component/local/process.d.ts.map +1 -0
- package/build/component/local/process.js.map +1 -0
- package/build/component/local/taskDefinition.d.ts.map +1 -0
- package/build/{common → component}/local/taskDefinition.js +3 -3
- package/build/component/local/taskDefinition.js.map +1 -0
- package/build/component/m365/constants.d.ts.map +1 -0
- package/build/component/m365/constants.js.map +1 -0
- package/build/component/m365/errors.d.ts.map +1 -0
- package/build/{common → component}/m365/errors.js +1 -1
- package/build/component/m365/errors.js.map +1 -0
- package/build/{common → component}/m365/launchHelper.d.ts +1 -1
- package/build/component/m365/launchHelper.d.ts.map +1 -0
- package/build/{common → component}/m365/launchHelper.js +13 -13
- package/build/component/m365/launchHelper.js.map +1 -0
- package/build/component/m365/packageService.d.ts.map +1 -0
- package/build/{common → component}/m365/packageService.js +12 -12
- package/build/component/m365/packageService.js.map +1 -0
- package/build/component/m365/serviceConstant.d.ts +3 -0
- package/build/component/m365/serviceConstant.d.ts.map +1 -0
- package/build/component/m365/serviceConstant.js +8 -0
- package/build/component/m365/serviceConstant.js.map +1 -0
- package/build/component/middleware/actionExecutionMW.d.ts +1 -1
- package/build/component/middleware/actionExecutionMW.d.ts.map +1 -1
- package/build/component/middleware/actionExecutionMW.js +9 -9
- package/build/component/middleware/actionExecutionMW.js.map +1 -1
- package/build/component/middleware/envMW.js +4 -4
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/middleware/questionMW.js +1 -1
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/migrate.d.ts +32 -0
- package/build/component/migrate.d.ts.map +1 -1
- package/build/component/migrate.js +109 -32
- package/build/component/migrate.js.map +1 -1
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +5 -6
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +12 -11
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js +9 -6
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js.map +1 -1
- package/build/component/resource/botService/constants.d.ts +0 -13
- package/build/component/resource/botService/constants.d.ts.map +1 -1
- package/build/component/resource/botService/constants.js +1 -15
- package/build/component/resource/botService/constants.js.map +1 -1
- package/build/component/telemetry.d.ts.map +1 -1
- package/build/component/telemetry.js +6 -7
- package/build/component/telemetry.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts +10 -2
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +135 -42
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/charsetUtils.d.ts +1 -1
- package/build/component/utils/charsetUtils.d.ts.map +1 -1
- package/build/component/utils/charsetUtils.js +3 -1
- package/build/component/utils/charsetUtils.js.map +1 -1
- package/build/component/utils/depsChecker/common.d.ts +1 -3
- package/build/component/utils/depsChecker/common.d.ts.map +1 -1
- package/build/component/utils/depsChecker/common.js +0 -2
- package/build/component/utils/depsChecker/common.js.map +1 -1
- package/build/component/utils/envUtil.js +2 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/metadataUtil.js +1 -1
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/component/utils/pathUtils.d.ts.map +1 -1
- package/build/component/utils/pathUtils.js +9 -11
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/settingsUtil.js +1 -1
- package/build/component/utils/settingsUtil.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.d.ts.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +6 -9
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/core/FxCore.d.ts +3 -4
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +74 -103
- package/build/core/FxCore.js.map +1 -1
- package/build/core/callback.d.ts +2 -2
- package/build/core/callback.d.ts.map +1 -1
- package/build/core/callback.js.map +1 -1
- package/build/core/collaborator.d.ts.map +1 -1
- package/build/core/collaborator.js +9 -11
- package/build/core/collaborator.js.map +1 -1
- package/build/core/crypto.d.ts.map +1 -1
- package/build/core/crypto.js +1 -2
- package/build/core/crypto.js.map +1 -1
- package/build/core/environmentName.d.ts +0 -1
- package/build/core/environmentName.d.ts.map +1 -1
- package/build/core/environmentName.js +0 -2
- package/build/core/environmentName.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +11 -12
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/errorHandler.js +1 -1
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +5 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +32 -28
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +1 -1
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +5 -5
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.js +1 -1
- package/build/core/middleware/utils/MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.d.ts +1 -0
- package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +12 -6
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +2 -2
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +4 -4
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/core/middleware/videoFilterAppBlocker.d.ts +2 -0
- package/build/core/middleware/videoFilterAppBlocker.d.ts.map +1 -1
- package/build/core/middleware/videoFilterAppBlocker.js +21 -5
- package/build/core/middleware/videoFilterAppBlocker.js.map +1 -1
- package/build/core/telemetry.d.ts +0 -5
- package/build/core/telemetry.d.ts.map +1 -1
- package/build/core/telemetry.js +9 -17
- package/build/core/telemetry.js.map +1 -1
- package/build/error/common.d.ts +32 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +101 -2
- package/build/error/common.js.map +1 -1
- package/build/error/teamsApp.d.ts +3 -0
- package/build/error/teamsApp.d.ts.map +1 -1
- package/build/error/teamsApp.js +12 -1
- package/build/error/teamsApp.js.map +1 -1
- package/build/error/yml.js +1 -1
- package/build/error/yml.js.map +1 -1
- package/build/index.d.ts +56 -36
- package/build/index.d.ts.map +1 -1
- package/build/index.js +125 -52
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +249 -1
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +1091 -11
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +10 -150
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +277 -1239
- package/build/question/create.js.map +1 -1
- package/build/question/index.d.ts +1 -3
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +2 -6
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +4 -4
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +14 -14
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.d.ts +2 -28
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +66 -272
- package/build/question/other.js.map +1 -1
- package/package.json +11 -9
- package/resource/deps-checker/dotnet-install.ps1 +912 -423
- package/resource/deps-checker/dotnet-install.sh +876 -238
- package/resource/package.nls.json +7 -22
- package/resource/yaml-schema/v1.6/yaml.schema.json +1829 -0
- package/resource/yaml-schema/yaml.schema.json +46 -1
- package/templates/core/v3Migration/js.ts.app.local.yml +3 -3
- 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/aad.manifest.template.json +6 -0
- package/templates/plugins/resource/aad/manifest/aad.template.json +6 -0
- package/templates/plugins/resource/aad/manifest/bot/aad.manifest.template.json +6 -0
- package/templates/plugins/resource/aad/manifest/tab/aad.manifest.template.json +6 -0
- package/build/common/deps-checker/checkerFactory.d.ts.map +0 -1
- package/build/common/deps-checker/checkerFactory.js.map +0 -1
- package/build/common/deps-checker/constant/helpLink.d.ts.map +0 -1
- package/build/common/deps-checker/constant/helpLink.js.map +0 -1
- package/build/common/deps-checker/constant/index.d.ts.map +0 -1
- package/build/common/deps-checker/constant/index.js.map +0 -1
- package/build/common/deps-checker/constant/message.d.ts.map +0 -1
- package/build/common/deps-checker/constant/message.js.map +0 -1
- package/build/common/deps-checker/constant/telemetry.d.ts.map +0 -1
- package/build/common/deps-checker/constant/telemetry.js.map +0 -1
- package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts.map +0 -1
- package/build/common/deps-checker/coreDepsLoggerAdapter.js.map +0 -1
- package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts.map +0 -1
- package/build/common/deps-checker/coreDepsTelemetryAdapter.js.map +0 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +0 -1
- package/build/common/deps-checker/depsChecker.js.map +0 -1
- package/build/common/deps-checker/depsError.d.ts.map +0 -1
- package/build/common/deps-checker/depsError.js.map +0 -1
- package/build/common/deps-checker/depsLogger.d.ts.map +0 -1
- package/build/common/deps-checker/depsLogger.js.map +0 -1
- package/build/common/deps-checker/depsManager.d.ts.map +0 -1
- package/build/common/deps-checker/depsManager.js.map +0 -1
- package/build/common/deps-checker/depsTelemetry.d.ts.map +0 -1
- package/build/common/deps-checker/depsTelemetry.js.map +0 -1
- package/build/common/deps-checker/index.d.ts.map +0 -1
- package/build/common/deps-checker/index.js.map +0 -1
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/dotnetChecker.js.map +0 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/funcToolChecker.js.map +0 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/nodeChecker.js.map +0 -1
- package/build/common/deps-checker/internal/testToolChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/testToolChecker.js.map +0 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +0 -1
- package/build/common/deps-checker/util/cpUtils.d.ts.map +0 -1
- package/build/common/deps-checker/util/cpUtils.js.map +0 -1
- package/build/common/deps-checker/util/downloadHelper.d.ts.map +0 -1
- package/build/common/deps-checker/util/downloadHelper.js.map +0 -1
- package/build/common/deps-checker/util/fileHelper.d.ts.map +0 -1
- package/build/common/deps-checker/util/fileHelper.js.map +0 -1
- package/build/common/deps-checker/util/index.d.ts.map +0 -1
- package/build/common/deps-checker/util/index.js.map +0 -1
- package/build/common/deps-checker/util/progressIndicator.d.ts.map +0 -1
- package/build/common/deps-checker/util/progressIndicator.js.map +0 -1
- package/build/common/deps-checker/util/system.d.ts.map +0 -1
- package/build/common/deps-checker/util/system.js.map +0 -1
- package/build/common/local/constants.d.ts.map +0 -1
- package/build/common/local/constants.js.map +0 -1
- package/build/common/local/index.d.ts.map +0 -1
- package/build/common/local/index.js.map +0 -1
- package/build/common/local/localCertificateManager.d.ts.map +0 -1
- package/build/common/local/localCertificateManager.js.map +0 -1
- package/build/common/local/localEnvManager.d.ts.map +0 -1
- package/build/common/local/localEnvManager.js.map +0 -1
- package/build/common/local/localTelemetryReporter.d.ts.map +0 -1
- package/build/common/local/localTelemetryReporter.js.map +0 -1
- package/build/common/local/npmLogHelper.d.ts.map +0 -1
- package/build/common/local/npmLogHelper.js.map +0 -1
- package/build/common/local/packageJsonHelper.d.ts.map +0 -1
- package/build/common/local/packageJsonHelper.js.map +0 -1
- package/build/common/local/portChecker.d.ts.map +0 -1
- package/build/common/local/portChecker.js.map +0 -1
- package/build/common/local/process.d.ts.map +0 -1
- package/build/common/local/process.js.map +0 -1
- package/build/common/local/taskDefinition.d.ts.map +0 -1
- package/build/common/local/taskDefinition.js.map +0 -1
- package/build/common/m365/constants.d.ts.map +0 -1
- package/build/common/m365/constants.js.map +0 -1
- package/build/common/m365/errors.d.ts.map +0 -1
- package/build/common/m365/errors.js.map +0 -1
- package/build/common/m365/launchHelper.d.ts.map +0 -1
- package/build/common/m365/launchHelper.js.map +0 -1
- package/build/common/m365/packageService.d.ts.map +0 -1
- package/build/common/m365/packageService.js.map +0 -1
- package/build/common/m365/serviceConstant.d.ts +0 -3
- package/build/common/m365/serviceConstant.d.ts.map +0 -1
- package/build/common/m365/serviceConstant.js +0 -8
- package/build/common/m365/serviceConstant.js.map +0 -1
- package/build/common/projectSettingsHelperV3.d.ts +0 -2
- package/build/common/projectSettingsHelperV3.d.ts.map +0 -1
- package/build/common/projectSettingsHelperV3.js +0 -15
- package/build/common/projectSettingsHelperV3.js.map +0 -1
- package/build/component/utils.d.ts +0 -12
- package/build/component/utils.d.ts.map +0 -1
- package/build/component/utils.js +0 -136
- package/build/component/utils.js.map +0 -1
- package/build/component/workflow.d.ts +0 -4
- package/build/component/workflow.d.ts.map +0 -1
- package/build/component/workflow.js +0 -18
- package/build/component/workflow.js.map +0 -1
- package/build/core/error.d.ts +0 -32
- package/build/core/error.d.ts.map +0 -1
- package/build/core/error.js +0 -122
- package/build/core/error.js.map +0 -1
- package/build/core/globalVars.d.ts.map +0 -1
- package/build/core/globalVars.js.map +0 -1
- package/build/failpoint/index.d.ts +0 -3
- package/build/failpoint/index.d.ts.map +0 -1
- package/build/failpoint/index.js +0 -11
- package/build/failpoint/index.js.map +0 -1
- package/build/failpoint/marker.d.ts +0 -13
- package/build/failpoint/marker.d.ts.map +0 -1
- package/build/failpoint/marker.js +0 -8
- package/build/failpoint/marker.js.map +0 -1
- package/build/failpoint/runtime.d.ts +0 -12
- package/build/failpoint/runtime.d.ts.map +0 -1
- package/build/failpoint/runtime.js +0 -67
- package/build/failpoint/runtime.js.map +0 -1
- package/build/question/questionNames.d.ts +0 -78
- package/build/question/questionNames.d.ts.map +0 -1
- package/build/question/questionNames.js +0 -85
- package/build/question/questionNames.js.map +0 -1
- package/build/question/util.d.ts +0 -2
- package/build/question/util.d.ts.map +0 -1
- package/build/question/util.js +0 -18
- package/build/question/util.js.map +0 -1
- /package/build/{common → component}/deps-checker/checkerFactory.d.ts +0 -0
- /package/build/{common → component}/deps-checker/checkerFactory.js +0 -0
- /package/build/{common → component}/deps-checker/constant/index.d.ts +0 -0
- /package/build/{common → component}/deps-checker/constant/index.js +0 -0
- /package/build/{common → component}/deps-checker/constant/message.d.ts +0 -0
- /package/build/{common → component}/deps-checker/constant/telemetry.d.ts +0 -0
- /package/build/{common → component}/deps-checker/constant/telemetry.js +0 -0
- /package/build/{common → component}/deps-checker/coreDepsLoggerAdapter.d.ts +0 -0
- /package/build/{common → component}/deps-checker/coreDepsLoggerAdapter.js +0 -0
- /package/build/{common → component}/deps-checker/coreDepsTelemetryAdapter.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsChecker.js +0 -0
- /package/build/{common → component}/deps-checker/depsError.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsError.js +0 -0
- /package/build/{common → component}/deps-checker/depsLogger.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsLogger.js +0 -0
- /package/build/{common → component}/deps-checker/depsManager.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsManager.js +0 -0
- /package/build/{common → component}/deps-checker/depsTelemetry.d.ts +0 -0
- /package/build/{common → component}/deps-checker/depsTelemetry.js +0 -0
- /package/build/{common → component}/deps-checker/index.d.ts +0 -0
- /package/build/{common → component}/deps-checker/index.js +0 -0
- /package/build/{common → component}/deps-checker/internal/dotnetChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/internal/funcToolChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/internal/nodeChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/internal/nodeChecker.js +0 -0
- /package/build/{common → component}/deps-checker/internal/testToolChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/internal/vxTestAppChecker.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/cpUtils.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/cpUtils.js +0 -0
- /package/build/{common → component}/deps-checker/util/downloadHelper.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/downloadHelper.js +0 -0
- /package/build/{common → component}/deps-checker/util/fileHelper.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/fileHelper.js +0 -0
- /package/build/{common → component}/deps-checker/util/index.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/index.js +0 -0
- /package/build/{common → component}/deps-checker/util/progressIndicator.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/progressIndicator.js +0 -0
- /package/build/{common → component}/deps-checker/util/system.d.ts +0 -0
- /package/build/{common → component}/deps-checker/util/system.js +0 -0
- /package/build/{common → component}/local/index.d.ts +0 -0
- /package/build/{common → component}/local/index.js +0 -0
- /package/build/{common → component}/local/localCertificateManager.d.ts +0 -0
- /package/build/{common → component}/local/localEnvManager.d.ts +0 -0
- /package/build/{common → component}/local/localEnvManager.js +0 -0
- /package/build/{common → component}/local/localTelemetryReporter.d.ts +0 -0
- /package/build/{common → component}/local/npmLogHelper.d.ts +0 -0
- /package/build/{common → component}/local/npmLogHelper.js +0 -0
- /package/build/{common → component}/local/packageJsonHelper.d.ts +0 -0
- /package/build/{common → component}/local/packageJsonHelper.js +0 -0
- /package/build/{common → component}/local/portChecker.d.ts +0 -0
- /package/build/{common → component}/local/process.d.ts +0 -0
- /package/build/{common → component}/local/process.js +0 -0
- /package/build/{common → component}/local/taskDefinition.d.ts +0 -0
- /package/build/{common → component}/m365/constants.d.ts +0 -0
- /package/build/{common → component}/m365/constants.js +0 -0
- /package/build/{common → component}/m365/errors.d.ts +0 -0
- /package/build/{common → component}/m365/packageService.d.ts +0 -0
|
@@ -7,26 +7,26 @@ const tslib_1 = require("tslib");
|
|
|
7
7
|
/**
|
|
8
8
|
* @author Ning Liu <nliu@microsoft.com>
|
|
9
9
|
*/
|
|
10
|
-
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
11
10
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
12
|
-
const
|
|
11
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
12
|
+
const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
13
13
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
14
|
-
const path = tslib_1.__importStar(require("path"));
|
|
15
|
-
const os_1 = require("os");
|
|
16
14
|
const lodash_1 = require("lodash");
|
|
17
|
-
const
|
|
18
|
-
const
|
|
19
|
-
const
|
|
20
|
-
const
|
|
21
|
-
const
|
|
22
|
-
const appStudioClient_1 = require("./clients/appStudioClient");
|
|
15
|
+
const os_1 = require("os");
|
|
16
|
+
const path = tslib_1.__importStar(require("path"));
|
|
17
|
+
const typedi_1 = require("typedi");
|
|
18
|
+
const teamsDevPortalClient_1 = require("../../../client/teamsDevPortalClient");
|
|
19
|
+
const constants_1 = require("../../../common/constants");
|
|
23
20
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
24
|
-
const tools_1 = require("../../../common/tools");
|
|
25
|
-
const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
26
|
-
const constants_1 = require("./constants");
|
|
27
|
-
const metadataUtil_1 = require("../../utils/metadataUtil");
|
|
28
|
-
const constant_1 = require("../../configManager/constant");
|
|
29
21
|
const common_1 = require("../../../error/common");
|
|
22
|
+
const constant_1 = require("../../configManager/constant");
|
|
23
|
+
const metadataUtil_1 = require("../../utils/metadataUtil");
|
|
24
|
+
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
25
|
+
const wrapUtil_1 = require("../util/wrapUtil");
|
|
26
|
+
const constants_2 = require("./constants");
|
|
27
|
+
const errors_1 = require("./errors");
|
|
28
|
+
const results_1 = require("./results");
|
|
29
|
+
const telemetry_1 = require("./utils/telemetry");
|
|
30
30
|
const actionName = "teamsApp/validateAppPackage";
|
|
31
31
|
let ValidateAppPackageDriver = class ValidateAppPackageDriver {
|
|
32
32
|
constructor() {
|
|
@@ -56,7 +56,7 @@ let ValidateAppPackageDriver = class ValidateAppPackageDriver {
|
|
|
56
56
|
}
|
|
57
57
|
const archivedFile = await fs_extra_1.default.readFile(appPackagePath);
|
|
58
58
|
const zipEntries = new adm_zip_1.default(archivedFile).getEntries();
|
|
59
|
-
const manifestFile = zipEntries.find((x) => x.entryName ===
|
|
59
|
+
const manifestFile = zipEntries.find((x) => x.entryName === constants_2.Constants.MANIFEST_FILE);
|
|
60
60
|
if (manifestFile) {
|
|
61
61
|
const manifestContent = manifestFile.getData().toString();
|
|
62
62
|
const manifest = JSON.parse(manifestContent);
|
|
@@ -66,14 +66,14 @@ let ValidateAppPackageDriver = class ValidateAppPackageDriver {
|
|
|
66
66
|
lodash_1.merge(context.telemetryProperties, manifestTelemetries);
|
|
67
67
|
}
|
|
68
68
|
const appStudioTokenRes = await context.m365TokenProvider.getAccessToken({
|
|
69
|
-
scopes:
|
|
69
|
+
scopes: constants_1.AppStudioScopes,
|
|
70
70
|
});
|
|
71
71
|
if (appStudioTokenRes.isErr()) {
|
|
72
72
|
return teamsfx_api_1.err(appStudioTokenRes.error);
|
|
73
73
|
}
|
|
74
74
|
const appStudioToken = appStudioTokenRes.value;
|
|
75
75
|
try {
|
|
76
|
-
const validationResult = await
|
|
76
|
+
const validationResult = await teamsDevPortalClient_1.teamsDevPortalClient.partnerCenterAppPackageValidation(appStudioToken, archivedFile);
|
|
77
77
|
if (context.platform === teamsfx_api_1.Platform.CLI) {
|
|
78
78
|
const outputMessage = [
|
|
79
79
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH
|
|
1
|
+
{"version":3,"file":"validateAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { StepDriver, ExecutionResult } from "../interface/stepDriver";
|
|
1
|
+
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
3
2
|
import { DriverContext } from "../interface/commonArgs";
|
|
3
|
+
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
4
4
|
import { WrapDriverContext } from "../util/wrapUtil";
|
|
5
|
-
import { ValidateWithTestCasesArgs } from "./interfaces/ValidateWithTestCasesArgs";
|
|
6
5
|
import { AsyncAppValidationResponse } from "./interfaces/AsyncAppValidationResponse";
|
|
6
|
+
import { ValidateWithTestCasesArgs } from "./interfaces/ValidateWithTestCasesArgs";
|
|
7
7
|
export declare class ValidateWithTestCasesDriver implements StepDriver {
|
|
8
8
|
description: string;
|
|
9
9
|
readonly progressTitle: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateTestCases.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateTestCases.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"validateTestCases.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateTestCases.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EAGP,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAchC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EACL,0BAA0B,EAE3B,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AAInF,qBACa,2BAA4B,YAAW,UAAU;IAC5D,WAAW,SAET;IACF,QAAQ,CAAC,aAAa,SAA2E;IAEpF,OAAO,CAClB,IAAI,EAAE,yBAAyB,EAC/B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAUd,QAAQ,CACnB,IAAI,EAAE,yBAAyB,EAC/B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAwGhD;;;;;;;OAOG;IACU,oBAAoB,CAC/B,IAAI,EAAE,yBAAyB,EAC/B,OAAO,EAAE,iBAAiB,EAC1B,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,0BAA0B,EACpC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAwChB;;;;;;OAMG;IACH,OAAO,CAAC,yBAAyB;IAkGjC,OAAO,CAAC,YAAY;CAYrB"}
|
|
@@ -4,24 +4,25 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.ValidateWithTestCasesDriver = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
const os_1 = require("os");
|
|
8
|
-
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
7
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
10
|
-
const
|
|
8
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
+
const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
11
10
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
12
|
-
const path = tslib_1.__importStar(require("path"));
|
|
13
11
|
const lodash_1 = require("lodash");
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const
|
|
12
|
+
const os_1 = require("os");
|
|
13
|
+
const path = tslib_1.__importStar(require("path"));
|
|
14
|
+
const typedi_1 = require("typedi");
|
|
15
|
+
const teamsDevPortalClient_1 = require("../../../client/teamsDevPortalClient");
|
|
16
|
+
const constants_1 = require("../../../common/constants");
|
|
17
17
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
18
|
-
const
|
|
19
|
-
const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
20
|
-
const constants_1 = require("./constants");
|
|
21
|
-
const metadataUtil_1 = require("../../utils/metadataUtil");
|
|
18
|
+
const utils_1 = require("../../../common/utils");
|
|
22
19
|
const common_1 = require("../../../error/common");
|
|
23
|
-
const AsyncAppValidationResponse_1 = require("./interfaces/AsyncAppValidationResponse");
|
|
24
20
|
const constant_1 = require("../../configManager/constant");
|
|
21
|
+
const metadataUtil_1 = require("../../utils/metadataUtil");
|
|
22
|
+
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
23
|
+
const wrapUtil_1 = require("../util/wrapUtil");
|
|
24
|
+
const constants_2 = require("./constants");
|
|
25
|
+
const AsyncAppValidationResponse_1 = require("./interfaces/AsyncAppValidationResponse");
|
|
25
26
|
const actionName = "teamsApp/validateWithTestCases";
|
|
26
27
|
let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
|
|
27
28
|
constructor() {
|
|
@@ -51,7 +52,7 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
|
|
|
51
52
|
}
|
|
52
53
|
const archivedFile = await fs_extra_1.default.readFile(appPackagePath);
|
|
53
54
|
const zipEntries = new adm_zip_1.default(archivedFile).getEntries();
|
|
54
|
-
const manifestFile = zipEntries.find((x) => x.entryName ===
|
|
55
|
+
const manifestFile = zipEntries.find((x) => x.entryName === constants_2.Constants.MANIFEST_FILE);
|
|
55
56
|
if (manifestFile) {
|
|
56
57
|
const manifestContent = manifestFile.getData().toString();
|
|
57
58
|
const manifest = JSON.parse(manifestContent);
|
|
@@ -60,14 +61,14 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
|
|
|
60
61
|
const manifestTelemetries = teamsfx_api_1.ManifestUtil.parseCommonTelemetryProperties(manifest);
|
|
61
62
|
lodash_1.merge(context.telemetryProperties, manifestTelemetries);
|
|
62
63
|
const appStudioTokenRes = await context.m365TokenProvider.getAccessToken({
|
|
63
|
-
scopes:
|
|
64
|
+
scopes: constants_1.AppStudioScopes,
|
|
64
65
|
});
|
|
65
66
|
if (appStudioTokenRes.isErr()) {
|
|
66
67
|
return teamsfx_api_1.err(appStudioTokenRes.error);
|
|
67
68
|
}
|
|
68
69
|
const appStudioToken = appStudioTokenRes.value;
|
|
69
70
|
// Check if the app has ongoing validation
|
|
70
|
-
const existingValidationResponse = await
|
|
71
|
+
const existingValidationResponse = await teamsDevPortalClient_1.teamsDevPortalClient.getAppValidationRequestList(appStudioToken, manifest.id);
|
|
71
72
|
if (existingValidationResponse.appValidations) {
|
|
72
73
|
for (const validation of existingValidationResponse.appValidations) {
|
|
73
74
|
if (validation.status === AsyncAppValidationResponse_1.AsyncAppValidationStatus.InProgress ||
|
|
@@ -93,7 +94,7 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
|
|
|
93
94
|
}
|
|
94
95
|
}
|
|
95
96
|
}
|
|
96
|
-
const response = await
|
|
97
|
+
const response = await teamsDevPortalClient_1.teamsDevPortalClient.submitAppValidationRequest(appStudioToken, manifest.id);
|
|
97
98
|
if (context.platform === teamsfx_api_1.Platform.CLI) {
|
|
98
99
|
const message = [
|
|
99
100
|
{
|
|
@@ -139,10 +140,10 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
|
|
|
139
140
|
let resultResp = response;
|
|
140
141
|
while (resultResp.status !== AsyncAppValidationResponse_1.AsyncAppValidationStatus.Completed &&
|
|
141
142
|
resultResp.status !== AsyncAppValidationResponse_1.AsyncAppValidationStatus.Aborted) {
|
|
142
|
-
await
|
|
143
|
+
await utils_1.waitSeconds(constants_2.CEHCK_VALIDATION_RESULTS_INTERVAL_SECONDS);
|
|
143
144
|
const message = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.validateWithTestCases.step", resultResp.status, validationRequestListUrl);
|
|
144
145
|
context.logProvider.info(message);
|
|
145
|
-
resultResp = await
|
|
146
|
+
resultResp = await teamsDevPortalClient_1.teamsDevPortalClient.getAppValidationById(appStudioToken, resultResp.appValidationId);
|
|
146
147
|
}
|
|
147
148
|
this.evaluateValidationResults(args, context, resultResp, teamsAppId);
|
|
148
149
|
}
|
|
@@ -207,7 +208,7 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
|
|
|
207
208
|
}
|
|
208
209
|
validateArgs(args) {
|
|
209
210
|
if (!args || !args.appPackagePath) {
|
|
210
|
-
return teamsfx_api_1.err(new common_1.InvalidActionInputError(actionName, ["appPackagePath"]));
|
|
211
|
+
return teamsfx_api_1.err(new common_1.InvalidActionInputError(actionName, ["appPackagePath"], "https://aka.ms/teamsfx-actions/teamsapp-validate-test-cases"));
|
|
211
212
|
}
|
|
212
213
|
return teamsfx_api_1.ok(undefined);
|
|
213
214
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateTestCases.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateTestCases.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC
|
|
1
|
+
{"version":3,"file":"validateTestCases.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateTestCases.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { Inputs } from "@microsoft/teamsfx-api";
|
|
2
|
+
import { DriverContext } from "../interface/commonArgs";
|
|
1
3
|
export declare function loadStateFromEnv(outputEnvVarNames: Map<string, string>): Record<string, string | undefined>;
|
|
2
4
|
export declare function mapStateToEnv(state: Record<string, string>, outputEnvVarNames: Map<string, string>, excludedProperties?: string[]): Map<string, string>;
|
|
5
|
+
export declare function createDriverContext(inputs: Inputs): DriverContext;
|
|
3
6
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/util/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/util/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAIxD,wBAAgB,gBAAgB,CAC9B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAMpC;AAGD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQrB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAYjE"}
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.mapStateToEnv = exports.loadStateFromEnv = void 0;
|
|
5
|
+
exports.createDriverContext = exports.mapStateToEnv = exports.loadStateFromEnv = void 0;
|
|
6
|
+
const globalVars_1 = require("../../../common/globalVars");
|
|
6
7
|
// Needs to validate the parameters outside of the function
|
|
7
8
|
function loadStateFromEnv(outputEnvVarNames) {
|
|
8
9
|
const result = {};
|
|
@@ -23,4 +24,18 @@ function mapStateToEnv(state, outputEnvVarNames, excludedProperties) {
|
|
|
23
24
|
return result;
|
|
24
25
|
}
|
|
25
26
|
exports.mapStateToEnv = mapStateToEnv;
|
|
27
|
+
function createDriverContext(inputs) {
|
|
28
|
+
const driverContext = {
|
|
29
|
+
azureAccountProvider: globalVars_1.TOOLS.tokenProvider.azureAccountProvider,
|
|
30
|
+
m365TokenProvider: globalVars_1.TOOLS.tokenProvider.m365TokenProvider,
|
|
31
|
+
ui: globalVars_1.TOOLS.ui,
|
|
32
|
+
progressBar: undefined,
|
|
33
|
+
logProvider: globalVars_1.TOOLS.logProvider,
|
|
34
|
+
telemetryReporter: globalVars_1.TOOLS.telemetryReporter,
|
|
35
|
+
projectPath: inputs.projectPath,
|
|
36
|
+
platform: inputs.platform,
|
|
37
|
+
};
|
|
38
|
+
return driverContext;
|
|
39
|
+
}
|
|
40
|
+
exports.createDriverContext = createDriverContext;
|
|
26
41
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/component/driver/util/utils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/component/driver/util/utils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,2DAAmD;AAEnD,2DAA2D;AAC3D,SAAgB,gBAAgB,CAC9B,iBAAsC;IAEtC,MAAM,MAAM,GAAuC,EAAE,CAAC;IACtD,KAAK,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,iBAAiB,EAAE;QAC1D,MAAM,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KAChD;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AARD,4CAQC;AAED,2DAA2D;AAC3D,SAAgB,aAAa,CAC3B,KAA6B,EAC7B,iBAAsC,EACtC,kBAA6B;IAE7B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,KAAK,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,iBAAiB,EAAE;QACxD,IAAI,CAAC,CAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,QAAQ,CAAC,UAAU,CAAC,CAAA,EAAE;YAC7C,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;SAC3C;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAZD,sCAYC;AAED,SAAgB,mBAAmB,CAAC,MAAc;IAChD,MAAM,aAAa,GAAkB;QACnC,oBAAoB,EAAE,kBAAK,CAAC,aAAa,CAAC,oBAAoB;QAC9D,iBAAiB,EAAE,kBAAK,CAAC,aAAa,CAAC,iBAAiB;QACxD,EAAE,EAAE,kBAAK,CAAC,EAAE;QACZ,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,kBAAK,CAAC,WAAW;QAC9B,iBAAiB,EAAE,kBAAK,CAAC,iBAAkB;QAC3C,WAAW,EAAE,MAAM,CAAC,WAAY;QAChC,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B,CAAC;IACF,OAAO,aAAa,CAAC;AACvB,CAAC;AAZD,kDAYC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapUtil.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/util/wrapUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,gBAAgB,EAA8B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapUtil.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/util/wrapUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,gBAAgB,EAA8B,MAAM,wBAAwB,CAAC;AAGpG,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,aAAK,YAAY,GAAG,eAAe,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AAEhE,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;IACvF,sBAAsB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACjE,UAAU,CAAC,GAAG,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC1C;AAED,qBAAa,iBAAiB;IAC5B,YAAY,EAAE,gBAAgB,EAAE,CAAM;IACtC,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,qBAAqB,CAAC,EAAE,wBAAwB,CAAC;gBACrC,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAuB5E,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAevD;AAED,wBAAsB,OAAO,CAC3B,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACxC,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,YAAY,CAAC,CAqCvB"}
|
|
@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.wrapRun = exports.WrapDriverContext = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
8
|
-
const constants_1 = require("../../constants");
|
|
9
8
|
const componentError_1 = require("../../error/componentError");
|
|
10
9
|
const teamsFxTelemetryReporter_1 = require("../../utils/teamsFxTelemetryReporter");
|
|
11
|
-
const
|
|
10
|
+
const constants_1 = require("../aad/utility/constants");
|
|
12
11
|
class WrapDriverContext {
|
|
13
12
|
constructor(driverContext, eventName, componentName) {
|
|
14
13
|
this.progressBars = [];
|
|
@@ -53,13 +52,13 @@ async function wrapRun(context, exec, isExecute) {
|
|
|
53
52
|
try {
|
|
54
53
|
let actionRes;
|
|
55
54
|
(_a = context.wrapTelemetryReporter) === null || _a === void 0 ? void 0 : _a.sendStartEvent({ eventName });
|
|
56
|
-
(_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.info(localizeUtils_1.getLocalizedString(
|
|
55
|
+
(_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.info(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.startExecuteDriver, eventName));
|
|
57
56
|
const res = await exec();
|
|
58
57
|
(_c = context.wrapTelemetryReporter) === null || _c === void 0 ? void 0 : _c.sendEndEvent({
|
|
59
58
|
eventName,
|
|
60
59
|
properties: context.telemetryProperties,
|
|
61
60
|
});
|
|
62
|
-
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.info(localizeUtils_1.getLocalizedString(
|
|
61
|
+
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.info(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.successExecuteDriver, eventName));
|
|
63
62
|
await context.endProgressBars(true);
|
|
64
63
|
if (isExecute) {
|
|
65
64
|
actionRes = { result: teamsfx_api_1.ok(res), summaries: context.summaries };
|
|
@@ -87,6 +86,10 @@ async function wrapRun(context, exec, isExecute) {
|
|
|
87
86
|
}
|
|
88
87
|
}
|
|
89
88
|
exports.wrapRun = wrapRun;
|
|
89
|
+
const ErrorConstants = {
|
|
90
|
+
unhandledError: "UnhandledError",
|
|
91
|
+
unhandledErrorMessage: "Unhandled Error",
|
|
92
|
+
};
|
|
90
93
|
function getError(context, error) {
|
|
91
94
|
let fxError;
|
|
92
95
|
if (error instanceof componentError_1.BaseComponentInnerError) {
|
|
@@ -102,7 +105,7 @@ function getError(context, error) {
|
|
|
102
105
|
fxError = new teamsfx_api_1.SystemError({
|
|
103
106
|
error,
|
|
104
107
|
source: context.eventName,
|
|
105
|
-
name:
|
|
108
|
+
name: ErrorConstants.unhandledError,
|
|
106
109
|
message: error.message,
|
|
107
110
|
displayMessage: error.message,
|
|
108
111
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapUtil.js","sourceRoot":"","sources":["../../../../src/component/driver/util/wrapUtil.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAoG;AACpG,iEAAmE;AACnE,+
|
|
1
|
+
{"version":3,"file":"wrapUtil.js","sourceRoot":"","sources":["../../../../src/component/driver/util/wrapUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collaboration.d.ts","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,OAAO,EACP,WAAW,EACX,iBAAiB,EACjB,MAAM,EAGP,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"collaboration.d.ts","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,OAAO,EACP,WAAW,EACX,iBAAiB,EACjB,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAO/F,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAU/E,qBACa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;gBAEhC,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAAE,WAAW;IAO9D,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAqBpC,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IAY1B,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAmBjD,OAAO,CAAC,WAAW;CAiBpB;AAED,qBACa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;gBAEtC,iBAAiB,EAAE,iBAAiB;IAOnC,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAyBpC,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;IAqC/B,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IA2BjD,OAAO,CAAC,WAAW;CAoBpB"}
|
|
@@ -8,14 +8,15 @@ const lib_1 = require("@feathersjs/hooks/lib");
|
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
9
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
10
10
|
const typedi_1 = require("typedi");
|
|
11
|
-
const
|
|
12
|
-
const
|
|
11
|
+
const teamsDevPortalClient_1 = require("../../client/teamsDevPortalClient");
|
|
12
|
+
const constants_1 = require("../../common/constants");
|
|
13
|
+
const globalVars_1 = require("../../common/globalVars");
|
|
13
14
|
const common_1 = require("../../error/common");
|
|
15
|
+
const teamsApp_1 = require("../../error/teamsApp");
|
|
14
16
|
const aadAppClient_1 = require("../driver/aad/utility/aadAppClient");
|
|
15
|
-
const
|
|
17
|
+
const constants_2 = require("../driver/aad/utility/constants");
|
|
16
18
|
const addStartAndEndTelemetry_1 = require("../driver/middleware/addStartAndEndTelemetry");
|
|
17
|
-
const
|
|
18
|
-
const constants_2 = require("../driver/teamsApp/constants");
|
|
19
|
+
const constants_3 = require("../driver/teamsApp/constants");
|
|
19
20
|
const EventName = {
|
|
20
21
|
grantPermission: "grant-permission",
|
|
21
22
|
listCollaborator: "list-collaborator",
|
|
@@ -32,9 +33,9 @@ let AadCollaboration = class AadCollaboration {
|
|
|
32
33
|
await this.aadAppClient.addOwner(objectId, userObjectId);
|
|
33
34
|
const result = [
|
|
34
35
|
{
|
|
35
|
-
name:
|
|
36
|
-
type:
|
|
37
|
-
roles: [
|
|
36
|
+
name: constants_2.permissionsKeys.name,
|
|
37
|
+
type: constants_2.permissionsKeys.type,
|
|
38
|
+
roles: [constants_2.permissionsKeys.owner],
|
|
38
39
|
resourceId: objectId,
|
|
39
40
|
},
|
|
40
41
|
];
|
|
@@ -59,9 +60,9 @@ let AadCollaboration = class AadCollaboration {
|
|
|
59
60
|
const isAadOwner = owners === null || owners === void 0 ? void 0 : owners.find((owner) => owner.userObjectId === userObjectId);
|
|
60
61
|
const result = [
|
|
61
62
|
{
|
|
62
|
-
name:
|
|
63
|
-
type:
|
|
64
|
-
roles: isAadOwner ? [
|
|
63
|
+
name: constants_2.permissionsKeys.name,
|
|
64
|
+
type: constants_2.permissionsKeys.type,
|
|
65
|
+
roles: isAadOwner ? [constants_2.permissionsKeys.owner] : [constants_2.permissionsKeys.noPermission],
|
|
65
66
|
resourceId: objectId,
|
|
66
67
|
},
|
|
67
68
|
];
|
|
@@ -77,7 +78,7 @@ let AadCollaboration = class AadCollaboration {
|
|
|
77
78
|
const message = JSON.stringify(error.response.data);
|
|
78
79
|
(_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error(message);
|
|
79
80
|
if (error.response.status === 404) {
|
|
80
|
-
return new
|
|
81
|
+
return new teamsApp_1.AppIdNotExist(appId);
|
|
81
82
|
}
|
|
82
83
|
else if (error.response.status >= 400 && error.response.status < 500) {
|
|
83
84
|
return new common_1.HttpClientError(error, componentNameAad, message);
|
|
@@ -130,15 +131,15 @@ let TeamsCollaboration = class TeamsCollaboration {
|
|
|
130
131
|
async grantPermission(ctx, teamsAppId, userInfo) {
|
|
131
132
|
try {
|
|
132
133
|
const appStudioTokenRes = await this.tokenProvider.getAccessToken({
|
|
133
|
-
scopes:
|
|
134
|
+
scopes: constants_1.AppStudioScopes,
|
|
134
135
|
});
|
|
135
136
|
const appStudioToken = appStudioTokenRes.isOk() ? appStudioTokenRes.value : undefined;
|
|
136
|
-
await
|
|
137
|
+
await teamsDevPortalClient_1.teamsDevPortalClient.grantPermission(appStudioToken, teamsAppId, userInfo);
|
|
137
138
|
const result = [
|
|
138
139
|
{
|
|
139
|
-
name:
|
|
140
|
-
roles: [
|
|
141
|
-
type:
|
|
140
|
+
name: constants_3.Constants.PERMISSIONS.name,
|
|
141
|
+
roles: [constants_3.Constants.PERMISSIONS.admin],
|
|
142
|
+
type: constants_3.Constants.PERMISSIONS.type,
|
|
142
143
|
resourceId: teamsAppId,
|
|
143
144
|
},
|
|
144
145
|
];
|
|
@@ -151,10 +152,10 @@ let TeamsCollaboration = class TeamsCollaboration {
|
|
|
151
152
|
async listCollaborator(ctx, teamsAppId) {
|
|
152
153
|
try {
|
|
153
154
|
const appStudioTokenRes = await this.tokenProvider.getAccessToken({
|
|
154
|
-
scopes:
|
|
155
|
+
scopes: constants_1.AppStudioScopes,
|
|
155
156
|
});
|
|
156
157
|
const appStudioToken = appStudioTokenRes.isOk() ? appStudioTokenRes.value : undefined;
|
|
157
|
-
const userLists = await
|
|
158
|
+
const userLists = await teamsDevPortalClient_1.teamsDevPortalClient.getUserList(appStudioToken, teamsAppId);
|
|
158
159
|
if (!userLists) {
|
|
159
160
|
return teamsfx_api_1.ok([]);
|
|
160
161
|
}
|
|
@@ -179,15 +180,15 @@ let TeamsCollaboration = class TeamsCollaboration {
|
|
|
179
180
|
async checkPermission(ctx, teamsAppId, userInfo) {
|
|
180
181
|
try {
|
|
181
182
|
const appStudioTokenRes = await this.tokenProvider.getAccessToken({
|
|
182
|
-
scopes:
|
|
183
|
+
scopes: constants_1.AppStudioScopes,
|
|
183
184
|
});
|
|
184
185
|
const appStudioToken = appStudioTokenRes.isOk() ? appStudioTokenRes.value : undefined;
|
|
185
|
-
const teamsAppRoles = await
|
|
186
|
+
const teamsAppRoles = await teamsDevPortalClient_1.teamsDevPortalClient.checkPermission(appStudioToken, teamsAppId, userInfo.aadId);
|
|
186
187
|
const result = [
|
|
187
188
|
{
|
|
188
|
-
name:
|
|
189
|
+
name: constants_3.Constants.PERMISSIONS.name,
|
|
189
190
|
roles: [teamsAppRoles],
|
|
190
|
-
type:
|
|
191
|
+
type: constants_3.Constants.PERMISSIONS.type,
|
|
191
192
|
resourceId: teamsAppId,
|
|
192
193
|
},
|
|
193
194
|
];
|
|
@@ -205,7 +206,7 @@ let TeamsCollaboration = class TeamsCollaboration {
|
|
|
205
206
|
if (error.innerError.response.status) {
|
|
206
207
|
const statusCode = error.innerError.response.status;
|
|
207
208
|
if (statusCode === 404) {
|
|
208
|
-
return new
|
|
209
|
+
return new teamsApp_1.AppIdNotExist(appId);
|
|
209
210
|
}
|
|
210
211
|
else if (statusCode >= 400 && statusCode < 500) {
|
|
211
212
|
return new common_1.HttpClientError(error, componentNameTeams, message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collaboration.js","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAQgC;AAChC,0DAA0B;AAC1B,mCAAiC;
|
|
1
|
+
{"version":3,"file":"collaboration.js","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAQgC;AAChC,0DAA0B;AAC1B,mCAAiC;AACjC,4EAAyE;AACzE,sDAAyD;AACzD,wDAAyD;AAEzD,+CAAqF;AACrF,mDAAqD;AACrD,qEAAkE;AAClE,+DAAkE;AAClE,0FAAuF;AACvF,4DAAyD;AAGzD,MAAM,SAAS,GAAG;IAChB,eAAe,EAAE,kBAAkB;IACnC,gBAAgB,EAAE,mBAAmB;IACrC,eAAe,EAAE,kBAAkB;CACpC,CAAC;AACF,MAAM,gBAAgB,GAAG,+BAA+B,CAAC;AACzD,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;AAG7C,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAG3B,YAAY,iBAAoC,EAAE,WAAyB;QACzE,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IACvE,CAAC;IAKM,KAAK,CAAC,eAAe,CAC1B,GAAY,EACZ,QAAgB,EAChB,YAAoB;QAEpB,IAAI;YACF,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YAEzD,MAAM,MAAM,GAAG;gBACb;oBACE,IAAI,EAAE,2BAAe,CAAC,IAAI;oBAC1B,IAAI,EAAE,2BAAe,CAAC,IAAI;oBAC1B,KAAK,EAAE,CAAC,2BAAe,CAAC,KAAK,CAAC;oBAC9B,UAAU,EAAE,QAAQ;iBACrB;aACF,CAAC;YACF,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;SACnB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,iBAAG,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;SACpD;IACH,CAAC;IAKM,KAAK,CAAC,gBAAgB,CAC3B,GAAY,EACZ,QAAgB;QAEhB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC3D,OAAO,gBAAE,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,CAAC;SACzB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,iBAAG,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;SACpD;IACH,CAAC;IAKM,KAAK,CAAC,eAAe,CAC1B,GAAY,EACZ,QAAgB,EAChB,YAAoB;QAEpB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC3D,MAAM,UAAU,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,YAAY,CAAC,CAAC;YAE1F,MAAM,MAAM,GAAG;gBACb;oBACE,IAAI,EAAE,2BAAe,CAAC,IAAI;oBAC1B,IAAI,EAAE,2BAAe,CAAC,IAAI;oBAC1B,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,2BAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,2BAAe,CAAC,YAAY,CAAC;oBAC5E,UAAU,EAAE,QAAQ;iBACrB;aACF,CAAC;YACF,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;SACnB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,iBAAG,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;SACpD;IACH,CAAC;IAEO,WAAW,CAAC,KAAU,EAAE,GAAY,EAAE,KAAa;;QACzD,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAS,CAAC,IAAI,CAAC,CAAC;YACrD,MAAA,GAAG,CAAC,WAAW,0CAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,KAAK,CAAC,QAAS,CAAC,MAAM,KAAK,GAAG,EAAE;gBAClC,OAAO,IAAI,wBAAa,CAAC,KAAK,CAAC,CAAC;aACjC;iBAAM,IAAI,KAAK,CAAC,QAAS,CAAC,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,QAAS,CAAC,MAAM,GAAG,GAAG,EAAE;gBACxE,OAAO,IAAI,wBAAe,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;aAC9D;iBAAM;gBACL,OAAO,IAAI,wBAAe,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;aAC9D;SACF;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtC,MAAA,GAAG,CAAC,WAAW,0CAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAChC,OAAO,sBAAa,CAAC,KAAc,EAAE,gBAAgB,CAAC,CAAC;IACzD,CAAC;CACF,CAAA;AAhFC;IAJC,WAAK,CAAC;QACL,2BAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAClE,iDAAuB,CAAC,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;KACrE,CAAC;;;;uDAqBD;AAKD;IAJC,WAAK,CAAC;QACL,2BAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAClE,iDAAuB,CAAC,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;KACtE,CAAC;;;;wDAWD;AAKD;IAJC,WAAK,CAAC;QACL,2BAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAClE,iDAAuB,CAAC,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;KACrE,CAAC;;;;uDAsBD;AAvEU,gBAAgB;IAD5B,gBAAO,CAAC,mBAAmB,CAAC;;GAChB,gBAAgB,CA0F5B;AA1FY,4CAAgB;AA6F7B,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAG7B,YAAY,iBAAoC;QAC9C,IAAI,CAAC,aAAa,GAAG,iBAAiB,CAAC;IACzC,CAAC;IAKM,KAAK,CAAC,eAAe,CAC1B,GAAY,EACZ,UAAkB,EAClB,QAAiB;QAEjB,IAAI;YACF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;gBAChE,MAAM,EAAE,2BAAe;aACxB,CAAC,CAAC;YACH,MAAM,cAAc,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;YAEtF,MAAM,2CAAoB,CAAC,eAAe,CAAC,cAAwB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC3F,MAAM,MAAM,GAAyB;gBACnC;oBACE,IAAI,EAAE,qBAAS,CAAC,WAAW,CAAC,IAAI;oBAChC,KAAK,EAAE,CAAC,qBAAS,CAAC,WAAW,CAAC,KAAK,CAAC;oBACpC,IAAI,EAAE,qBAAS,CAAC,WAAW,CAAC,IAAI;oBAChC,UAAU,EAAE,UAAU;iBACvB;aACF,CAAC;YACF,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;SACnB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,iBAAG,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC;SACtD;IACH,CAAC;IAKM,KAAK,CAAC,gBAAgB,CAC3B,GAAY,EACZ,UAAkB;QAElB,IAAI;YACF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;gBAChE,MAAM,EAAE,2BAAe;aACxB,CAAC,CAAC;YACH,MAAM,cAAc,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;YAEtF,MAAM,SAAS,GAAG,MAAM,2CAAoB,CAAC,WAAW,CACtD,cAAwB,EACxB,UAAU,CACX,CAAC;YACF,IAAI,CAAC,SAAS,EAAE;gBACd,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;aACf;YAED,MAAM,aAAa,GAAoB,SAAS;iBAC7C,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACnB,OAAO,QAAQ,CAAC,eAAe,CAAC;YAClC,CAAC,CAAC;iBACD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAChB,OAAO;oBACL,YAAY,EAAE,QAAQ,CAAC,KAAK;oBAC5B,WAAW,EAAE,QAAQ,CAAC,WAAW;oBACjC,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;oBAC7C,UAAU,EAAE,UAAU;iBACvB,CAAC;YACJ,CAAC,CAAC,CAAC;YAEL,OAAO,gBAAE,CAAC,aAAa,CAAC,CAAC;SAC1B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,iBAAG,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC;SACtD;IACH,CAAC;IAKM,KAAK,CAAC,eAAe,CAC1B,GAAY,EACZ,UAAkB,EAClB,QAAiB;QAEjB,IAAI;YACF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;gBAChE,MAAM,EAAE,2BAAe;aACxB,CAAC,CAAC;YACH,MAAM,cAAc,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;YAEtF,MAAM,aAAa,GAAG,MAAM,2CAAoB,CAAC,eAAe,CAC9D,cAAwB,EACxB,UAAU,EACV,QAAQ,CAAC,KAAK,CACf,CAAC;YAEF,MAAM,MAAM,GAAyB;gBACnC;oBACE,IAAI,EAAE,qBAAS,CAAC,WAAW,CAAC,IAAI;oBAChC,KAAK,EAAE,CAAC,aAAa,CAAC;oBACtB,IAAI,EAAE,qBAAS,CAAC,WAAW,CAAC,IAAI;oBAChC,UAAU,EAAE,UAAU;iBACvB;aACF,CAAC;YACF,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;SACnB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,iBAAG,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC;SACtD;IACH,CAAC;IAEO,WAAW,CAAC,KAAU,EAAE,GAAY,EAAE,KAAa;;QACzD,IAAI,KAAK,CAAC,UAAU,EAAE;YACpB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/D,MAAA,GAAG,CAAC,WAAW,0CAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE;gBACpC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACpD,IAAI,UAAU,KAAK,GAAG,EAAE;oBACtB,OAAO,IAAI,wBAAa,CAAC,KAAK,CAAC,CAAC;iBACjC;qBAAM,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG,EAAE;oBAChD,OAAO,IAAI,wBAAe,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;iBAChE;qBAAM;oBACL,OAAO,IAAI,wBAAe,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;iBAChE;aACF;SACF;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtC,MAAA,GAAG,CAAC,WAAW,0CAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAChC,OAAO,sBAAa,CAAC,KAAc,EAAE,kBAAkB,CAAC,CAAC;IAC3D,CAAC;CACF,CAAA;AAxHC;IAJC,WAAK,CAAC;QACL,2BAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,CAAC;QACpE,iDAAuB,CAAC,SAAS,CAAC,eAAe,EAAE,kBAAkB,CAAC;KACvE,CAAC;;;;yDAyBD;AAKD;IAJC,WAAK,CAAC;QACL,2BAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,CAAC;QACpE,iDAAuB,CAAC,SAAS,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;KACxE,CAAC;;;;0DAoCD;AAKD;IAJC,WAAK,CAAC;QACL,2BAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,CAAC;QACpE,iDAAuB,CAAC,SAAS,CAAC,eAAe,EAAE,kBAAkB,CAAC;KACvE,CAAC;;;;yDA8BD;AA5GU,kBAAkB;IAD9B,gBAAO,CAAC,qBAAqB,CAAC;;GAClB,kBAAkB,CAkI9B;AAlIY,gDAAkB"}
|
|
@@ -7,7 +7,8 @@ const tslib_1 = require("tslib");
|
|
|
7
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
8
|
require("reflect-metadata");
|
|
9
9
|
const typedi_1 = require("typedi");
|
|
10
|
-
const telemetry_1 = require("../../
|
|
10
|
+
const telemetry_1 = require("../../common/telemetry");
|
|
11
|
+
const telemetry_2 = require("../../core/telemetry");
|
|
11
12
|
const constants_1 = require("../constants");
|
|
12
13
|
const createAuthFiles_1 = require("./createAuthFiles");
|
|
13
14
|
let SSO = class SSO {
|
|
@@ -28,11 +29,11 @@ async function addSsoV3(context, inputs) {
|
|
|
28
29
|
});
|
|
29
30
|
const res = await createAuthFiles_1.createAuthFiles(inputs);
|
|
30
31
|
if (res.isErr()) {
|
|
31
|
-
return teamsfx_api_1.err(
|
|
32
|
+
return teamsfx_api_1.err(telemetry_2.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddSso, res.error, context.telemetryReporter));
|
|
32
33
|
}
|
|
33
34
|
context.telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddSso, {
|
|
34
35
|
[constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
|
|
35
|
-
[constants_1.SolutionTelemetryProperty.Success]:
|
|
36
|
+
[constants_1.SolutionTelemetryProperty.Success]: telemetry_1.TelemetrySuccess.Yes,
|
|
36
37
|
});
|
|
37
38
|
return teamsfx_api_1.ok(undefined);
|
|
38
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../src/component/feature/sso.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkG;AAClG,4BAA0B;AAC1B,mCAAiC;AACjC,oDAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../src/component/feature/sso.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkG;AAClG,4BAA0B;AAC1B,mCAAiC;AACjC,sDAA0D;AAC1D,oDAAyE;AACzE,4CAIsB;AACtB,uDAAoD;AAGpD,IAAa,GAAG,GAAhB,MAAa,GAAG;IAAhB;QACE,SAAI,GAAG,KAAK,CAAC;IAKf,CAAC;IAHC,KAAK,CAAC,GAAG,CAAC,OAAgB,EAAE,MAA6B;QACvD,OAAO,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;CACF,CAAA;AANY,GAAG;IADf,gBAAO,CAAC,KAAK,CAAC;GACF,GAAG,CAMf;AANY,kBAAG;AAQhB,KAAK,UAAU,QAAQ,CACrB,OAAgB,EAChB,MAA6B;IAE7B,OAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,kCAAsB,CAAC,WAAW,EAAE;QAC/E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;KACtE,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,MAAM,iCAAe,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;QACf,OAAO,iBAAG,CACR,6CAAiC,CAC/B,kCAAsB,CAAC,MAAM,EAC7B,GAAG,CAAC,KAAK,EACT,OAAO,CAAC,iBAAiB,CAC1B,CACF,CAAC;KACH;IAED,OAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,kCAAsB,CAAC,MAAM,EAAE;QAC1E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;QACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,4BAAgB,CAAC,GAAG;KAC1D,CAAC,CAAC;IAEH,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC"}
|