@microsoft/teamsfx-core 2.0.10-alpha.fa1ce1fbb.0 → 2.0.10-alpha.ff616a623.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 +4 -5
- package/build/client/teamsDevPortalClient.d.ts.map +1 -1
- package/build/client/teamsDevPortalClient.js +67 -47
- package/build/client/teamsDevPortalClient.js.map +1 -1
- package/build/common/azureUtils.js +4 -4
- package/build/common/azureUtils.js.map +1 -1
- package/build/common/constants.d.ts +1 -19
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +10 -29
- package/build/common/constants.js.map +1 -1
- package/build/common/correlator.d.ts +1 -0
- package/build/common/correlator.d.ts.map +1 -1
- package/build/common/correlator.js +6 -1
- package/build/common/correlator.js.map +1 -1
- package/build/common/featureFlags.d.ts +49 -19
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +82 -62
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/globalState.js +3 -3
- package/build/common/globalState.js.map +1 -1
- package/build/common/globalVars.d.ts +1 -0
- package/build/common/globalVars.d.ts.map +1 -1
- package/build/common/globalVars.js +2 -1
- package/build/common/globalVars.js.map +1 -1
- package/build/common/jsonUtils.js +10 -10
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/localizeUtils.js +2 -2
- package/build/common/localizeUtils.js.map +1 -1
- package/build/common/projectSettingsHelper.js +1 -1
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/projectTypeChecker.js +3 -3
- package/build/common/projectTypeChecker.js.map +1 -1
- package/build/common/samples.js +5 -5
- package/build/common/samples.js.map +1 -1
- package/build/common/secretmasker/dict.d.ts +22 -0
- package/build/common/secretmasker/dict.d.ts.map +1 -0
- package/build/common/secretmasker/dict.js +83 -0
- package/build/common/secretmasker/dict.js.map +1 -0
- package/build/common/secretmasker/feature.d.ts +15 -0
- package/build/common/secretmasker/feature.d.ts.map +1 -0
- package/build/common/secretmasker/feature.js +148 -0
- package/build/common/secretmasker/feature.js.map +1 -0
- package/build/common/secretmasker/masker.d.ts +12 -0
- package/build/common/secretmasker/masker.d.ts.map +1 -0
- package/build/common/secretmasker/masker.js +54 -0
- package/build/common/secretmasker/masker.js.map +1 -0
- package/build/common/stringUtils.d.ts +3 -5
- package/build/common/stringUtils.d.ts.map +1 -1
- package/build/common/stringUtils.js +13 -105
- package/build/common/stringUtils.js.map +1 -1
- package/build/common/telemetry.d.ts +12 -2
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +20 -3
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/common/tools.d.ts +1 -6
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +15 -28
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts +4 -0
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +38 -1
- package/build/common/utils.js.map +1 -1
- package/build/common/wrappedAxiosClient.d.ts +1 -0
- package/build/common/wrappedAxiosClient.d.ts.map +1 -1
- package/build/common/wrappedAxiosClient.js +58 -29
- package/build/common/wrappedAxiosClient.js.map +1 -1
- package/build/component/configManager/actionInjector.js +2 -2
- package/build/component/configManager/actionInjector.js.map +1 -1
- package/build/component/configManager/lifecycle.js +9 -9
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.js +20 -20
- 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/constant/commonConstant.d.ts +1 -0
- package/build/component/constant/commonConstant.d.ts.map +1 -1
- package/build/component/constant/commonConstant.js +1 -0
- package/build/component/constant/commonConstant.js.map +1 -1
- package/build/component/constants.js +5 -5
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +87 -212
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/coordinator/summary.js +10 -10
- package/build/component/coordinator/summary.js.map +1 -1
- package/build/component/deployUtils.js +4 -4
- package/build/component/deployUtils.js.map +1 -1
- package/build/component/deps-checker/constant/helpLink.d.ts +0 -3
- package/build/component/deps-checker/constant/helpLink.d.ts.map +1 -1
- package/build/component/deps-checker/constant/helpLink.js +1 -6
- package/build/component/deps-checker/constant/helpLink.js.map +1 -1
- package/build/component/deps-checker/constant/message.js +24 -24
- package/build/component/deps-checker/constant/message.js.map +1 -1
- package/build/component/deps-checker/internal/dotnetChecker.js +13 -13
- package/build/component/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/component/deps-checker/internal/funcToolChecker.js +13 -13
- package/build/component/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/component/deps-checker/internal/testToolChecker.js +21 -21
- package/build/component/deps-checker/internal/testToolChecker.js.map +1 -1
- package/build/component/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -1
- package/build/component/deps-checker/internal/vxTestAppChecker.js +14 -8
- package/build/component/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +15 -15
- 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 +38 -23
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadAppNameTooLongError.js +2 -2
- package/build/component/driver/aad/error/aadAppNameTooLongError.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +27 -27
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/error/clientSecretNotAllowedError.js +2 -2
- package/build/component/driver/aad/error/clientSecretNotAllowedError.js.map +1 -1
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.js +2 -2
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.js.map +1 -1
- package/build/component/driver/aad/error/invalidFieldInManifestError.js +2 -2
- package/build/component/driver/aad/error/invalidFieldInManifestError.js.map +1 -1
- package/build/component/driver/aad/error/missingEnvError.js +2 -2
- package/build/component/driver/aad/error/missingEnvError.js.map +1 -1
- package/build/component/driver/aad/error/missingServiceManagamentReferenceError.d.ts +5 -0
- package/build/component/driver/aad/error/missingServiceManagamentReferenceError.d.ts.map +1 -0
- package/build/component/driver/aad/error/missingServiceManagamentReferenceError.js +23 -0
- package/build/component/driver/aad/error/missingServiceManagamentReferenceError.js.map +1 -0
- package/build/component/driver/aad/update.js +16 -16
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +9 -9
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +3 -3
- package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js +5 -5
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +2 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +2 -0
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/add/addWebPart.js +6 -6
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/add/error/noConfigurationError.js +2 -2
- package/build/component/driver/add/error/noConfigurationError.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +23 -20
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js +2 -2
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyDomainInvalid.js +2 -2
- package/build/component/driver/apiKey/error/apiKeyDomainInvalid.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.js +2 -2
- package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.d.ts +5 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.d.ts.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.js +21 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.js.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyNameTooLong.js +2 -2
- package/build/component/driver/apiKey/error/apiKeyNameTooLong.js.map +1 -1
- package/build/component/driver/apiKey/update.d.ts.map +1 -1
- package/build/component/driver/apiKey/update.js +20 -20
- package/build/component/driver/apiKey/update.js.map +1 -1
- package/build/component/driver/apiKey/utility/constants.d.ts +1 -1
- package/build/component/driver/apiKey/utility/constants.js +1 -1
- package/build/component/driver/apiKey/utility/utility.js +1 -1
- package/build/component/driver/apiKey/utility/utility.js.map +1 -1
- package/build/component/driver/arm/deploy.js +4 -4
- package/build/component/driver/arm/deploy.js.map +1 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +19 -17
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +5 -5
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/util/handleError.js +9 -9
- package/build/component/driver/arm/util/handleError.js.map +1 -1
- package/build/component/driver/arm/validator.js +3 -3
- package/build/component/driver/arm/validator.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +38 -22
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botAadApp/error/unexpectedEmptyBotPasswordError.js +2 -2
- package/build/component/driver/botAadApp/error/unexpectedEmptyBotPasswordError.js.map +1 -1
- package/build/component/driver/botAadApp/utility/constants.d.ts +1 -0
- package/build/component/driver/botAadApp/utility/constants.d.ts.map +1 -1
- package/build/component/driver/botAadApp/utility/constants.js +1 -0
- package/build/component/driver/botAadApp/utility/constants.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +14 -14
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/botFramework/error/invalidBotIdError.js +2 -2
- package/build/component/driver/botFramework/error/invalidBotIdError.js.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js +3 -3
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js +3 -3
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js +16 -10
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +8 -8
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js +14 -14
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +6 -6
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +8 -8
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js +11 -11
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +15 -15
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/createAppCatalogFailedError.js +2 -2
- package/build/component/driver/deploy/spfx/error/createAppCatalogFailedError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/getGraphTokenFailedError.js +2 -2
- package/build/component/driver/deploy/spfx/error/getGraphTokenFailedError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/getSPOTokenFailedError.js +2 -2
- package/build/component/driver/deploy/spfx/error/getSPOTokenFailedError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/getTenantFailedError.js +2 -2
- package/build/component/driver/deploy/spfx/error/getTenantFailedError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/insufficientPermissionError.js +2 -2
- package/build/component/driver/deploy/spfx/error/insufficientPermissionError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/noSPPackageError.js +2 -2
- package/build/component/driver/deploy/spfx/error/noSPPackageError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/noValidAppCatelogError.js +2 -2
- package/build/component/driver/deploy/spfx/error/noValidAppCatelogError.js.map +1 -1
- package/build/component/driver/deploy/spfx/error/uploadAppPackageFailedError.js +2 -2
- package/build/component/driver/deploy/spfx/error/uploadAppPackageFailedError.js.map +1 -1
- package/build/component/driver/deploy/spfx/utility/constants.js +5 -5
- package/build/component/driver/deploy/spfx/utility/constants.js.map +1 -1
- package/build/component/driver/devTool/constant.d.ts +8 -8
- package/build/component/driver/devTool/constant.d.ts.map +1 -1
- package/build/component/driver/devTool/constant.js +10 -10
- package/build/component/driver/devTool/constant.js.map +1 -1
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js +3 -3
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/error/funcInstallationUserError.js +3 -3
- package/build/component/driver/devTool/error/funcInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/error/testToolInstallationUserError.js +3 -3
- package/build/component/driver/devTool/error/testToolInstallationUserError.js.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/error/outputEnvironmentVariableUndefinedError.js +2 -2
- package/build/component/driver/error/outputEnvironmentVariableUndefinedError.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +11 -11
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +12 -12
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/index.d.ts +1 -0
- package/build/component/driver/index.d.ts.map +1 -1
- package/build/component/driver/index.js +1 -0
- package/build/component/driver/index.js.map +1 -1
- package/build/component/driver/m365/acquire.js +12 -12
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js +2 -2
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -1
- package/build/component/driver/oauth/create.d.ts.map +1 -1
- package/build/component/driver/oauth/create.js +51 -21
- package/build/component/driver/oauth/create.js.map +1 -1
- package/build/component/driver/oauth/error/oauthAuthInfoInvalid.js +2 -2
- package/build/component/driver/oauth/error/oauthAuthInfoInvalid.js.map +1 -1
- package/build/component/driver/oauth/error/oauthDisablePKCEError.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.js +21 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.js.map +1 -0
- package/build/component/driver/oauth/error/oauthDomainInvalid.js +2 -2
- package/build/component/driver/oauth/error/oauthDomainInvalid.js.map +1 -1
- package/build/component/driver/oauth/error/oauthFailedToGetDomain.js +2 -2
- package/build/component/driver/oauth/error/oauthFailedToGetDomain.js.map +1 -1
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.js +21 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.js.map +1 -0
- package/build/component/driver/oauth/error/oauthNameTooLong.js +2 -2
- package/build/component/driver/oauth/error/oauthNameTooLong.js.map +1 -1
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts +2 -0
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts +1 -0
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/update.d.ts.map +1 -1
- package/build/component/driver/oauth/update.js +30 -19
- package/build/component/driver/oauth/update.js.map +1 -1
- package/build/component/driver/oauth/utility/constants.d.ts +1 -1
- package/build/component/driver/oauth/utility/constants.js +1 -1
- package/build/component/driver/oauth/utility/utility.js +4 -5
- package/build/component/driver/oauth/utility/utility.js.map +1 -1
- package/build/component/driver/script/baseBuildDriver.js +8 -8
- package/build/component/driver/script/baseBuildDriver.js.map +1 -1
- package/build/component/driver/script/dotnetBuildDriver.js +3 -3
- package/build/component/driver/script/dotnetBuildDriver.js.map +1 -1
- package/build/component/driver/script/npmBuildDriver.js +3 -3
- package/build/component/driver/script/npmBuildDriver.js.map +1 -1
- package/build/component/driver/script/npxBuildDriver.js +5 -5
- package/build/component/driver/script/npxBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +2 -0
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +28 -29
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +43 -54
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +20 -20
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +23 -23
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +15 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +132 -2
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js +8 -8
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +21 -21
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +49 -49
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts +6 -2
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +49 -42
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts +2 -0
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/SyncManifest.d.ts +15 -0
- package/build/component/driver/teamsApp/interfaces/SyncManifest.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/SyncManifest.js +5 -0
- package/build/component/driver/teamsApp/interfaces/SyncManifest.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +35 -35
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/syncManifest.d.ts +14 -0
- package/build/component/driver/teamsApp/syncManifest.d.ts.map +1 -0
- package/build/component/driver/teamsApp/syncManifest.js +226 -0
- package/build/component/driver/teamsApp/syncManifest.js.map +1 -0
- package/build/component/driver/teamsApp/teamsappMgr.js +38 -38
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts +5 -3
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +45 -21
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +3 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +63 -39
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +4 -3
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +36 -18
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +4 -4
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +45 -15
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.js +27 -27
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +52 -38
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.js +36 -36
- package/build/component/driver/teamsApp/validateTestCases.js.map +1 -1
- package/build/component/driver/util/wrapUtil.js +6 -6
- package/build/component/driver/util/wrapUtil.js.map +1 -1
- package/build/component/error/componentError.js +8 -8
- package/build/component/error/componentError.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +56 -56
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/feature/createAuthFiles.js +8 -8
- package/build/component/feature/createAuthFiles.js.map +1 -1
- package/build/component/feature/sso.js +4 -4
- package/build/component/feature/sso.js.map +1 -1
- package/build/component/generator/apiSpec/generator.d.ts +15 -0
- package/build/component/generator/apiSpec/generator.d.ts.map +1 -0
- package/build/component/generator/apiSpec/generator.js +260 -0
- package/build/component/generator/apiSpec/generator.js.map +1 -0
- package/build/component/generator/{copilotPlugin → apiSpec}/helper.d.ts +23 -9
- package/build/component/generator/apiSpec/helper.d.ts.map +1 -0
- package/build/component/generator/{copilotPlugin → apiSpec}/helper.js +306 -127
- package/build/component/generator/apiSpec/helper.js.map +1 -0
- package/build/component/generator/constant.d.ts +1 -0
- package/build/component/generator/constant.d.ts.map +1 -1
- package/build/component/generator/constant.js +2 -1
- package/build/component/generator/constant.js.map +1 -1
- package/build/component/generator/{officeXMLAddin → copilotExtension}/generator.d.ts +8 -10
- package/build/component/generator/copilotExtension/generator.d.ts.map +1 -0
- package/build/component/generator/copilotExtension/generator.js +107 -0
- package/build/component/generator/copilotExtension/generator.js.map +1 -0
- package/build/component/generator/copilotExtension/helper.d.ts +4 -0
- package/build/component/generator/copilotExtension/helper.d.ts.map +1 -0
- package/build/component/generator/copilotExtension/helper.js +84 -0
- package/build/component/generator/copilotExtension/helper.js.map +1 -0
- package/build/component/generator/error.d.ts +1 -1
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +5 -5
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +25 -19
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.js +7 -7
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/generatorProvider.js +6 -6
- package/build/component/generator/generatorProvider.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +1 -2
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +39 -41
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +5 -5
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.js +0 -75
- package/build/component/generator/officeXMLAddin/projectConfig.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +4 -4
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +4 -4
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/error.js +19 -19
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +76 -76
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +8 -8
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetry-helper.js +1 -1
- package/build/component/generator/spfx/utils/telemetry-helper.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.d.ts +1 -0
- package/build/component/generator/spfx/utils/utils.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +13 -9
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/templates/ssrTabGenerator.js +1 -1
- package/build/component/generator/templates/ssrTabGenerator.js.map +1 -1
- package/build/component/generator/templates/templateGenerator.js +13 -13
- package/build/component/generator/templates/templateGenerator.js.map +1 -1
- package/build/component/generator/templates/templateNames.d.ts +1 -0
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +3 -9
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.d.ts.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.js +29 -9
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/component/generator/utils.js +6 -6
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/local/constants.d.ts +108 -108
- package/build/component/local/localCertificateManager.d.ts.map +1 -1
- package/build/component/local/localCertificateManager.js +11 -9
- package/build/component/local/localCertificateManager.js.map +1 -1
- package/build/component/local/localEnvManager.js +2 -2
- package/build/component/local/localEnvManager.js.map +1 -1
- package/build/component/local/localTelemetryReporter.js +3 -3
- package/build/component/local/localTelemetryReporter.js.map +1 -1
- package/build/component/local/portChecker.js +4 -4
- package/build/component/local/portChecker.js.map +1 -1
- package/build/component/local/taskDefinition.js +3 -3
- package/build/component/local/taskDefinition.js.map +1 -1
- package/build/component/m365/constants.d.ts +3 -0
- package/build/component/m365/constants.d.ts.map +1 -1
- package/build/component/m365/constants.js +4 -1
- package/build/component/m365/constants.js.map +1 -1
- package/build/component/m365/errors.js +2 -2
- package/build/component/m365/errors.js.map +1 -1
- package/build/component/m365/launchHelper.d.ts +2 -2
- package/build/component/m365/launchHelper.d.ts.map +1 -1
- package/build/component/m365/launchHelper.js +25 -17
- package/build/component/m365/launchHelper.js.map +1 -1
- package/build/component/m365/packageService.js +19 -19
- package/build/component/m365/packageService.js.map +1 -1
- package/build/component/messages.js +7 -7
- package/build/component/messages.js.map +1 -1
- package/build/component/middleware/actionExecutionMW.js +8 -8
- package/build/component/middleware/actionExecutionMW.js.map +1 -1
- package/build/component/middleware/envMW.js +6 -6
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/middleware/questionMW.js +3 -3
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/migrate.js +4 -4
- package/build/component/migrate.js.map +1 -1
- package/build/component/provisionUtils.js +24 -24
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +11 -11
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js +7 -7
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js.map +1 -1
- package/build/component/resource/botService/errors.js +2 -2
- package/build/component/resource/botService/errors.js.map +1 -1
- package/build/component/resource/botService/messages.js +6 -6
- package/build/component/resource/botService/messages.js.map +1 -1
- package/build/component/resource/botService/strings.js +1 -1
- package/build/component/resource/botService/strings.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +28 -28
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/azureResourceOperation.js +2 -2
- package/build/component/utils/azureResourceOperation.js.map +1 -1
- package/build/component/utils/common.d.ts +2 -2
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +5 -5
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/depsChecker/common.js +2 -2
- package/build/component/utils/depsChecker/common.js.map +1 -1
- package/build/component/utils/envFunctionUtils.d.ts +12 -0
- package/build/component/utils/envFunctionUtils.d.ts.map +1 -0
- package/build/component/utils/envFunctionUtils.js +185 -0
- package/build/component/utils/envFunctionUtils.js.map +1 -0
- package/build/component/utils/envUtil.d.ts +1 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +19 -19
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/fileOperation.js +3 -4
- package/build/component/utils/fileOperation.js.map +1 -1
- package/build/component/utils/metadataGraphPermssion.js +3 -3
- package/build/component/utils/metadataGraphPermssion.js.map +1 -1
- package/build/component/utils/metadataUtil.js +2 -2
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/component/utils/pathUtils.js +5 -5
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/settingsUtil.js +7 -7
- package/build/component/utils/settingsUtil.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/core/FxCore.d.ts +34 -0
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +671 -351
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.js +65 -65
- package/build/core/collaborator.js.map +1 -1
- package/build/core/crypto.js +4 -4
- package/build/core/crypto.js.map +1 -1
- package/build/core/environment.js +7 -7
- package/build/core/environment.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.js +13 -13
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/errorHandler.js +4 -4
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +78 -78
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +3 -3
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +9 -9
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.js +4 -4
- package/build/core/middleware/utils/MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +4 -4
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js +10 -10
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +72 -72
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/migrationContext.js +1 -1
- package/build/core/middleware/utils/migrationContext.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +9 -9
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/core/middleware/videoFilterAppBlocker.js +4 -4
- package/build/core/middleware/videoFilterAppBlocker.js.map +1 -1
- package/build/core/telemetry.js +1 -1
- package/build/core/telemetry.js.map +1 -1
- package/build/error/arm.js +10 -10
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.js +20 -20
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +4 -1
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +87 -75
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.js +24 -24
- package/build/error/deploy.js.map +1 -1
- package/build/error/m365.js +6 -6
- package/build/error/m365.js.map +1 -1
- package/build/error/script.d.ts +2 -2
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +14 -8
- package/build/error/script.js.map +1 -1
- package/build/error/teamsApp.d.ts.map +1 -1
- package/build/error/teamsApp.js +10 -8
- package/build/error/teamsApp.js.map +1 -1
- package/build/error/upgrade.js +2 -2
- package/build/error/upgrade.js.map +1 -1
- package/build/error/yml.js +12 -12
- package/build/error/yml.js.map +1 -1
- package/build/index.d.ts +10 -7
- package/build/index.d.ts.map +1 -1
- package/build/index.js +17 -16
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +38 -21
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +285 -270
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +4 -3
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +315 -228
- package/build/question/create.js.map +1 -1
- package/build/question/generator.js +6 -2
- package/build/question/generator.js.map +1 -1
- package/build/question/index.d.ts +2 -0
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +21 -15
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/AddPluginInputs.d.ts +1 -1
- package/build/question/inputs/AddPluginInputs.d.ts.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +11 -5
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/inputs/SyncManifestInputs.d.ts +16 -0
- package/build/question/inputs/SyncManifestInputs.d.ts.map +1 -0
- package/build/question/inputs/SyncManifestInputs.js +5 -0
- package/build/question/inputs/SyncManifestInputs.js.map +1 -0
- package/build/question/inputs/UninstallInputs.d.ts +22 -0
- package/build/question/inputs/UninstallInputs.d.ts.map +1 -0
- package/build/question/inputs/UninstallInputs.js +5 -0
- package/build/question/inputs/UninstallInputs.js.map +1 -0
- package/build/question/inputs/index.d.ts +2 -0
- package/build/question/inputs/index.d.ts.map +1 -1
- package/build/question/inputs/index.js +2 -0
- package/build/question/inputs/index.js.map +1 -1
- package/build/question/options/AddPluginOptions.js +1 -1
- package/build/question/options/AddPluginOptions.js.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +27 -24
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/SyncManifestOptions.d.ts +10 -0
- package/build/question/options/SyncManifestOptions.d.ts.map +1 -0
- package/build/question/options/SyncManifestOptions.js +28 -0
- package/build/question/options/SyncManifestOptions.js.map +1 -0
- package/build/question/options/UninstallOptions.d.ts +10 -0
- package/build/question/options/UninstallOptions.d.ts.map +1 -0
- package/build/question/options/UninstallOptions.js +44 -0
- package/build/question/options/UninstallOptions.js.map +1 -0
- package/build/question/options/index.d.ts +2 -0
- package/build/question/options/index.d.ts.map +1 -1
- package/build/question/options/index.js +2 -0
- package/build/question/options/index.js.map +1 -1
- package/build/question/other.d.ts +2 -0
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +210 -48
- package/build/question/other.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -0
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +41 -27
- package/build/ui/visitor.js.map +1 -1
- package/package.json +15 -10
- package/resource/dict.zip +0 -0
- package/resource/package.nls.json +175 -127
- package/resource/yaml-schema/v1.6/yaml.schema.json +13 -0
- package/resource/yaml-schema/yaml.schema.json +13 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/build/component/generator/copilotPlugin/generator.d.ts +0 -21
- package/build/component/generator/copilotPlugin/generator.d.ts.map +0 -1
- package/build/component/generator/copilotPlugin/generator.js +0 -399
- package/build/component/generator/copilotPlugin/generator.js.map +0 -1
- package/build/component/generator/copilotPlugin/helper.d.ts.map +0 -1
- package/build/component/generator/copilotPlugin/helper.js.map +0 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts.map +0 -1
- package/build/component/generator/officeXMLAddin/generator.js +0 -173
- package/build/component/generator/officeXMLAddin/generator.js.map +0 -1
|
@@ -36,9 +36,9 @@ class CollaborationUtil {
|
|
|
36
36
|
static async getCurrentUserInfo(m365TokenProvider) {
|
|
37
37
|
const user = await CollaborationUtil.getUserInfo(m365TokenProvider);
|
|
38
38
|
if (!user) {
|
|
39
|
-
return teamsfx_api_1.err(new teamsfx_api_1.SystemError(constants_2.SolutionSource, constants_2.SolutionError.FailedToRetrieveUserInfo, "Failed to retrieve current user info from graph token."));
|
|
39
|
+
return (0, teamsfx_api_1.err)(new teamsfx_api_1.SystemError(constants_2.SolutionSource, constants_2.SolutionError.FailedToRetrieveUserInfo, "Failed to retrieve current user info from graph token."));
|
|
40
40
|
}
|
|
41
|
-
return teamsfx_api_1.ok(user);
|
|
41
|
+
return (0, teamsfx_api_1.ok)(user);
|
|
42
42
|
}
|
|
43
43
|
static async getUserInfo(m365TokenProvider, email) {
|
|
44
44
|
const currentUserRes = await (m365TokenProvider === null || m365TokenProvider === void 0 ? void 0 : m365TokenProvider.getJsonObject({ scopes: constants_1.GraphScopes }));
|
|
@@ -93,10 +93,10 @@ class CollaborationUtil {
|
|
|
93
93
|
for (const [key, value] of entries) {
|
|
94
94
|
result[key] = value;
|
|
95
95
|
}
|
|
96
|
-
return teamsfx_api_1.ok(result);
|
|
96
|
+
return (0, teamsfx_api_1.ok)(result);
|
|
97
97
|
}
|
|
98
98
|
catch (error) {
|
|
99
|
-
return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.FailedToLoadDotEnvFile, localizeUtils_1.getLocalizedString("core.collaboration.error.failedToLoadDotEnvFile", error === null || error === void 0 ? void 0 : error.message)));
|
|
99
|
+
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.FailedToLoadDotEnvFile, (0, localizeUtils_1.getLocalizedString)("core.collaboration.error.failedToLoadDotEnvFile", error === null || error === void 0 ? void 0 : error.message)));
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
102
|
// Priority parameter > dotenv > env
|
|
@@ -110,7 +110,7 @@ class CollaborationUtil {
|
|
|
110
110
|
aadObjectId = (_b = inputs === null || inputs === void 0 ? void 0 : inputs[CollaborationConstants.AadObjectId]) !== null && _b !== void 0 ? _b : undefined;
|
|
111
111
|
// Return if getting two app ids
|
|
112
112
|
if (teamsAppId && aadObjectId) {
|
|
113
|
-
return teamsfx_api_1.ok({
|
|
113
|
+
return (0, teamsfx_api_1.ok)({
|
|
114
114
|
teamsAppId: teamsAppId,
|
|
115
115
|
aadObjectId: aadObjectId,
|
|
116
116
|
});
|
|
@@ -119,14 +119,14 @@ class CollaborationUtil {
|
|
|
119
119
|
if (inputs === null || inputs === void 0 ? void 0 : inputs[CollaborationConstants.DotEnvFilePath]) {
|
|
120
120
|
const loadDotEnvFileResult = await this.loadDotEnvFile(inputs === null || inputs === void 0 ? void 0 : inputs[CollaborationConstants.DotEnvFilePath]);
|
|
121
121
|
if (loadDotEnvFileResult.isErr()) {
|
|
122
|
-
return teamsfx_api_1.err(loadDotEnvFileResult.error);
|
|
122
|
+
return (0, teamsfx_api_1.err)(loadDotEnvFileResult.error);
|
|
123
123
|
}
|
|
124
124
|
const dotEnv = loadDotEnvFileResult.value;
|
|
125
125
|
teamsAppId = (_c = teamsAppId !== null && teamsAppId !== void 0 ? teamsAppId : dotEnv[CollaborationConstants.TeamsAppIdEnv]) !== null && _c !== void 0 ? _c : undefined;
|
|
126
126
|
aadObjectId = (_d = aadObjectId !== null && aadObjectId !== void 0 ? aadObjectId : dotEnv[CollaborationConstants.AadObjectIdEnv]) !== null && _d !== void 0 ? _d : undefined;
|
|
127
127
|
// Return if getting two app ids
|
|
128
128
|
if (teamsAppId && aadObjectId) {
|
|
129
|
-
return teamsfx_api_1.ok({
|
|
129
|
+
return (0, teamsfx_api_1.ok)({
|
|
130
130
|
teamsAppId: teamsAppId,
|
|
131
131
|
aadObjectId: aadObjectId,
|
|
132
132
|
});
|
|
@@ -141,11 +141,11 @@ class CollaborationUtil {
|
|
|
141
141
|
if (teamsAppIdRes.isOk()) {
|
|
142
142
|
teamsAppId = this.parseManifestId(teamsAppIdRes.value);
|
|
143
143
|
if (!teamsAppId) {
|
|
144
|
-
return teamsfx_api_1.err(new common_1.FailedToLoadManifestId(teamsAppManifestFilePath));
|
|
144
|
+
return (0, teamsfx_api_1.err)(new common_1.FailedToLoadManifestId(teamsAppManifestFilePath));
|
|
145
145
|
}
|
|
146
146
|
}
|
|
147
147
|
else {
|
|
148
|
-
return teamsfx_api_1.err(teamsAppIdRes.error);
|
|
148
|
+
return (0, teamsfx_api_1.err)(teamsAppIdRes.error);
|
|
149
149
|
}
|
|
150
150
|
}
|
|
151
151
|
if (aadAppManifestFilePath && !aadObjectId) {
|
|
@@ -153,14 +153,14 @@ class CollaborationUtil {
|
|
|
153
153
|
if (aadObjectIdRes.isOk()) {
|
|
154
154
|
aadObjectId = this.parseManifestId(aadObjectIdRes.value);
|
|
155
155
|
if (!aadObjectId) {
|
|
156
|
-
return teamsfx_api_1.err(new common_1.FailedToLoadManifestId(aadAppManifestFilePath));
|
|
156
|
+
return (0, teamsfx_api_1.err)(new common_1.FailedToLoadManifestId(aadAppManifestFilePath));
|
|
157
157
|
}
|
|
158
158
|
}
|
|
159
159
|
else {
|
|
160
|
-
return teamsfx_api_1.err(aadObjectIdRes.error);
|
|
160
|
+
return (0, teamsfx_api_1.err)(aadObjectIdRes.error);
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
|
-
return teamsfx_api_1.ok({
|
|
163
|
+
return (0, teamsfx_api_1.ok)({
|
|
164
164
|
teamsAppId: teamsAppId,
|
|
165
165
|
aadObjectId: aadObjectId,
|
|
166
166
|
});
|
|
@@ -168,17 +168,17 @@ class CollaborationUtil {
|
|
|
168
168
|
static async loadManifestId(manifestFilePath) {
|
|
169
169
|
try {
|
|
170
170
|
if (!manifestFilePath || !(await fs_extra_1.default.pathExists(manifestFilePath))) {
|
|
171
|
-
return teamsfx_api_1.err(new common_1.FileNotFoundError(constants_2.SolutionSource, manifestFilePath));
|
|
171
|
+
return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError(constants_2.SolutionSource, manifestFilePath));
|
|
172
172
|
}
|
|
173
173
|
const manifest = await fs_extra_1.default.readJson(manifestFilePath);
|
|
174
174
|
if (!manifest || !manifest.id) {
|
|
175
|
-
return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.InvalidManifestError, localizeUtils_1.getLocalizedString("error.collaboration.InvalidManifestError", manifestFilePath)));
|
|
175
|
+
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.InvalidManifestError, (0, localizeUtils_1.getLocalizedString)("error.collaboration.InvalidManifestError", manifestFilePath)));
|
|
176
176
|
}
|
|
177
177
|
const id = manifest.id;
|
|
178
|
-
return teamsfx_api_1.ok(id);
|
|
178
|
+
return (0, teamsfx_api_1.ok)(id);
|
|
179
179
|
}
|
|
180
180
|
catch (error) {
|
|
181
|
-
return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.FailedToLoadManifestFile, localizeUtils_1.getLocalizedString("error.collaboration.FailedToLoadManifest", manifestFilePath)));
|
|
181
|
+
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.FailedToLoadManifestFile, (0, localizeUtils_1.getLocalizedString)("error.collaboration.FailedToLoadManifest", manifestFilePath)));
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
184
|
static requireEnvQuestion(appId) {
|
|
@@ -187,7 +187,7 @@ class CollaborationUtil {
|
|
|
187
187
|
static parseManifestId(appId) {
|
|
188
188
|
var _a;
|
|
189
189
|
// Hardcoded id in manifest
|
|
190
|
-
if (uuid_1.validate(appId)) {
|
|
190
|
+
if ((0, uuid_1.validate)(appId)) {
|
|
191
191
|
return appId;
|
|
192
192
|
}
|
|
193
193
|
else if (appId.match(CollaborationConstants.placeholderRegex)) {
|
|
@@ -206,12 +206,12 @@ async function listCollaborator(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
206
206
|
var _a, _b, _c, _d;
|
|
207
207
|
const result = await CollaborationUtil.getCurrentUserInfo(tokenProvider.m365TokenProvider);
|
|
208
208
|
if (result.isErr()) {
|
|
209
|
-
return teamsfx_api_1.err(result.error);
|
|
209
|
+
return (0, teamsfx_api_1.err)(result.error);
|
|
210
210
|
}
|
|
211
211
|
const user = result.value;
|
|
212
212
|
const getAppIdsResult = await CollaborationUtil.getTeamsAppIdAndAadObjectId(inputs);
|
|
213
213
|
if (getAppIdsResult.isErr()) {
|
|
214
|
-
return teamsfx_api_1.err(getAppIdsResult.error);
|
|
214
|
+
return (0, teamsfx_api_1.err)(getAppIdsResult.error);
|
|
215
215
|
}
|
|
216
216
|
const appIds = getAppIdsResult.value;
|
|
217
217
|
const hasAad = appIds.aadObjectId != undefined;
|
|
@@ -220,15 +220,15 @@ async function listCollaborator(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
220
220
|
const aadCollaboration = new collaboration_1.AadCollaboration(tokenProvider.m365TokenProvider, ctx.logProvider);
|
|
221
221
|
const appStudioRes = hasTeams
|
|
222
222
|
? await teamsCollaboration.listCollaborator(ctx, appIds.teamsAppId)
|
|
223
|
-
: teamsfx_api_1.ok([]);
|
|
223
|
+
: (0, teamsfx_api_1.ok)([]);
|
|
224
224
|
if (appStudioRes.isErr())
|
|
225
|
-
return teamsfx_api_1.err(appStudioRes.error);
|
|
225
|
+
return (0, teamsfx_api_1.err)(appStudioRes.error);
|
|
226
226
|
const teamsAppOwners = appStudioRes.value;
|
|
227
227
|
const aadRes = hasAad
|
|
228
228
|
? await aadCollaboration.listCollaborator(ctx, appIds.aadObjectId)
|
|
229
|
-
: teamsfx_api_1.ok([]);
|
|
229
|
+
: (0, teamsfx_api_1.ok)([]);
|
|
230
230
|
if (aadRes.isErr())
|
|
231
|
-
return teamsfx_api_1.err(aadRes.error);
|
|
231
|
+
return (0, teamsfx_api_1.err)(aadRes.error);
|
|
232
232
|
const aadOwners = aadRes.value;
|
|
233
233
|
const teamsAppId = (_b = (_a = teamsAppOwners[0]) === null || _a === void 0 ? void 0 : _a.resourceId) !== null && _b !== void 0 ? _b : "";
|
|
234
234
|
const aadAppId = (_d = (_c = aadOwners[0]) === null || _c === void 0 ? void 0 : _c.resourceId) !== null && _d !== void 0 ? _d : "";
|
|
@@ -236,37 +236,37 @@ async function listCollaborator(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
236
236
|
if (inputs.platform === teamsfx_api_1.Platform.CLI || inputs.platform === teamsfx_api_1.Platform.VSCode) {
|
|
237
237
|
const message = [
|
|
238
238
|
{
|
|
239
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.ListingM365Permission"),
|
|
239
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.ListingM365Permission"),
|
|
240
240
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
241
241
|
},
|
|
242
242
|
{
|
|
243
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.AccountUsedToCheck"),
|
|
243
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.AccountUsedToCheck"),
|
|
244
244
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
245
245
|
},
|
|
246
246
|
{ content: user.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
247
|
-
{ content: localizeUtils_1.getLocalizedString("core.collaboration.TenantId"), color: teamsfx_api_1.Colors.BRIGHT_WHITE },
|
|
247
|
+
{ content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.TenantId"), color: teamsfx_api_1.Colors.BRIGHT_WHITE },
|
|
248
248
|
{ content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
249
249
|
];
|
|
250
250
|
if (hasTeams) {
|
|
251
|
-
message.push(...getPrintEnvMessage(inputs.env, localizeUtils_1.getLocalizedString("core.collaboration.StartingListAllTeamsAppOwners")), {
|
|
252
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.M365TeamsAppId"),
|
|
251
|
+
message.push(...getPrintEnvMessage(inputs.env, (0, localizeUtils_1.getLocalizedString)("core.collaboration.StartingListAllTeamsAppOwners")), {
|
|
252
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.M365TeamsAppId"),
|
|
253
253
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
254
254
|
}, { content: teamsAppId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `)\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
|
|
255
255
|
for (const teamsAppOwner of teamsAppOwners) {
|
|
256
256
|
message.push({
|
|
257
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.TeamsAppOwner"),
|
|
257
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.TeamsAppOwner"),
|
|
258
258
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
259
259
|
}, { content: teamsAppOwner.userPrincipalName, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `.\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
|
|
260
260
|
}
|
|
261
261
|
}
|
|
262
262
|
if (hasAad) {
|
|
263
|
-
message.push(...getPrintEnvMessage(inputs.env, localizeUtils_1.getLocalizedString("core.collaboration.StartingListAllAadAppOwners")), {
|
|
264
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.SsoAadAppId"),
|
|
263
|
+
message.push(...getPrintEnvMessage(inputs.env, (0, localizeUtils_1.getLocalizedString)("core.collaboration.StartingListAllAadAppOwners")), {
|
|
264
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.SsoAadAppId"),
|
|
265
265
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
266
266
|
}, { content: aadAppId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `)\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
|
|
267
267
|
for (const aadOwner of aadOwners) {
|
|
268
268
|
message.push({
|
|
269
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.AadAppOwner"),
|
|
269
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.AadAppOwner"),
|
|
270
270
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
271
271
|
}, { content: aadOwner.userPrincipalName, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `.\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
|
|
272
272
|
}
|
|
@@ -275,7 +275,7 @@ async function listCollaborator(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
275
275
|
void ctx.userInteraction.showMessage("info", message, false);
|
|
276
276
|
}
|
|
277
277
|
else if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
|
|
278
|
-
void ctx.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("core.collaboration.ListCollaboratorsSuccess", constants_1.VSCodeExtensionCommand.showOutputChannel), false);
|
|
278
|
+
void ctx.userInteraction.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.collaboration.ListCollaboratorsSuccess", constants_1.VSCodeExtensionCommand.showOutputChannel), false);
|
|
279
279
|
void ctx.logProvider.info(message);
|
|
280
280
|
}
|
|
281
281
|
}
|
|
@@ -286,7 +286,7 @@ async function listCollaborator(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
286
286
|
telemetryProps[constants_2.SolutionTelemetryProperty.CollaboratorCount] = teamsOwnerCount.toString();
|
|
287
287
|
telemetryProps[constants_2.SolutionTelemetryProperty.AadOwnerCount] = aadOwnerCount.toString();
|
|
288
288
|
}
|
|
289
|
-
return teamsfx_api_1.ok({
|
|
289
|
+
return (0, teamsfx_api_1.ok)({
|
|
290
290
|
state: permissionInterface_1.CollaborationState.OK,
|
|
291
291
|
});
|
|
292
292
|
}
|
|
@@ -295,7 +295,7 @@ async function checkPermission(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
295
295
|
var _a;
|
|
296
296
|
const result = await CollaborationUtil.getCurrentUserInfo(tokenProvider.m365TokenProvider);
|
|
297
297
|
if (result.isErr()) {
|
|
298
|
-
return teamsfx_api_1.err(result.error);
|
|
298
|
+
return (0, teamsfx_api_1.err)(result.error);
|
|
299
299
|
}
|
|
300
300
|
const userInfo = result.value;
|
|
301
301
|
if (inputs.platform === teamsfx_api_1.Platform.CLI) {
|
|
@@ -303,19 +303,19 @@ async function checkPermission(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
303
303
|
const aadAppTenantId = userInfo.tenantId;
|
|
304
304
|
const message = [
|
|
305
305
|
{
|
|
306
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.AccountUsedToCheck"),
|
|
306
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.AccountUsedToCheck"),
|
|
307
307
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
308
308
|
},
|
|
309
309
|
{ content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
310
|
-
...getPrintEnvMessage(inputs.env, localizeUtils_1.getLocalizedString("core.collaboration.StaringCheckPermission")),
|
|
311
|
-
{ content: localizeUtils_1.getLocalizedString("core.collaboration.TenantId"), color: teamsfx_api_1.Colors.BRIGHT_WHITE },
|
|
310
|
+
...getPrintEnvMessage(inputs.env, (0, localizeUtils_1.getLocalizedString)("core.collaboration.StaringCheckPermission")),
|
|
311
|
+
{ content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.TenantId"), color: teamsfx_api_1.Colors.BRIGHT_WHITE },
|
|
312
312
|
{ content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
313
313
|
];
|
|
314
314
|
void ctx.userInteraction.showMessage("info", message, false);
|
|
315
315
|
}
|
|
316
316
|
const getAppIdsResult = await CollaborationUtil.getTeamsAppIdAndAadObjectId(inputs);
|
|
317
317
|
if (getAppIdsResult.isErr()) {
|
|
318
|
-
return teamsfx_api_1.err(getAppIdsResult.error);
|
|
318
|
+
return (0, teamsfx_api_1.err)(getAppIdsResult.error);
|
|
319
319
|
}
|
|
320
320
|
const appIds = getAppIdsResult.value;
|
|
321
321
|
const teamsCollaboration = new collaboration_1.TeamsCollaboration(tokenProvider.m365TokenProvider);
|
|
@@ -323,16 +323,16 @@ async function checkPermission(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
323
323
|
const isTeamsActivated = appIds.teamsAppId != undefined;
|
|
324
324
|
const appStudioRes = isTeamsActivated
|
|
325
325
|
? await teamsCollaboration.checkPermission(ctx, appIds.teamsAppId, userInfo)
|
|
326
|
-
: teamsfx_api_1.ok([]);
|
|
326
|
+
: (0, teamsfx_api_1.ok)([]);
|
|
327
327
|
if (appStudioRes.isErr()) {
|
|
328
|
-
return teamsfx_api_1.err(appStudioRes.error);
|
|
328
|
+
return (0, teamsfx_api_1.err)(appStudioRes.error);
|
|
329
329
|
}
|
|
330
330
|
const permissions = appStudioRes.value;
|
|
331
331
|
const isAadActivated = appIds.aadObjectId != undefined;
|
|
332
332
|
if (isAadActivated) {
|
|
333
333
|
const aadRes = await aadCollaboration.checkPermission(ctx, appIds.aadObjectId, result.value.aadId);
|
|
334
334
|
if (aadRes.isErr())
|
|
335
|
-
return teamsfx_api_1.err(aadRes.error);
|
|
335
|
+
return (0, teamsfx_api_1.err)(aadRes.error);
|
|
336
336
|
aadRes.value.forEach((r) => {
|
|
337
337
|
permissions.push(r);
|
|
338
338
|
});
|
|
@@ -341,26 +341,26 @@ async function checkPermission(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
341
341
|
for (const permission of permissions) {
|
|
342
342
|
const message = [
|
|
343
343
|
{
|
|
344
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.CheckPermissionResourceId"),
|
|
344
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.CheckPermissionResourceId"),
|
|
345
345
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
346
346
|
},
|
|
347
347
|
{
|
|
348
|
-
content: (_a = permission.resourceId) !== null && _a !== void 0 ? _a : localizeUtils_1.getLocalizedString("core.collaboration.Undefined"),
|
|
348
|
+
content: (_a = permission.resourceId) !== null && _a !== void 0 ? _a : (0, localizeUtils_1.getLocalizedString)("core.collaboration.Undefined"),
|
|
349
349
|
color: teamsfx_api_1.Colors.BRIGHT_MAGENTA,
|
|
350
350
|
},
|
|
351
351
|
{
|
|
352
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.ResourceName"),
|
|
352
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.ResourceName"),
|
|
353
353
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
354
354
|
},
|
|
355
355
|
{ content: permission.name, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
356
356
|
{
|
|
357
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.Permission"),
|
|
357
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.Permission"),
|
|
358
358
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
359
359
|
},
|
|
360
360
|
{
|
|
361
361
|
content: permission.roles
|
|
362
362
|
? permission.roles.toString()
|
|
363
|
-
: localizeUtils_1.getLocalizedString("core.collaboration.Undefined") + "\n",
|
|
363
|
+
: (0, localizeUtils_1.getLocalizedString)("core.collaboration.Undefined") + "\n",
|
|
364
364
|
color: teamsfx_api_1.Colors.BRIGHT_MAGENTA,
|
|
365
365
|
},
|
|
366
366
|
];
|
|
@@ -372,12 +372,12 @@ async function checkPermission(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
372
372
|
if (telemetryProps) {
|
|
373
373
|
telemetryProps[constants_2.SolutionTelemetryProperty.AadPermission] = (aadPermission === null || aadPermission === void 0 ? void 0 : aadPermission.roles)
|
|
374
374
|
? aadPermission.roles.join(";")
|
|
375
|
-
: localizeUtils_1.getLocalizedString("core.collaboration.Undefined");
|
|
375
|
+
: (0, localizeUtils_1.getLocalizedString)("core.collaboration.Undefined");
|
|
376
376
|
telemetryProps[constants_2.SolutionTelemetryProperty.TeamsAppPermission] = (teamsAppPermission === null || teamsAppPermission === void 0 ? void 0 : teamsAppPermission.roles)
|
|
377
377
|
? teamsAppPermission.roles.join(";")
|
|
378
|
-
: localizeUtils_1.getLocalizedString("core.collaboration.Undefined");
|
|
378
|
+
: (0, localizeUtils_1.getLocalizedString)("core.collaboration.Undefined");
|
|
379
379
|
}
|
|
380
|
-
return teamsfx_api_1.ok({
|
|
380
|
+
return (0, teamsfx_api_1.ok)({
|
|
381
381
|
state: permissionInterface_1.CollaborationState.OK,
|
|
382
382
|
permissions,
|
|
383
383
|
});
|
|
@@ -385,25 +385,25 @@ async function checkPermission(ctx, inputs, tokenProvider, telemetryProps) {
|
|
|
385
385
|
exports.checkPermission = checkPermission;
|
|
386
386
|
async function grantPermission(ctx, inputs, tokenProvider) {
|
|
387
387
|
var _a;
|
|
388
|
-
const progressBar = ctx.userInteraction.createProgressBar(localizeUtils_1.getLocalizedString("core.collaboration.GrantingPermission"), 1);
|
|
388
|
+
const progressBar = ctx.userInteraction.createProgressBar((0, localizeUtils_1.getLocalizedString)("core.collaboration.GrantingPermission"), 1);
|
|
389
389
|
try {
|
|
390
390
|
const result = await CollaborationUtil.getCurrentUserInfo(tokenProvider.m365TokenProvider);
|
|
391
391
|
if (result.isErr()) {
|
|
392
|
-
return teamsfx_api_1.err(result.error);
|
|
392
|
+
return (0, teamsfx_api_1.err)(result.error);
|
|
393
393
|
}
|
|
394
394
|
const email = inputs.email;
|
|
395
395
|
if (!email || email === result.value.userPrincipalName) {
|
|
396
|
-
return teamsfx_api_1.err(new teamsfx_api_1.UserError("core", constants_2.SolutionError.EmailCannotBeEmptyOrSame, localizeUtils_1.getDefaultString("core.collaboration.EmailCannotBeEmptyOrSame"), localizeUtils_1.getLocalizedString("core.collaboration.EmailCannotBeEmptyOrSame")));
|
|
396
|
+
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("core", constants_2.SolutionError.EmailCannotBeEmptyOrSame, (0, localizeUtils_1.getDefaultString)("core.collaboration.EmailCannotBeEmptyOrSame"), (0, localizeUtils_1.getLocalizedString)("core.collaboration.EmailCannotBeEmptyOrSame")));
|
|
397
397
|
}
|
|
398
398
|
const userInfo = await CollaborationUtil.getUserInfo(tokenProvider.m365TokenProvider, email);
|
|
399
399
|
if (!userInfo) {
|
|
400
|
-
return teamsfx_api_1.err(new teamsfx_api_1.UserError("core", constants_2.SolutionError.CannotFindUserInCurrentTenant, localizeUtils_1.getDefaultString("core.collaboration.CannotFindUserInCurrentTenant"), localizeUtils_1.getLocalizedString("core.collaboration.CannotFindUserInCurrentTenant")));
|
|
400
|
+
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("core", constants_2.SolutionError.CannotFindUserInCurrentTenant, (0, localizeUtils_1.getDefaultString)("core.collaboration.CannotFindUserInCurrentTenant"), (0, localizeUtils_1.getLocalizedString)("core.collaboration.CannotFindUserInCurrentTenant")));
|
|
401
401
|
}
|
|
402
402
|
await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.start());
|
|
403
|
-
await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(localizeUtils_1.getLocalizedString("core.collaboration.GrantPermissionForUser", email)));
|
|
403
|
+
await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.next((0, localizeUtils_1.getLocalizedString)("core.collaboration.GrantPermissionForUser", email)));
|
|
404
404
|
const getAppIdsResult = await CollaborationUtil.getTeamsAppIdAndAadObjectId(inputs);
|
|
405
405
|
if (getAppIdsResult.isErr()) {
|
|
406
|
-
return teamsfx_api_1.err(getAppIdsResult.error);
|
|
406
|
+
return (0, teamsfx_api_1.err)(getAppIdsResult.error);
|
|
407
407
|
}
|
|
408
408
|
const appIds = getAppIdsResult.value;
|
|
409
409
|
if (inputs.platform === teamsfx_api_1.Platform.CLI) {
|
|
@@ -411,12 +411,12 @@ async function grantPermission(ctx, inputs, tokenProvider) {
|
|
|
411
411
|
const aadAppTenantId = result.value.tenantId;
|
|
412
412
|
const message = [
|
|
413
413
|
{
|
|
414
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.AccountToGrantPermission"),
|
|
414
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.AccountToGrantPermission"),
|
|
415
415
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
416
416
|
},
|
|
417
417
|
{ content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
418
|
-
...getPrintEnvMessage(inputs.env, localizeUtils_1.getLocalizedString("core.collaboration.StartingGrantPermission")),
|
|
419
|
-
{ content: localizeUtils_1.getLocalizedString("core.collaboration.TenantId"), color: teamsfx_api_1.Colors.BRIGHT_WHITE },
|
|
418
|
+
...getPrintEnvMessage(inputs.env, (0, localizeUtils_1.getLocalizedString)("core.collaboration.StartingGrantPermission")),
|
|
419
|
+
{ content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.TenantId"), color: teamsfx_api_1.Colors.BRIGHT_WHITE },
|
|
420
420
|
{ content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
421
421
|
];
|
|
422
422
|
void ctx.userInteraction.showMessage("info", message, false);
|
|
@@ -427,15 +427,15 @@ async function grantPermission(ctx, inputs, tokenProvider) {
|
|
|
427
427
|
const aadCollaboration = new collaboration_1.AadCollaboration(tokenProvider.m365TokenProvider, ctx.logProvider);
|
|
428
428
|
const appStudioRes = isTeamsActivated
|
|
429
429
|
? await teamsCollaboration.grantPermission(ctx, appIds.teamsAppId, userInfo)
|
|
430
|
-
: teamsfx_api_1.ok([]);
|
|
430
|
+
: (0, teamsfx_api_1.ok)([]);
|
|
431
431
|
if (appStudioRes.isErr()) {
|
|
432
|
-
return teamsfx_api_1.err(appStudioRes.error);
|
|
432
|
+
return (0, teamsfx_api_1.err)(appStudioRes.error);
|
|
433
433
|
}
|
|
434
434
|
const permissions = appStudioRes.value;
|
|
435
435
|
if (isAadActivated) {
|
|
436
436
|
const aadRes = await aadCollaboration.grantPermission(ctx, appIds.aadObjectId, userInfo.aadId);
|
|
437
437
|
if (aadRes.isErr())
|
|
438
|
-
return teamsfx_api_1.err(aadRes.error);
|
|
438
|
+
return (0, teamsfx_api_1.err)(aadRes.error);
|
|
439
439
|
aadRes.value.forEach((r) => {
|
|
440
440
|
permissions.push(r);
|
|
441
441
|
});
|
|
@@ -445,12 +445,12 @@ async function grantPermission(ctx, inputs, tokenProvider) {
|
|
|
445
445
|
const message = [
|
|
446
446
|
{ content: `${(_a = permission.roles) === null || _a === void 0 ? void 0 : _a.join(",")} `, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
447
447
|
{
|
|
448
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.PermissionHasBeenGrantTo"),
|
|
448
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.PermissionHasBeenGrantTo"),
|
|
449
449
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
450
450
|
},
|
|
451
451
|
{ content: permission.name, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
452
452
|
{
|
|
453
|
-
content: localizeUtils_1.getLocalizedString("core.collaboration.GrantPermissionResourceId"),
|
|
453
|
+
content: (0, localizeUtils_1.getLocalizedString)("core.collaboration.GrantPermissionResourceId"),
|
|
454
454
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
455
455
|
},
|
|
456
456
|
{ content: `${permission.resourceId}`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
|
|
@@ -458,7 +458,7 @@ async function grantPermission(ctx, inputs, tokenProvider) {
|
|
|
458
458
|
void ctx.userInteraction.showMessage("info", message, false);
|
|
459
459
|
}
|
|
460
460
|
}
|
|
461
|
-
return teamsfx_api_1.ok({
|
|
461
|
+
return (0, teamsfx_api_1.ok)({
|
|
462
462
|
state: permissionInterface_1.CollaborationState.OK,
|
|
463
463
|
userInfo: userInfo,
|
|
464
464
|
permissions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collaborator.js","sourceRoot":"","sources":["../../src/core/collaborator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"collaborator.js","sourceRoot":"","sources":["../../src/core/collaborator.ts"],"names":[],"mappings":"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"}
|
package/build/core/crypto.js
CHANGED
|
@@ -12,19 +12,19 @@ class LocalCrypto {
|
|
|
12
12
|
this.cryptr = new cryptr_1.default(projectId + "_teamsfx");
|
|
13
13
|
}
|
|
14
14
|
encrypt(plaintext) {
|
|
15
|
-
return teamsfx_api_1.ok(this.prefix + this.cryptr.encrypt(plaintext));
|
|
15
|
+
return (0, teamsfx_api_1.ok)(this.prefix + this.cryptr.encrypt(plaintext));
|
|
16
16
|
}
|
|
17
17
|
decrypt(ciphertext) {
|
|
18
18
|
if (!ciphertext.startsWith(this.prefix)) {
|
|
19
19
|
// legacy raw secret string
|
|
20
|
-
return teamsfx_api_1.ok(ciphertext);
|
|
20
|
+
return (0, teamsfx_api_1.ok)(ciphertext);
|
|
21
21
|
}
|
|
22
22
|
try {
|
|
23
|
-
return teamsfx_api_1.ok(this.cryptr.decrypt(ciphertext.substr(this.prefix.length)));
|
|
23
|
+
return (0, teamsfx_api_1.ok)(this.cryptr.decrypt(ciphertext.substr(this.prefix.length)));
|
|
24
24
|
}
|
|
25
25
|
catch (e) {
|
|
26
26
|
// ciphertext is broken
|
|
27
|
-
return teamsfx_api_1.err(new teamsfx_api_1.SystemError("Core", "DecryptionError", "Cipher text is broken"));
|
|
27
|
+
return (0, teamsfx_api_1.err)(new teamsfx_api_1.SystemError("Core", "DecryptionError", "Cipher text is broken"));
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
}
|
package/build/core/crypto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/core/crypto.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA+F;AAC/F,4DAA4B;AAE5B,MAAa,WAAW;IAItB,YAAY,SAAiB;QAFrB,WAAM,GAAG,SAAS,CAAC;QAGzB,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,SAAS,GAAG,UAAU,CAAC,CAAC;IACnD,CAAC;IAEM,OAAO,CAAC,SAAiB;QAC9B,OAAO,gBAAE,
|
|
1
|
+
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/core/crypto.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA+F;AAC/F,4DAA4B;AAE5B,MAAa,WAAW;IAItB,YAAY,SAAiB;QAFrB,WAAM,GAAG,SAAS,CAAC;QAGzB,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,SAAS,GAAG,UAAU,CAAC,CAAC;IACnD,CAAC;IAEM,OAAO,CAAC,SAAiB;QAC9B,OAAO,IAAA,gBAAE,EAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1D,CAAC;IAEM,OAAO,CAAC,UAAkB;QAC/B,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACvC,2BAA2B;YAC3B,OAAO,IAAA,gBAAE,EAAC,UAAU,CAAC,CAAC;SACvB;QACD,IAAI;YACF,OAAO,IAAA,gBAAE,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SACvE;QAAC,OAAO,CAAC,EAAE;YACV,uBAAuB;YACvB,OAAO,IAAA,iBAAG,EAAC,IAAI,yBAAW,CAAC,MAAM,EAAE,iBAAiB,EAAE,uBAAuB,CAAC,CAAC,CAAC;SACjF;IACH,CAAC;CACF;AAxBD,kCAwBC"}
|
|
@@ -18,24 +18,24 @@ class EnvironmentManager {
|
|
|
18
18
|
}
|
|
19
19
|
async listAllEnvConfigs(projectPath) {
|
|
20
20
|
if (!(await fs_extra_1.default.pathExists(projectPath))) {
|
|
21
|
-
return teamsfx_api_1.err(new common_1.FileNotFoundError("EnvironmentManager", projectPath));
|
|
21
|
+
return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError("EnvironmentManager", projectPath));
|
|
22
22
|
}
|
|
23
23
|
const allEnvsRes = await envUtil_1.envUtil.listEnv(projectPath);
|
|
24
24
|
if (allEnvsRes.isErr())
|
|
25
|
-
return teamsfx_api_1.err(allEnvsRes.error);
|
|
26
|
-
return teamsfx_api_1.ok(allEnvsRes.value);
|
|
25
|
+
return (0, teamsfx_api_1.err)(allEnvsRes.error);
|
|
26
|
+
return (0, teamsfx_api_1.ok)(allEnvsRes.value);
|
|
27
27
|
}
|
|
28
28
|
async listRemoteEnvConfigs(projectPath, returnErrorIfEmpty = false) {
|
|
29
29
|
if (!(await fs_extra_1.default.pathExists(projectPath))) {
|
|
30
|
-
return teamsfx_api_1.err(new common_1.FileNotFoundError("EnvironmentManager", projectPath));
|
|
30
|
+
return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError("EnvironmentManager", projectPath));
|
|
31
31
|
}
|
|
32
32
|
const allEnvsRes = await envUtil_1.envUtil.listEnv(projectPath);
|
|
33
33
|
if (allEnvsRes.isErr())
|
|
34
|
-
return teamsfx_api_1.err(allEnvsRes.error);
|
|
34
|
+
return (0, teamsfx_api_1.err)(allEnvsRes.error);
|
|
35
35
|
const remoteEnvs = allEnvsRes.value.filter((env) => environmentName_1.environmentNameManager.isRemoteEnvironment(env));
|
|
36
36
|
if (remoteEnvs.length === 0 && returnErrorIfEmpty)
|
|
37
|
-
return teamsfx_api_1.err(new common_1.NoEnvFilesError("EnvironmentManager"));
|
|
38
|
-
return teamsfx_api_1.ok(remoteEnvs);
|
|
37
|
+
return (0, teamsfx_api_1.err)(new common_1.NoEnvFilesError("EnvironmentManager"));
|
|
38
|
+
return (0, teamsfx_api_1.ok)(remoteEnvs);
|
|
39
39
|
}
|
|
40
40
|
async hasTestToolEnv(projectPath) {
|
|
41
41
|
if (!(await fs_extra_1.default.pathExists(projectPath))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/core/environment.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkE;AAClE,sDAAsB;AACtB,kGAA4E;AAC5E,gEAA0B;AAC1B,wDAAqD;AACrD,4CAAqE;AACrE,uDAA2D;AAE3D,MAAM,kBAAkB;IAGtB;QACE,IAAI,CAAC,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC;IACM,KAAK,CAAC,iBAAiB,CAAC,WAAmB;QAChD,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE;YACvC,OAAO,iBAAG,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/core/environment.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkE;AAClE,sDAAsB;AACtB,kGAA4E;AAC5E,gEAA0B;AAC1B,wDAAqD;AACrD,4CAAqE;AACrE,uDAA2D;AAE3D,MAAM,kBAAkB;IAGtB;QACE,IAAI,CAAC,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC;IACM,KAAK,CAAC,iBAAiB,CAAC,WAAmB;QAChD,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE;YACvC,OAAO,IAAA,iBAAG,EAAC,IAAI,0BAAiB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC,CAAC;SACtE;QACD,MAAM,UAAU,GAAG,MAAM,iBAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,UAAU,CAAC,KAAK,EAAE;YAAE,OAAO,IAAA,iBAAG,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACrD,OAAO,IAAA,gBAAE,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAC/B,WAAmB,EACnB,kBAAkB,GAAG,KAAK;QAE1B,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE;YACvC,OAAO,IAAA,iBAAG,EAAC,IAAI,0BAAiB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC,CAAC;SACtE;QACD,MAAM,UAAU,GAAG,MAAM,iBAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,UAAU,CAAC,KAAK,EAAE;YAAE,OAAO,IAAA,iBAAG,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACjD,wCAAsB,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAChD,CAAC;QACF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,kBAAkB;YAC/C,OAAO,IAAA,iBAAG,EAAC,IAAI,wBAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACxD,OAAO,IAAA,gBAAE,EAAC,UAAU,CAAC,CAAC;IACxB,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,WAAmB;QAC9C,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE;YACvC,OAAO,KAAK,CAAC;SACd;QACD,MAAM,UAAU,GAAG,MAAM,iBAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,UAAU,CAAC,KAAK,EAAE;YAAE,OAAO,KAAK,CAAC;QACrC,OAAO,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,wCAAsB,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,wBAAwB,CAAC,WAAmB;QACvD,OAAO;YACL,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;gBAC1C,CAAC,CAAC,CAAC,wCAAsB,CAAC,kBAAkB,EAAE,CAAC;gBAC/C,CAAC,CAAC,EAAE,CAAC;YACP,wCAAsB,CAAC,eAAe,EAAE;SACzC,CAAC;IACJ,CAAC;CACF;AAEY,QAAA,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC"}
|
|
@@ -3,7 +3,6 @@ declare class EnvironmentNameManager {
|
|
|
3
3
|
readonly envConfigNameRegex: RegExp;
|
|
4
4
|
readonly envStateNameRegex: RegExp;
|
|
5
5
|
readonly schema = "https://aka.ms/teamsfx-env-config-schema";
|
|
6
|
-
readonly envConfigDescription: string;
|
|
7
6
|
private readonly defaultEnvName;
|
|
8
7
|
private readonly localEnvName;
|
|
9
8
|
private readonly testToolEnvName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentName.d.ts","sourceRoot":"","sources":["../../src/core/environmentName.ts"],"names":[],"mappings":"AAGA,cAAM,sBAAsB;IAC1B,SAAgB,YAAY,SAAiB;IAC7C,SAAgB,kBAAkB,SAA4C;IAC9E,SAAgB,iBAAiB,SAA2C;IAE5E,SAAgB,MAAM,8CAA8C;
|
|
1
|
+
{"version":3,"file":"environmentName.d.ts","sourceRoot":"","sources":["../../src/core/environmentName.ts"],"names":[],"mappings":"AAGA,cAAM,sBAAsB;IAC1B,SAAgB,YAAY,SAAiB;IAC7C,SAAgB,kBAAkB,SAA4C;IAC9E,SAAgB,iBAAiB,SAA2C;IAE5E,SAAgB,MAAM,8CAA8C;IAEpE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAW;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAc;IAEvC,iBAAiB;IAIjB,eAAe;IAIf,kBAAkB;IAIlB,oBAAoB,IAAI,MAAM,EAAE;IAIhC,mBAAmB,CAAC,GAAG,EAAE,MAAM;CAGvC;AAED,eAAO,MAAM,sBAAsB,wBAA+B,CAAC"}
|
|
@@ -9,8 +9,6 @@ class EnvironmentNameManager {
|
|
|
9
9
|
this.envConfigNameRegex = /^config\.(?<envName>[\w\d-_]+)\.json$/i;
|
|
10
10
|
this.envStateNameRegex = /^state\.(?<envName>[\w\d-_]+)\.json$/i;
|
|
11
11
|
this.schema = "https://aka.ms/teamsfx-env-config-schema";
|
|
12
|
-
this.envConfigDescription = `You can customize the TeamsFx config for different environments.` +
|
|
13
|
-
` Visit https://aka.ms/teamsfx-env-config to get more info about this.`;
|
|
14
12
|
this.defaultEnvName = "dev";
|
|
15
13
|
this.localEnvName = "local";
|
|
16
14
|
this.testToolEnvName = "testtool";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentName.js","sourceRoot":"","sources":["../../src/core/environmentName.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAM,sBAAsB;IAA5B;QACkB,iBAAY,GAAG,aAAa,CAAC;QAC7B,uBAAkB,GAAG,wCAAwC,CAAC;QAC9D,sBAAiB,GAAG,uCAAuC,CAAC;QAE5D,WAAM,GAAG,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"environmentName.js","sourceRoot":"","sources":["../../src/core/environmentName.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAM,sBAAsB;IAA5B;QACkB,iBAAY,GAAG,aAAa,CAAC;QAC7B,uBAAkB,GAAG,wCAAwC,CAAC;QAC9D,sBAAiB,GAAG,uCAAuC,CAAC;QAE5D,WAAM,GAAG,0CAA0C,CAAC;QAEnD,mBAAc,GAAG,KAAK,CAAC;QACvB,iBAAY,GAAG,OAAO,CAAC;QACvB,oBAAe,GAAG,UAAU,CAAC;IAqBhD,CAAC;IAnBQ,iBAAiB;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEM,oBAAoB;QACzB,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACnD,CAAC;IAEM,mBAAmB,CAAC,GAAW;QACpC,OAAO,IAAI,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC;CACF;AAEY,QAAA,sBAAsB,GAAG,IAAI,sBAAsB,EAAE,CAAC"}
|