@microsoft/teamsfx-core 2.0.6-alpha.e73e76fb5.0 → 2.0.6-alpha.e92fb7848.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/constants.d.ts +3 -2
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +3 -2
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
- package/build/common/deps-checker/checkerFactory.js +3 -0
- package/build/common/deps-checker/checkerFactory.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +1 -0
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +1 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts +17 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts.map +1 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.js +47 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.js.map +1 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts +16 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts.map +1 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.js +53 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.js.map +1 -0
- package/build/common/deps-checker/depsChecker.d.ts +6 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js +6 -1
- package/build/common/deps-checker/depsChecker.js.map +1 -1
- package/build/common/deps-checker/index.d.ts +2 -0
- package/build/common/deps-checker/index.d.ts.map +1 -1
- package/build/common/deps-checker/index.js +2 -0
- package/build/common/deps-checker/index.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/testToolChecker.d.ts +14 -3
- package/build/common/deps-checker/internal/testToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/testToolChecker.js +178 -70
- package/build/common/deps-checker/internal/testToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +3 -45
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/common/deps-checker/util/downloadHelper.d.ts +15 -0
- package/build/common/deps-checker/util/downloadHelper.d.ts.map +1 -0
- package/build/common/deps-checker/util/downloadHelper.js +59 -0
- package/build/common/deps-checker/util/downloadHelper.js.map +1 -0
- package/build/common/featureFlags.d.ts +3 -3
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +11 -12
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/local/constants.d.ts +1 -0
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +1 -0
- package/build/common/local/constants.js.map +1 -1
- package/build/common/local/localCertificateManager.d.ts +5 -4
- package/build/common/local/localCertificateManager.d.ts.map +1 -1
- package/build/common/local/localCertificateManager.js +9 -2
- package/build/common/local/localCertificateManager.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts +0 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +1 -29
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts +1 -0
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +85 -7
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectTypeChecker.d.ts +38 -0
- package/build/common/projectTypeChecker.d.ts.map +1 -0
- package/build/common/projectTypeChecker.js +217 -0
- package/build/common/projectTypeChecker.js.map +1 -0
- package/build/common/samples.d.ts +13 -7
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +83 -49
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.js +2 -4
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +1 -1
- package/build/common/spec-parser/constants.d.ts +23 -14
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +23 -15
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/index.browser.d.ts +6 -0
- package/build/common/spec-parser/index.browser.d.ts.map +1 -0
- package/build/common/spec-parser/index.browser.js +16 -0
- package/build/common/spec-parser/index.browser.js.map +1 -0
- package/build/common/spec-parser/index.d.ts +5 -0
- package/build/common/spec-parser/index.d.ts.map +1 -0
- package/build/common/spec-parser/index.js +16 -0
- package/build/common/spec-parser/index.js.map +1 -0
- package/build/common/spec-parser/interfaces.d.ts +37 -3
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +3 -3
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +4 -4
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +49 -110
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specFilter.d.ts +1 -1
- package/build/common/spec-parser/specFilter.d.ts.map +1 -1
- package/build/common/spec-parser/specFilter.js +2 -2
- package/build/common/spec-parser/specFilter.js.map +1 -1
- package/build/common/spec-parser/specParser.browser.d.ts +46 -0
- package/build/common/spec-parser/specParser.browser.d.ts.map +1 -0
- package/build/common/spec-parser/specParser.browser.js +139 -0
- package/build/common/spec-parser/specParser.browser.js.map +1 -0
- package/build/common/spec-parser/specParser.d.ts +11 -11
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +100 -113
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +18 -5
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +304 -41
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/common/telemetry.d.ts +23 -2
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +40 -1
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +1 -1
- package/build/common/tools.js.map +1 -1
- package/build/component/configManager/lifecycle.d.ts +1 -0
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +17 -5
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +2 -3
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/coordinator/index.d.ts +2 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +11 -10
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +32 -0
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.js +1 -1
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/invalidFieldInManifestError.js +1 -1
- package/build/component/driver/aad/error/invalidFieldInManifestError.js.map +1 -1
- package/build/component/driver/aad/permissions/index.d.ts +3 -0
- package/build/component/driver/aad/permissions/index.d.ts.map +1 -1
- package/build/component/driver/aad/permissions/index.js +34 -1
- package/build/component/driver/aad/permissions/index.js.map +1 -1
- package/build/component/driver/aad/permissions/permissions.json +42 -42
- package/build/component/driver/aad/update.d.ts +1 -0
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +19 -17
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.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/constants.js +1 -1
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/add/addWebPart.d.ts.map +1 -1
- package/build/component/driver/add/addWebPart.js +2 -0
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/add/interface/AddWebPartArgs.d.ts +4 -0
- package/build/component/driver/add/interface/AddWebPartArgs.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.d.ts +17 -0
- package/build/component/driver/apiKey/create.d.ts.map +1 -0
- package/build/component/driver/apiKey/create.js +228 -0
- package/build/component/driver/apiKey/create.js.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.d.ts +5 -0
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.d.ts.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js +22 -0
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyDomainInvalid.d.ts +5 -0
- package/build/component/driver/apiKey/error/apiKeyDomainInvalid.d.ts.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyDomainInvalid.js +22 -0
- package/build/component/driver/apiKey/error/apiKeyDomainInvalid.js.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.d.ts +5 -0
- package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.d.ts.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.js +21 -0
- package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.js.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyNameTooLong.d.ts +5 -0
- package/build/component/driver/apiKey/error/apiKeyNameTooLong.d.ts.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyNameTooLong.js +21 -0
- package/build/component/driver/apiKey/error/apiKeyNameTooLong.js.map +1 -0
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts +7 -0
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts.map +1 -0
- package/build/component/driver/apiKey/interface/createApiKeyArgs.js +5 -0
- package/build/component/driver/apiKey/interface/createApiKeyArgs.js.map +1 -0
- package/build/component/driver/apiKey/interface/createApiKeyOutputs.d.ts +7 -0
- package/build/component/driver/apiKey/interface/createApiKeyOutputs.d.ts.map +1 -0
- package/build/component/driver/apiKey/interface/createApiKeyOutputs.js +10 -0
- package/build/component/driver/apiKey/interface/createApiKeyOutputs.js.map +1 -0
- package/build/component/driver/apiKey/utility/constants.d.ts +10 -0
- package/build/component/driver/apiKey/utility/constants.d.ts.map +1 -0
- package/build/component/driver/apiKey/utility/constants.js +15 -0
- package/build/component/driver/apiKey/utility/constants.js.map +1 -0
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts +3 -2
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +5 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts +5 -0
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +27 -6
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts +2 -1
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +5 -2
- package/build/component/driver/devTool/installDriver.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/script/scriptDriver.d.ts +12 -7
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +52 -23
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +13 -0
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +38 -0
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +2 -0
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +2 -0
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +26 -6
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.d.ts +44 -0
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.js +21 -0
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistrationClientSecret.d.ts +15 -0
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistrationClientSecret.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistrationClientSecret.js +5 -0
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistrationClientSecret.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +9 -9
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.d.ts +20 -0
- package/build/component/driver/teamsApp/teamsappMgr.d.ts.map +1 -0
- package/build/component/driver/teamsApp/teamsappMgr.js +278 -0
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -0
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +7 -2
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +49 -15
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +47 -30
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +4 -2
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +105 -20
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +5 -8
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +16 -16
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts +5 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +26 -27
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +6 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +30 -12
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/generator.js +1 -1
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +41 -37
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +7 -0
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +1 -14
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +1 -14
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/utils.d.ts +7 -5
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +35 -16
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/middleware/questionMW.d.ts +1 -1
- package/build/component/middleware/questionMW.d.ts.map +1 -1
- package/build/component/middleware/questionMW.js +4 -1
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts +1 -0
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +31 -1
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/common.d.ts +3 -1
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +11 -4
- package/build/component/utils/common.js.map +1 -1
- 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 +6 -1
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/fileOperation.d.ts +1 -1
- package/build/component/utils/fileOperation.d.ts.map +1 -1
- package/build/component/utils/fileOperation.js +34 -48
- package/build/component/utils/fileOperation.js.map +1 -1
- package/build/component/utils/metadataGraphPermssion.d.ts +16 -0
- package/build/component/utils/metadataGraphPermssion.d.ts.map +1 -0
- package/build/component/utils/metadataGraphPermssion.js +96 -0
- package/build/component/utils/metadataGraphPermssion.js.map +1 -0
- package/build/component/utils/metadataUtil.d.ts.map +1 -1
- package/build/component/utils/metadataUtil.js +2 -0
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/core/FxCore.d.ts +24 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +190 -25
- package/build/core/FxCore.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +11 -10
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +4 -4
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +1 -1
- package/build/error/common.d.ts +9 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +34 -1
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts +6 -0
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +25 -1
- package/build/error/deploy.js.map +1 -1
- package/build/error/teamsApp.d.ts +4 -1
- package/build/error/teamsApp.d.ts.map +1 -1
- package/build/error/teamsApp.js +13 -1
- package/build/error/teamsApp.js.map +1 -1
- package/build/index.d.ts +4 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +8 -1
- package/build/index.js.map +1 -1
- package/build/question/create.d.ts +9 -7
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +149 -91
- package/build/question/create.js.map +1 -1
- package/build/question/generator.js +1 -3
- package/build/question/generator.js.map +1 -1
- package/build/question/index.d.ts +1 -0
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +3 -0
- 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/inputs/DeployAadManifestInputs.d.ts +1 -1
- package/build/question/inputs/DeployAadManifestInputs.d.ts.map +1 -1
- package/build/question/inputs/PermissionGrantInputs.d.ts +2 -2
- package/build/question/inputs/PermissionGrantInputs.d.ts.map +1 -1
- package/build/question/inputs/PermissionListInputs.d.ts +1 -1
- package/build/question/inputs/PermissionListInputs.d.ts.map +1 -1
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts +2 -0
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +9 -9
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.js +5 -1
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -1
- package/build/question/options/DeployAadManifestOptions.js +2 -2
- package/build/question/options/DeployAadManifestOptions.js.map +1 -1
- package/build/question/options/PermissionGrantOptions.js +2 -2
- package/build/question/options/PermissionGrantOptions.js.map +1 -1
- package/build/question/options/PermissionListOptions.js +2 -2
- package/build/question/options/PermissionListOptions.js.map +1 -1
- package/build/question/options/SPFxAddWebpartOptions.d.ts.map +1 -1
- package/build/question/options/SPFxAddWebpartOptions.js +9 -0
- package/build/question/options/SPFxAddWebpartOptions.js.map +1 -1
- package/build/question/other.d.ts +3 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +100 -6
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +3 -2
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +3 -2
- package/build/question/questionNames.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +11 -2
- package/build/ui/visitor.js.map +1 -1
- package/package.json +16 -23
- package/resource/package.nls.json +84 -59
- package/resource/yaml-schema/v1.3/yaml.schema.json +81 -35
- package/templates/core/v3Migration/csharp.app.local.yml +6 -6
- package/templates/core/v3Migration/csharp.app.yml +6 -6
- package/templates/core/v3Migration/js.ts.app.local.yml +11 -11
- package/templates/core/v3Migration/js.ts.app.yml +12 -12
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Bot/Pages/BotAuthorizeEndPage.cshtml +55 -51
- package/templates/plugins/resource/aad/auth/V3/Enable SSO.txt +2 -2
- package/templates/plugins/resource/aad/auth/bot/README.md +13 -13
- package/templates/plugins/resource/aad/auth/bot/README.txt +7 -7
- package/templates/plugins/resource/aad/auth/bot/csharp/Pages/BotAuthorizeEndPage.cshtml +55 -51
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +6 -2
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +5 -1
- package/templates/plugins/resource/aad/auth/tab/README.md +6 -6
- package/templates/plugins/resource/aad/auth/tab/README.txt +5 -5
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +16 -9
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +11 -7
- package/templates/plugins/resource/aad/auth/tab/js/sso/GetUserProfile.jsx +1 -1
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +16 -9
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +11 -7
- package/templates/plugins/resource/aad/auth/tab/ts/sso/GetUserProfile.tsx +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resourceGroupHelper = void 0;
|
|
3
|
+
exports.resourceGroupHelper = exports.recommendedLocations = void 0;
|
|
4
4
|
// Copyright (c) Microsoft Corporation.
|
|
5
5
|
// Licensed under the MIT license.
|
|
6
6
|
const arm_resources_1 = require("@azure/arm-resources");
|
|
@@ -14,6 +14,36 @@ const visitor_1 = require("../../ui/visitor");
|
|
|
14
14
|
const constants_1 = require("../constants");
|
|
15
15
|
const MsResources = "Microsoft.Resources";
|
|
16
16
|
const ResourceGroups = "resourceGroups";
|
|
17
|
+
exports.recommendedLocations = [
|
|
18
|
+
"South Africa North",
|
|
19
|
+
"Australia East",
|
|
20
|
+
"Central India",
|
|
21
|
+
"East Asia",
|
|
22
|
+
"Japan East",
|
|
23
|
+
"Korea Central",
|
|
24
|
+
"Southeast Asia",
|
|
25
|
+
"Canada Central",
|
|
26
|
+
"France Central",
|
|
27
|
+
"Germany West Central",
|
|
28
|
+
"Italy North",
|
|
29
|
+
"North Europe",
|
|
30
|
+
"Norway East",
|
|
31
|
+
"Poland Central",
|
|
32
|
+
"Sweden Central",
|
|
33
|
+
"Switzerland North",
|
|
34
|
+
"UK South",
|
|
35
|
+
"West Europe",
|
|
36
|
+
"Israel Central",
|
|
37
|
+
"Qatar Central",
|
|
38
|
+
"UAE North",
|
|
39
|
+
"Brazil South",
|
|
40
|
+
"Central US",
|
|
41
|
+
"East US",
|
|
42
|
+
"East US 2",
|
|
43
|
+
"South Central US",
|
|
44
|
+
"West US 2",
|
|
45
|
+
"West US 3",
|
|
46
|
+
];
|
|
17
47
|
// TODO: use the emoji plus sign like Azure Functions extension
|
|
18
48
|
const newResourceGroupOption = "+ New resource group";
|
|
19
49
|
class ResourceGroupHelper {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResourceGroupHelper.js","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAAgE;AAChE,gEAA8D;AAC9D,wDASgC;AAChC,sDAA8C;AAC9C,6CAQ2B;AAC3B,gDAAiE;AACjE,gEAA6D;AAC7D,8CAA4C;AAC5C,4CAA8C;AAE9C,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,cAAc,GAAG,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"ResourceGroupHelper.js","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,9 @@ declare type KeyValidators<T> = {
|
|
|
15
15
|
export declare function asFactory<T>(keyValidators: KeyValidators<T>): (data: unknown, helpLink?: string | undefined) => T;
|
|
16
16
|
export declare function wrapRun(exec: () => Promise<Map<string, string>>, errorSource: string, errorHandler?: () => Promise<void>, logProvider?: LogProvider): Promise<Result<Map<string, string>, FxError>>;
|
|
17
17
|
export declare function wrapSummary(exec: () => Promise<Result<Map<string, string>, FxError>>, summary: string[]): Promise<ExecutionResult>;
|
|
18
|
-
export declare function expandEnvironmentVariable(content: string
|
|
18
|
+
export declare function expandEnvironmentVariable(content: string, envs?: {
|
|
19
|
+
[key in string]: string;
|
|
20
|
+
}): string;
|
|
19
21
|
/**
|
|
20
22
|
* Expand environment variables in content. The format of referencing environment variable is: ${{ENV_NAME}}
|
|
21
23
|
* @return An array of environment variables
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAKjE;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,CAAC,CAKhF;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,CAAC,OAC7D,OAAO,OAAO,MAAM,oCAAsB,CAAC,GAAG,SAAS,CAM5E;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAO7E;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAK3E;AAED,aAAK,aAAa,CAAC,CAAC,IAAI;KACrB,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF,wBAAgB,SAAS,CAAC,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,UACnC,OAAO,oCAAsB,CAAC,CAgBtD;AAED,wBAAsB,OAAO,CAC3B,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACxC,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAClC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAkB/C;AAED,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,EACzD,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,eAAe,CAAC,CAS1B;AAGD,wBAAgB,yBAAyB,
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAKjE;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,CAAC,CAKhF;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,CAAC,OAC7D,OAAO,OAAO,MAAM,oCAAsB,CAAC,GAAG,SAAS,CAM5E;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAO7E;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAK3E;AAED,aAAK,aAAa,CAAC,CAAC,IAAI;KACrB,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF,wBAAgB,SAAS,CAAC,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,UACnC,OAAO,oCAAsB,CAAC,CAgBtD;AAED,wBAAsB,OAAO,CAC3B,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACxC,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAClC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAkB/C;AAED,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,EACzD,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,eAAe,CAAC,CAS1B;AAGD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;KAAG,GAAG,IAAI,MAAM,GAAG,MAAM;CAAE,GACjC,MAAM,CAmBR;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAQjE;AAED,wBAAgB,eAAe,CAAC,sBAAsB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAM3F"}
|
|
@@ -95,14 +95,21 @@ async function wrapSummary(exec, summary) {
|
|
|
95
95
|
}
|
|
96
96
|
exports.wrapSummary = wrapSummary;
|
|
97
97
|
// Expand environment variables in content. The format of referencing environment variable is: ${{ENV_NAME}}
|
|
98
|
-
function expandEnvironmentVariable(content) {
|
|
98
|
+
function expandEnvironmentVariable(content, envs) {
|
|
99
99
|
const placeholders = content.match(placeholderRegex);
|
|
100
100
|
if (placeholders) {
|
|
101
101
|
for (const placeholder of placeholders) {
|
|
102
102
|
const envName = placeholder.slice(3, -2).trim(); // removes `${{` and `}}`
|
|
103
|
-
const envValue = process.env[envName];
|
|
104
|
-
if (
|
|
105
|
-
|
|
103
|
+
const envValue = envs ? envs[envName] : process.env[envName];
|
|
104
|
+
if (envName === "APP_NAME_SUFFIX") {
|
|
105
|
+
if (envValue !== undefined && envValue !== null) {
|
|
106
|
+
content = content.replace(placeholder, envValue);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
if (envValue) {
|
|
111
|
+
content = content.replace(placeholder, envValue);
|
|
112
|
+
}
|
|
106
113
|
}
|
|
107
114
|
}
|
|
108
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ declare class EnvUtil {
|
|
|
15
15
|
* @returns
|
|
16
16
|
*/
|
|
17
17
|
readEnv(projectPath: string, env: string, loadToProcessEnv?: boolean, silent?: boolean): Promise<Result<DotenvOutput, FxError>>;
|
|
18
|
+
loadEnvFile(dotEnvFilePath: string): Promise<Result<DotenvOutput, FxError>>;
|
|
18
19
|
mergeEnv(envWithHigherPriority: NodeJS.ProcessEnv | DotenvOutput, envWithLowerPriority: DotenvOutput): void;
|
|
19
20
|
/**
|
|
20
21
|
* write env variables into .env file,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":";AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAelE,oBAAY,YAAY,GAAG;IACzB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAeF,cAAM,OAAO;IACX;;;;;;;;;OASG;IACG,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,EACvB,MAAM,UAAO,GACZ,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"envUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":";AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAelE,oBAAY,YAAY,GAAG;IACzB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAeF,cAAM,OAAO;IACX;;;;;;;;;OASG;IACG,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,EACvB,MAAM,UAAO,GACZ,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAkFnC,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAQjF,QAAQ,CACN,qBAAqB,EAAE,MAAM,CAAC,UAAU,GAAG,YAAY,EACvD,oBAAoB,EAAE,YAAY;IASpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAkEhC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAc1F,UAAU,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAOlD,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY;IAQlD,0BAA0B,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAMtE;AAED,eAAO,MAAM,OAAO,SAAgB,CAAC;AAGrC,aAAK,gBAAgB,GACjB,MAAM,GACN;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,CAAA;CAAE,CAAC;AACxE,UAAU,iBAAiB;IACzB,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC3B,GAAG,EAAE,YAAY,CAAC;CACnB;AAED,cAAM,UAAU;IACd,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,iBAAiB;IA6CpD,SAAS,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;CAmC7C;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC"}
|
|
@@ -112,6 +112,11 @@ class EnvUtil {
|
|
|
112
112
|
(_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(telemetry_1.TelemetryEvent.MetaData, props);
|
|
113
113
|
return teamsfx_api_1.ok(parseResult.obj);
|
|
114
114
|
}
|
|
115
|
+
async loadEnvFile(dotEnvFilePath) {
|
|
116
|
+
const parseResult = exports.dotenvUtil.deserialize(await fs_extra_1.default.readFile(dotEnvFilePath, { encoding: "utf8" }));
|
|
117
|
+
this.mergeEnv(process.env, parseResult.obj);
|
|
118
|
+
return teamsfx_api_1.ok(parseResult.obj);
|
|
119
|
+
}
|
|
115
120
|
mergeEnv(envWithHigherPriority, envWithLowerPriority) {
|
|
116
121
|
for (const key of Object.keys(envWithLowerPriority)) {
|
|
117
122
|
if (!envWithHigherPriority[key]) {
|
|
@@ -301,7 +306,7 @@ class DotenvUtil {
|
|
|
301
306
|
if (line.quote) {
|
|
302
307
|
value = `${line.quote}${value}${line.quote}`;
|
|
303
308
|
}
|
|
304
|
-
array.push(`${line.key}=${value}${line.comment ? line.comment : ""}`);
|
|
309
|
+
array.push(`${line.key}=${value}${line.comment ? " " + line.comment : ""}`);
|
|
305
310
|
}
|
|
306
311
|
});
|
|
307
312
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envUtil.js","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"envUtil.js","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,6 @@ import { Ignore } from "ignore";
|
|
|
7
7
|
* @param notIncluded block list
|
|
8
8
|
* @param cache zip cache file location
|
|
9
9
|
*/
|
|
10
|
-
export declare function zipFolderAsync(sourceDir: string, cache: string, notIncluded: Ignore): Promise<
|
|
10
|
+
export declare function zipFolderAsync(sourceDir: string, cache: string, notIncluded: Ignore): Promise<fs.ReadStream>;
|
|
11
11
|
export declare function forEachFileAndDir(root: string, callback: (itemPath: string, stats: fs.Stats) => boolean | void, filter?: (itemPath: string) => boolean): Promise<void>;
|
|
12
12
|
//# sourceMappingURL=fileOperation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileOperation.d.ts","sourceRoot":"","sources":["../../../src/component/utils/fileOperation.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAE,MAAM,UAAU,CAAC;AAG/B,
|
|
1
|
+
{"version":3,"file":"fileOperation.d.ts","sourceRoot":"","sources":["../../../src/component/utils/fileOperation.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAE,MAAM,UAAU,CAAC;AAG/B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,CAsExB;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO,GAAG,IAAI,EAC/D,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,GACrC,OAAO,CAAC,IAAI,CAAC,CAaf"}
|
|
@@ -7,9 +7,7 @@ const tslib_1 = require("tslib");
|
|
|
7
7
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
8
8
|
const klaw_1 = tslib_1.__importDefault(require("klaw"));
|
|
9
9
|
const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
10
|
-
const ignore_1 = tslib_1.__importDefault(require("ignore"));
|
|
11
10
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
12
|
-
const deployConstant_1 = require("../constant/deployConstant");
|
|
13
11
|
const deploy_1 = require("../../error/deploy");
|
|
14
12
|
/**
|
|
15
13
|
* Asynchronously zip a folder and return buffer
|
|
@@ -18,12 +16,22 @@ const deploy_1 = require("../../error/deploy");
|
|
|
18
16
|
* @param cache zip cache file location
|
|
19
17
|
*/
|
|
20
18
|
async function zipFolderAsync(sourceDir, cache, notIncluded) {
|
|
21
|
-
|
|
19
|
+
var _a, _b;
|
|
22
20
|
const tasks = [];
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
21
|
+
const ig = notIncluded;
|
|
22
|
+
// always delete cache if exists
|
|
23
|
+
if (fs.existsSync(cache)) {
|
|
24
|
+
try {
|
|
25
|
+
await fs.remove(cache);
|
|
26
|
+
}
|
|
27
|
+
catch (e) {
|
|
28
|
+
if (e instanceof Error && ((_a = e) === null || _a === void 0 ? void 0 : _a.code) === "EBUSY") {
|
|
29
|
+
throw new deploy_1.CacheFileInUse(cache, e);
|
|
30
|
+
}
|
|
31
|
+
throw e;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
const zip = new adm_zip_1.default();
|
|
27
35
|
const addFileIntoZip = async (zp, filePath, zipPath, stats) => {
|
|
28
36
|
var _a;
|
|
29
37
|
const content = await fs.readFile(filePath);
|
|
@@ -36,24 +44,6 @@ async function zipFolderAsync(sourceDir, cache, notIncluded) {
|
|
|
36
44
|
const relativePath = path_1.default.relative(sourceDir, itemPath);
|
|
37
45
|
const zipPath = path_1.default.normalize(relativePath).split("\\").join("/");
|
|
38
46
|
if (relativePath && !stats.isDirectory()) {
|
|
39
|
-
zipFiles.add(zipPath);
|
|
40
|
-
const entry = zip.getEntry(zipPath);
|
|
41
|
-
if (entry) {
|
|
42
|
-
// The header is an object, the ts declare of adm-zip is wrong.
|
|
43
|
-
const header = entry.header;
|
|
44
|
-
const mtime = header ? header.time : new Date(0);
|
|
45
|
-
// Some files' mtime in node_modules are too old, which may be invalid,
|
|
46
|
-
// so we arbitrarily add a limitation to update this kind of files.
|
|
47
|
-
// If mtime is valid and the two mtime is same in two-seconds, we think the two are same file.
|
|
48
|
-
if (mtime >= deployConstant_1.DeployConstant.LATEST_TRUST_MS_TIME &&
|
|
49
|
-
normalizeTime(mtime.getTime()) === normalizeTime(stats.mtime.getTime())) {
|
|
50
|
-
return;
|
|
51
|
-
}
|
|
52
|
-
// Delete the entry because the file has been updated.
|
|
53
|
-
zip.deleteFile(zipPath);
|
|
54
|
-
}
|
|
55
|
-
// If fail to reuse cached entry, load it from disk.
|
|
56
|
-
// path doesn't work properly under windows
|
|
57
47
|
const fullPath = path_1.default.join(sourceDir, relativePath);
|
|
58
48
|
const task = addFileIntoZip(zip, fullPath, zipPath, stats);
|
|
59
49
|
tasks.push(task);
|
|
@@ -61,18 +51,32 @@ async function zipFolderAsync(sourceDir, cache, notIncluded) {
|
|
|
61
51
|
}, (itemPath) => {
|
|
62
52
|
return !ig.test(path_1.default.relative(sourceDir, itemPath)).ignored;
|
|
63
53
|
});
|
|
64
|
-
if (tasks.length === 0
|
|
54
|
+
if (tasks.length === 0) {
|
|
65
55
|
throw new deploy_1.DeployEmptyFolderError(sourceDir);
|
|
66
56
|
}
|
|
67
57
|
await Promise.all(tasks);
|
|
68
|
-
removeLegacyFileInZip(zip, zipFiles);
|
|
69
58
|
// save to cache if exists
|
|
70
|
-
const buffer = zip.toBuffer();
|
|
71
59
|
if (cache && tasks) {
|
|
72
60
|
await fs.mkdirs(path_1.default.dirname(cache));
|
|
73
|
-
|
|
61
|
+
try {
|
|
62
|
+
await new Promise((resolve, reject) => {
|
|
63
|
+
zip.writeZip(cache, (err) => {
|
|
64
|
+
if (err) {
|
|
65
|
+
reject(err);
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
resolve({});
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
catch (e) {
|
|
74
|
+
if (e instanceof Error && ((_b = e) === null || _b === void 0 ? void 0 : _b.code) === "ERR_OUT_OF_RANGE") {
|
|
75
|
+
throw new deploy_1.ZipFileError(e);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
74
78
|
}
|
|
75
|
-
return
|
|
79
|
+
return fs.createReadStream(cache);
|
|
76
80
|
}
|
|
77
81
|
exports.zipFolderAsync = zipFolderAsync;
|
|
78
82
|
async function forEachFileAndDir(root, callback, filter) {
|
|
@@ -90,22 +94,4 @@ async function forEachFileAndDir(root, callback, filter) {
|
|
|
90
94
|
});
|
|
91
95
|
}
|
|
92
96
|
exports.forEachFileAndDir = forEachFileAndDir;
|
|
93
|
-
function removeLegacyFileInZip(zip, existenceFiles) {
|
|
94
|
-
zip
|
|
95
|
-
.getEntries()
|
|
96
|
-
.filter((entry) => !existenceFiles.has(entry.name))
|
|
97
|
-
.forEach((entry) => {
|
|
98
|
-
zip.deleteFile(entry.name);
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
async function readZip(cache) {
|
|
102
|
-
try {
|
|
103
|
-
const content = await fs.readFile(cache);
|
|
104
|
-
return new adm_zip_1.default(content);
|
|
105
|
-
}
|
|
106
|
-
catch (_a) {
|
|
107
|
-
// Failed to load cache, it doesn't block deployment.
|
|
108
|
-
}
|
|
109
|
-
return undefined;
|
|
110
|
-
}
|
|
111
97
|
//# sourceMappingURL=fileOperation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileOperation.js","sourceRoot":"","sources":["../../../src/component/utils/fileOperation.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,wDAAwB;AACxB,8DAA8C;
|
|
1
|
+
{"version":3,"file":"fileOperation.js","sourceRoot":"","sources":["../../../src/component/utils/fileOperation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { ProjectModel } from "../configManager/interface";
|
|
2
|
+
import { AADManifest } from "../driver/aad/interface/AADManifest";
|
|
3
|
+
declare class MetadataGraphPermissionUtil {
|
|
4
|
+
parseAadManifest(ymlPath: string, model: ProjectModel, props: {
|
|
5
|
+
[key: string]: string;
|
|
6
|
+
}): Promise<void>;
|
|
7
|
+
getPermissionSummary(manifest: AADManifest): {
|
|
8
|
+
hasGraphPermission: boolean;
|
|
9
|
+
hasRole: boolean;
|
|
10
|
+
hasAdminScope: boolean;
|
|
11
|
+
scopes: string[];
|
|
12
|
+
} | undefined;
|
|
13
|
+
}
|
|
14
|
+
export declare const metadataGraphPermissionUtil: MetadataGraphPermissionUtil;
|
|
15
|
+
export {};
|
|
16
|
+
//# sourceMappingURL=metadataGraphPermssion.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metadataGraphPermssion.d.ts","sourceRoot":"","sources":["../../../src/component/utils/metadataGraphPermssion.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAIlE,cAAM,2BAA2B;IACzB,gBAAgB,CACpB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAC/B,OAAO,CAAC,IAAI,CAAC;IAsChB,oBAAoB,CAAC,QAAQ,EAAE,WAAW;;;;;;CAyC3C;AAED,eAAO,MAAM,2BAA2B,6BAAoC,CAAC"}
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.metadataGraphPermissionUtil = void 0;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
7
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
8
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
9
|
+
const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
|
|
10
|
+
const versionMetadata_1 = require("../../common/versionMetadata");
|
|
11
|
+
const permissions_1 = require("../driver/aad/permissions");
|
|
12
|
+
const telemetry_1 = require("../../common/telemetry");
|
|
13
|
+
const update_1 = require("../driver/aad/update");
|
|
14
|
+
class MetadataGraphPermissionUtil {
|
|
15
|
+
async parseAadManifest(ymlPath, model, props) {
|
|
16
|
+
var _a;
|
|
17
|
+
let aadManifestName = versionMetadata_1.MetadataV3.aadManifestFileName;
|
|
18
|
+
const updateAction = (_a = model.provision) === null || _a === void 0 ? void 0 : _a.driverDefs.find((def) => def.uses === update_1.actionName);
|
|
19
|
+
// if aadApp/update action is defined, use the manifest file in the action
|
|
20
|
+
if (updateAction) {
|
|
21
|
+
const parameters = updateAction.with;
|
|
22
|
+
if (parameters && parameters["manifestPath"]) {
|
|
23
|
+
aadManifestName = parameters["manifestPath"];
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
const aadManifestPath = path_1.default.join(path_1.default.dirname(ymlPath), aadManifestName);
|
|
27
|
+
if (!(await fs_extra_1.default.pathExists(aadManifestPath))) {
|
|
28
|
+
props[telemetry_1.TelemetryProperty.AadManifest] = "false";
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
props[telemetry_1.TelemetryProperty.AadManifest] = "true";
|
|
32
|
+
try {
|
|
33
|
+
const manifestString = await fs_extra_1.default.readFile(aadManifestPath, "utf8");
|
|
34
|
+
const manifest = JSON.parse(manifestString);
|
|
35
|
+
const graphPermissionSummary = this.getPermissionSummary(manifest);
|
|
36
|
+
if (graphPermissionSummary) {
|
|
37
|
+
props[telemetry_1.TelemetryProperty.GraphPermission] = graphPermissionSummary.hasGraphPermission
|
|
38
|
+
? "true"
|
|
39
|
+
: "false";
|
|
40
|
+
props[telemetry_1.TelemetryProperty.GraphPermissionHasRole] = graphPermissionSummary.hasRole
|
|
41
|
+
? "true"
|
|
42
|
+
: "false";
|
|
43
|
+
props[telemetry_1.TelemetryProperty.GraphPermissionHasAdminScope] = graphPermissionSummary.hasAdminScope
|
|
44
|
+
? "true"
|
|
45
|
+
: "false";
|
|
46
|
+
props[telemetry_1.TelemetryProperty.GraphPermissionScopes] = graphPermissionSummary.scopes.join(",");
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
getPermissionSummary(manifest) {
|
|
54
|
+
var _a, _b;
|
|
55
|
+
let hasGraphPermission = false;
|
|
56
|
+
let hasRole = false;
|
|
57
|
+
let hasAdminScope = false;
|
|
58
|
+
const scopes = [];
|
|
59
|
+
const graphPermissionMap = permissions_1.getDetailedGraphPermissionMap();
|
|
60
|
+
if (!graphPermissionMap) {
|
|
61
|
+
return undefined;
|
|
62
|
+
}
|
|
63
|
+
const graphPermission = (_a = manifest.requiredResourceAccess) === null || _a === void 0 ? void 0 : _a.find((item) => item.resourceAppId === permissions_1.graphAppId || item.resourceAppId === permissions_1.graphAppName);
|
|
64
|
+
if (!graphPermission) {
|
|
65
|
+
return {
|
|
66
|
+
hasGraphPermission,
|
|
67
|
+
hasRole,
|
|
68
|
+
hasAdminScope,
|
|
69
|
+
scopes,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
hasGraphPermission = true;
|
|
73
|
+
(_b = graphPermission.resourceAccess) === null || _b === void 0 ? void 0 : _b.forEach((access) => {
|
|
74
|
+
if (access.type === "Role") {
|
|
75
|
+
hasRole = true;
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
const id = isUUID_1.default(access.id) ? access.id : graphPermissionMap.scopes[access.id];
|
|
79
|
+
if (graphPermissionMap.scopeIds[id]) {
|
|
80
|
+
scopes.push(graphPermissionMap.scopeIds[id].value);
|
|
81
|
+
if (graphPermissionMap.scopeIds[id].type === "Admin") {
|
|
82
|
+
hasAdminScope = true;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
return {
|
|
88
|
+
hasGraphPermission,
|
|
89
|
+
hasRole,
|
|
90
|
+
hasAdminScope,
|
|
91
|
+
scopes,
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
exports.metadataGraphPermissionUtil = new MetadataGraphPermissionUtil();
|
|
96
|
+
//# sourceMappingURL=metadataGraphPermssion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metadataGraphPermssion.js","sourceRoot":"","sources":["../../../src/component/utils/metadataGraphPermssion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/metadataUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIvF,OAAO,EAAkB,YAAY,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"metadataUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/metadataUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIvF,OAAO,EAAkB,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK1E,cAAM,YAAY;IACV,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IA6B1F,MAAM,CAAC,cAAc,CAAC,kBAAkB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,GAAG,SAAS,GAAG,MAAM;IAczF,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,GAAG,IAAI;CA6B9E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC"}
|
|
@@ -9,6 +9,7 @@ const globalVars_1 = require("../../core/globalVars");
|
|
|
9
9
|
const interface_1 = require("../configManager/interface");
|
|
10
10
|
const parser_1 = require("../configManager/parser");
|
|
11
11
|
const crypto_1 = require("crypto");
|
|
12
|
+
const metadataGraphPermssion_1 = require("./metadataGraphPermssion");
|
|
12
13
|
class MetadataUtil {
|
|
13
14
|
async parse(path, env) {
|
|
14
15
|
var _a, _b;
|
|
@@ -24,6 +25,7 @@ class MetadataUtil {
|
|
|
24
25
|
}
|
|
25
26
|
props[telemetry_1.TelemetryProperty.YmlSchemaVersion] = res.value.version;
|
|
26
27
|
props[telemetry_1.TelemetryProperty.SampleAppName] = MetadataUtil.parseSampleTag(res.value.additionalMetadata);
|
|
28
|
+
await metadataGraphPermssion_1.metadataGraphPermissionUtil.parseAadManifest(path, res.value, props);
|
|
27
29
|
(_b = globalVars_1.TOOLS.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(telemetry_1.TelemetryEvent.MetaData, props);
|
|
28
30
|
}
|
|
29
31
|
return res;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataUtil.js","sourceRoot":"","sources":["../../../src/component/utils/metadataUtil.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,sDAA2E;AAC3E,kEAA0D;AAC1D,sDAA8C;AAC9C,0DAA0E;AAC1E,oDAAqD;AACrD,mCAAoC;
|
|
1
|
+
{"version":3,"file":"metadataUtil.js","sourceRoot":"","sources":["../../../src/component/utils/metadataUtil.ts"],"names":[],"mappings":"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"}
|