@microsoft/teamsfx-core 2.0.7 → 2.0.8-alpha.18377bc6e.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 +6 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +6 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/featureFlags.d.ts +7 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +85 -2
- package/build/common/featureFlags.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 +15 -2
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts +8 -0
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +47 -1
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/projectTypeChecker.d.ts +2 -0
- package/build/common/projectTypeChecker.d.ts.map +1 -1
- package/build/common/projectTypeChecker.js +11 -2
- package/build/common/projectTypeChecker.js.map +1 -1
- package/build/common/samples.d.ts +1 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +1 -3
- package/build/common/samples.js.map +1 -1
- package/build/common/telemetry.d.ts +8 -2
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +15 -5
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +3 -2
- package/build/common/wrappedAxiosClient.d.ts +59 -0
- package/build/common/wrappedAxiosClient.d.ts.map +1 -0
- package/build/common/wrappedAxiosClient.js +249 -0
- package/build/common/wrappedAxiosClient.js.map +1 -0
- package/build/component/configManager/constant.d.ts +2 -1
- package/build/component/configManager/constant.d.ts.map +1 -1
- package/build/component/configManager/constant.js +1 -0
- package/build/component/configManager/constant.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constant/commonConstant.d.ts +5 -0
- package/build/component/constant/commonConstant.d.ts.map +1 -1
- package/build/component/constant/commonConstant.js +7 -1
- package/build/component/constant/commonConstant.js.map +1 -1
- package/build/component/coordinator/index.d.ts +10 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +76 -23
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +0 -2
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts +1 -0
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +22 -11
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.d.ts +6 -0
- package/build/component/driver/aad/error/aadManifestError.d.ts.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +25 -1
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/error/clientSecretNotAllowedError.d.ts +5 -0
- package/build/component/driver/aad/error/clientSecretNotAllowedError.d.ts.map +1 -0
- package/build/component/driver/aad/error/clientSecretNotAllowedError.js +23 -0
- package/build/component/driver/aad/error/clientSecretNotAllowedError.js.map +1 -0
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.d.ts +5 -0
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.d.ts.map +1 -0
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.js +23 -0
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.js.map +1 -0
- package/build/component/driver/aad/interface/IAADDefinition.d.ts +1 -0
- package/build/component/driver/aad/interface/IAADDefinition.d.ts.map +1 -1
- package/build/component/driver/aad/interface/createAadAppArgs.d.ts +3 -0
- package/build/component/driver/aad/interface/createAadAppArgs.d.ts.map +1 -1
- package/build/component/driver/aad/permissions/index.d.ts.map +1 -1
- package/build/component/driver/aad/permissions/index.js +9 -0
- package/build/component/driver/aad/permissions/index.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts +4 -2
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +43 -16
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +9 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +6 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +8 -2
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts +0 -3
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +23 -50
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts +2 -0
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts.map +1 -1
- package/build/component/driver/apiKey/interface/updateApiKeyArgs.d.ts +9 -0
- package/build/component/driver/apiKey/interface/updateApiKeyArgs.d.ts.map +1 -0
- package/build/component/driver/apiKey/interface/updateApiKeyArgs.js +5 -0
- package/build/component/driver/apiKey/interface/updateApiKeyArgs.js.map +1 -0
- package/build/component/driver/apiKey/update.d.ts +13 -0
- package/build/component/driver/apiKey/update.d.ts.map +1 -0
- package/build/component/driver/apiKey/update.js +182 -0
- package/build/component/driver/apiKey/update.js.map +1 -0
- package/build/component/driver/apiKey/utility/constants.d.ts +2 -0
- package/build/component/driver/apiKey/utility/constants.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/constants.js +2 -0
- package/build/component/driver/apiKey/utility/constants.js.map +1 -1
- package/build/component/driver/apiKey/utility/utility.d.ts +7 -0
- package/build/component/driver/apiKey/utility/utility.d.ts.map +1 -0
- package/build/component/driver/apiKey/utility/utility.js +56 -0
- package/build/component/driver/apiKey/utility/utility.js.map +1 -0
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +0 -2
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +5 -5
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/utility/spoClient.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/utility/spoClient.js +3 -1
- package/build/component/driver/deploy/spfx/utility/spoClient.js.map +1 -1
- package/build/component/driver/index.d.ts +2 -0
- package/build/component/driver/index.d.ts.map +1 -1
- package/build/component/driver/index.js +2 -0
- package/build/component/driver/index.js.map +1 -1
- package/build/component/driver/script/scriptDriver.js +2 -2
- 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 +0 -2
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +35 -10
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +100 -109
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.js +3 -24
- package/build/component/driver/teamsApp/clients/authSvcClient.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +0 -2
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +5 -0
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +7 -1
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +0 -2
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +5 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +86 -24
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts +4 -0
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +7 -0
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.d.ts +20 -0
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationDetailsResponse.d.ts +21 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationDetailsResponse.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationDetailsResponse.js +5 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationDetailsResponse.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResponse.d.ts +17 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResponse.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResponse.js +16 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResponse.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResultsResponse.d.ts +41 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResultsResponse.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResultsResponse.js +5 -0
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResultsResponse.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/ValidateWithTestCasesArgs.d.ts +17 -0
- package/build/component/driver/teamsApp/interfaces/ValidateWithTestCasesArgs.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/ValidateWithTestCasesArgs.js +5 -0
- package/build/component/driver/teamsApp/interfaces/ValidateWithTestCasesArgs.js.map +1 -0
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +3 -5
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.d.ts.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.js +22 -8
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +17 -0
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +8 -0
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -0
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +63 -0
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -0
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +1 -31
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +2 -53
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +5 -1
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +0 -1
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +0 -1
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.d.ts +31 -0
- package/build/component/driver/teamsApp/validateTestCases.d.ts.map +1 -0
- package/build/component/driver/teamsApp/validateTestCases.js +225 -0
- package/build/component/driver/teamsApp/validateTestCases.js.map +1 -0
- package/build/component/feature/collaboration.d.ts +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +2 -4
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +5 -2
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +101 -26
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +8 -3
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +273 -30
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +1 -1
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +4 -4
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts +6 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +33 -26
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +5 -16
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +46 -87
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.d.ts +32 -1
- package/build/component/generator/officeAddin/config/projectProperties.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.js +33 -2
- package/build/component/generator/officeAddin/config/projectProperties.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +7 -2
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +74 -32
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts +2 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +21 -10
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts +13 -0
- package/build/component/generator/officeXMLAddin/generator.d.ts.map +1 -0
- package/build/component/generator/officeXMLAddin/generator.js +107 -0
- package/build/component/generator/officeXMLAddin/generator.js.map +1 -0
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts +24 -0
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts.map +1 -0
- package/build/component/generator/officeXMLAddin/projectConfig.js +126 -0
- package/build/component/generator/officeXMLAddin/projectConfig.js.map +1 -0
- package/build/component/generator/utils.d.ts +2 -1
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +35 -16
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/middleware/envMW.d.ts.map +1 -1
- package/build/component/middleware/envMW.js +1 -0
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +11 -39
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/utils/envUtil.d.ts +2 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +23 -0
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/metadataGraphPermssion.d.ts +8 -6
- package/build/component/utils/metadataGraphPermssion.d.ts.map +1 -1
- package/build/component/utils/metadataGraphPermssion.js +10 -2
- package/build/component/utils/metadataGraphPermssion.js.map +1 -1
- package/build/component/utils/metadataRscPermission.d.ts +16 -0
- package/build/component/utils/metadataRscPermission.d.ts.map +1 -0
- package/build/component/utils/metadataRscPermission.js +69 -0
- package/build/component/utils/metadataRscPermission.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/component/utils/pathUtils.d.ts.map +1 -1
- package/build/component/utils/pathUtils.js +2 -0
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/core/FxCore.d.ts +3 -2
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +105 -19
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.js +3 -3
- package/build/core/collaborator.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +6 -1
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +1 -1
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +17 -6
- package/build/error/deploy.js.map +1 -1
- package/build/error/script.d.ts +2 -2
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +6 -6
- package/build/error/script.js.map +1 -1
- package/build/index.d.ts +0 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -3
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +1 -0
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +2 -1
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +44 -4
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +685 -128
- package/build/question/create.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +22 -8
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +74 -12
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.d.ts +1 -0
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +17 -1
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +9 -1
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +8 -0
- package/build/question/questionNames.js.map +1 -1
- package/package.json +5 -4
- package/resource/package.nls.json +233 -125
- package/resource/yaml-schema/v1.5/yaml.schema.json +1663 -0
- package/resource/yaml-schema/yaml.schema.json +77 -2
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Enable SSO.txt +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts +0 -7
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +0 -1
- package/build/common/spec-parser/adaptiveCardGenerator.js +0 -168
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +0 -1
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts +0 -15
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts.map +0 -1
- package/build/common/spec-parser/adaptiveCardWrapper.js +0 -98
- package/build/common/spec-parser/adaptiveCardWrapper.js.map +0 -1
- package/build/common/spec-parser/constants.d.ts +0 -41
- package/build/common/spec-parser/constants.d.ts.map +0 -1
- package/build/common/spec-parser/constants.js +0 -95
- package/build/common/spec-parser/constants.js.map +0 -1
- package/build/common/spec-parser/index.browser.d.ts +0 -6
- package/build/common/spec-parser/index.browser.d.ts.map +0 -1
- package/build/common/spec-parser/index.browser.js +0 -16
- package/build/common/spec-parser/index.browser.js.map +0 -1
- package/build/common/spec-parser/index.d.ts +0 -5
- package/build/common/spec-parser/index.d.ts.map +0 -1
- package/build/common/spec-parser/index.js +0 -16
- package/build/common/spec-parser/index.js.map +0 -1
- package/build/common/spec-parser/interfaces.d.ts +0 -180
- package/build/common/spec-parser/interfaces.d.ts.map +0 -1
- package/build/common/spec-parser/interfaces.js +0 -51
- package/build/common/spec-parser/interfaces.js.map +0 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +0 -7
- package/build/common/spec-parser/manifestUpdater.d.ts.map +0 -1
- package/build/common/spec-parser/manifestUpdater.js +0 -98
- package/build/common/spec-parser/manifestUpdater.js.map +0 -1
- package/build/common/spec-parser/specFilter.d.ts +0 -3
- package/build/common/spec-parser/specFilter.d.ts.map +0 -1
- package/build/common/spec-parser/specFilter.js +0 -40
- package/build/common/spec-parser/specFilter.js.map +0 -1
- package/build/common/spec-parser/specParser.browser.d.ts +0 -46
- package/build/common/spec-parser/specParser.browser.d.ts.map +0 -1
- package/build/common/spec-parser/specParser.browser.js +0 -139
- package/build/common/spec-parser/specParser.browser.js.map +0 -1
- package/build/common/spec-parser/specParser.d.ts +0 -46
- package/build/common/spec-parser/specParser.d.ts.map +0 -1
- package/build/common/spec-parser/specParser.js +0 -244
- package/build/common/spec-parser/specParser.js.map +0 -1
- package/build/common/spec-parser/specParserError.d.ts +0 -6
- package/build/common/spec-parser/specParserError.d.ts.map +0 -1
- package/build/common/spec-parser/specParserError.js +0 -13
- package/build/common/spec-parser/specParserError.js.map +0 -1
- package/build/common/spec-parser/utils.d.ts +0 -43
- package/build/common/spec-parser/utils.d.ts.map +0 -1
- package/build/common/spec-parser/utils.js +0 -595
- package/build/common/spec-parser/utils.js.map +0 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts +0 -20
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts.map +0 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.js +0 -115
- package/build/component/generator/officeAddin/config/projectsJsonData.js.map +0 -1
|
@@ -32,7 +32,7 @@ class MetadataGraphPermissionUtil {
|
|
|
32
32
|
try {
|
|
33
33
|
const manifestString = await fs_extra_1.default.readFile(aadManifestPath, "utf8");
|
|
34
34
|
const manifest = JSON.parse(manifestString);
|
|
35
|
-
const graphPermissionSummary = this.
|
|
35
|
+
const graphPermissionSummary = this.summary(manifest);
|
|
36
36
|
if (graphPermissionSummary) {
|
|
37
37
|
props[telemetry_1.TelemetryProperty.GraphPermission] = graphPermissionSummary.hasGraphPermission
|
|
38
38
|
? "true"
|
|
@@ -44,18 +44,20 @@ class MetadataGraphPermissionUtil {
|
|
|
44
44
|
? "true"
|
|
45
45
|
: "false";
|
|
46
46
|
props[telemetry_1.TelemetryProperty.GraphPermissionScopes] = graphPermissionSummary.scopes.join(",");
|
|
47
|
+
props[telemetry_1.TelemetryProperty.GraphPermissionRoles] = graphPermissionSummary.roles.join(",");
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
50
|
catch (error) {
|
|
50
51
|
return;
|
|
51
52
|
}
|
|
52
53
|
}
|
|
53
|
-
|
|
54
|
+
summary(manifest) {
|
|
54
55
|
var _a, _b;
|
|
55
56
|
let hasGraphPermission = false;
|
|
56
57
|
let hasRole = false;
|
|
57
58
|
let hasAdminScope = false;
|
|
58
59
|
const scopes = [];
|
|
60
|
+
const roles = [];
|
|
59
61
|
const graphPermissionMap = permissions_1.getDetailedGraphPermissionMap();
|
|
60
62
|
if (!graphPermissionMap) {
|
|
61
63
|
return undefined;
|
|
@@ -67,12 +69,17 @@ class MetadataGraphPermissionUtil {
|
|
|
67
69
|
hasRole,
|
|
68
70
|
hasAdminScope,
|
|
69
71
|
scopes,
|
|
72
|
+
roles,
|
|
70
73
|
};
|
|
71
74
|
}
|
|
72
75
|
hasGraphPermission = true;
|
|
73
76
|
(_b = graphPermission.resourceAccess) === null || _b === void 0 ? void 0 : _b.forEach((access) => {
|
|
74
77
|
if (access.type === "Role") {
|
|
75
78
|
hasRole = true;
|
|
79
|
+
const id = isUUID_1.default(access.id) ? access.id : graphPermissionMap.roles[access.id];
|
|
80
|
+
if (graphPermissionMap.roleIds[id]) {
|
|
81
|
+
roles.push(graphPermissionMap.roleIds[id].value);
|
|
82
|
+
}
|
|
76
83
|
}
|
|
77
84
|
else {
|
|
78
85
|
const id = isUUID_1.default(access.id) ? access.id : graphPermissionMap.scopes[access.id];
|
|
@@ -89,6 +96,7 @@ class MetadataGraphPermissionUtil {
|
|
|
89
96
|
hasRole,
|
|
90
97
|
hasAdminScope,
|
|
91
98
|
scopes,
|
|
99
|
+
roles,
|
|
92
100
|
};
|
|
93
101
|
}
|
|
94
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataGraphPermssion.js","sourceRoot":"","sources":["../../../src/component/utils/metadataGraphPermssion.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAwB;AACxB,gEAA0B;AAC1B,0EAA0C;AAC1C,kEAA0D;AAG1D,2DAAoG;AACpG,sDAA2D;AAC3D,iDAAkD;
|
|
1
|
+
{"version":3,"file":"metadataGraphPermssion.js","sourceRoot":"","sources":["../../../src/component/utils/metadataGraphPermssion.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { ProjectModel } from "../configManager/interface";
|
|
2
|
+
import { TeamsAppManifest } from "../../../../manifest/build/manifest";
|
|
3
|
+
interface summary {
|
|
4
|
+
version: string;
|
|
5
|
+
rscApplication: string[];
|
|
6
|
+
rscDelegated: string[];
|
|
7
|
+
}
|
|
8
|
+
declare class MetadataRscPermissionUtil {
|
|
9
|
+
parseManifest(ymlPath: string, model: ProjectModel, props: {
|
|
10
|
+
[key: string]: string;
|
|
11
|
+
}): Promise<void>;
|
|
12
|
+
summary(manifest: TeamsAppManifest): summary | undefined;
|
|
13
|
+
}
|
|
14
|
+
export declare const metadataRscPermissionUtil: MetadataRscPermissionUtil;
|
|
15
|
+
export {};
|
|
16
|
+
//# sourceMappingURL=metadataRscPermission.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metadataRscPermission.d.ts","sourceRoot":"","sources":["../../../src/component/utils/metadataRscPermission.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,UAAU,OAAO;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,cAAM,yBAAyB;IACvB,aAAa,CACjB,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;IAkChB,OAAO,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,GAAG,SAAS;CAqBzD;AAED,eAAO,MAAM,yBAAyB,2BAAkC,CAAC"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.metadataRscPermissionUtil = 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 versionMetadata_1 = require("../../common/versionMetadata");
|
|
10
|
+
const telemetry_1 = require("../../common/telemetry");
|
|
11
|
+
const ManifestUtils_1 = require("../driver/teamsApp/utils/ManifestUtils");
|
|
12
|
+
class MetadataRscPermissionUtil {
|
|
13
|
+
async parseManifest(ymlPath, model, props) {
|
|
14
|
+
var _a;
|
|
15
|
+
let manifestName = path_1.default.join(versionMetadata_1.MetadataV3.teamsManifestFolder, versionMetadata_1.MetadataV3.teamsManifestFileName);
|
|
16
|
+
const action = (_a = model.provision) === null || _a === void 0 ? void 0 : _a.driverDefs.find((def) => def.uses === "teamsApp/validateManifest");
|
|
17
|
+
// if teamsApp/validateManifest action is defined, use the manifest file in the action
|
|
18
|
+
if (action) {
|
|
19
|
+
const parameters = action.with;
|
|
20
|
+
if (parameters && parameters["manifestPath"]) {
|
|
21
|
+
manifestName = parameters["manifestPath"];
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
const manifestPath = path_1.default.join(path_1.default.dirname(ymlPath), manifestName);
|
|
25
|
+
if (!(await fs_extra_1.default.pathExists(manifestPath))) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
try {
|
|
29
|
+
const result = await ManifestUtils_1.manifestUtils.readAppManifest(manifestPath);
|
|
30
|
+
if (result.isErr()) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
const manifest = result.value;
|
|
34
|
+
const summary = this.summary(manifest);
|
|
35
|
+
if (summary) {
|
|
36
|
+
props[telemetry_1.ProjectTypeProps.TeamsManifestVersion] = summary.version;
|
|
37
|
+
props[telemetry_1.TelemetryProperty.RscApplication] = summary.rscApplication.join(",");
|
|
38
|
+
props[telemetry_1.TelemetryProperty.RscDelegated] = summary.rscDelegated.join(",");
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
summary(manifest) {
|
|
46
|
+
var _a, _b, _c;
|
|
47
|
+
const version = manifest.version;
|
|
48
|
+
const rscApplication = [];
|
|
49
|
+
const rscDelegated = [];
|
|
50
|
+
for (const permission of ((_b = (_a = manifest.authorization) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.resourceSpecific) || []) {
|
|
51
|
+
if (permission.type == "Application") {
|
|
52
|
+
rscApplication.push(permission.name);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
rscDelegated.push(permission.name);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
for (const permission of ((_c = manifest.webApplicationInfo) === null || _c === void 0 ? void 0 : _c.applicationPermissions) || []) {
|
|
59
|
+
rscApplication.push(permission);
|
|
60
|
+
}
|
|
61
|
+
return {
|
|
62
|
+
version,
|
|
63
|
+
rscApplication,
|
|
64
|
+
rscDelegated,
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
exports.metadataRscPermissionUtil = new MetadataRscPermissionUtil();
|
|
69
|
+
//# sourceMappingURL=metadataRscPermission.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metadataRscPermission.js","sourceRoot":"","sources":["../../../src/component/utils/metadataRscPermission.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAwB;AACxB,gEAA0B;AAC1B,kEAA0D;AAE1D,sDAA6E;AAC7E,0EAAuE;AASvE,MAAM,yBAAyB;IAC7B,KAAK,CAAC,aAAa,CACjB,OAAe,EACf,KAAmB,EACnB,KAAgC;;QAEhC,IAAI,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,mBAAmB,EAAE,4BAAU,CAAC,qBAAqB,CAAC,CAAC;QAC/F,MAAM,MAAM,GAAG,MAAA,KAAK,CAAC,SAAS,0CAAE,UAAU,CAAC,IAAI,CAC7C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,2BAA2B,CAClD,CAAC;QACF,sFAAsF;QACtF,IAAI,MAAM,EAAE;YACV,MAAM,UAAU,GAAG,MAAM,CAAC,IAAiC,CAAC;YAC5D,IAAI,UAAU,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE;gBAC5C,YAAY,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;aAC3C;SACF;QACD,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,CAAC;QACpE,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,EAAE;YACxC,OAAO;SACR;QAED,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,6BAAa,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;YACjE,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,OAAO;aACR;YACD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC;YAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvC,IAAI,OAAO,EAAE;gBACX,KAAK,CAAC,4BAAgB,CAAC,oBAAoB,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;gBAC/D,KAAK,CAAC,6BAAiB,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC3E,KAAK,CAAC,6BAAiB,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACxE;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO;SACR;IACH,CAAC;IAED,OAAO,CAAC,QAA0B;;QAChC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QACjC,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,KAAK,MAAM,UAAU,IAAI,CAAA,MAAA,MAAA,QAAQ,CAAC,aAAa,0CAAE,WAAW,0CAAE,gBAAgB,KAAI,EAAE,EAAE;YACpF,IAAI,UAAU,CAAC,IAAI,IAAI,aAAa,EAAE;gBACpC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACtC;iBAAM;gBACL,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACpC;SACF;QACD,KAAK,MAAM,UAAU,IAAI,CAAA,MAAA,QAAQ,CAAC,kBAAkB,0CAAE,sBAAsB,KAAI,EAAE,EAAE;YAClF,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACjC;QAED,OAAO;YACL,OAAO;YACP,cAAc;YACd,YAAY;SACb,CAAC;IACJ,CAAC;CACF;AAEY,QAAA,yBAAyB,GAAG,IAAI,yBAAyB,EAAE,CAAC"}
|
|
@@ -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;AAM1E,cAAM,YAAY;IACV,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IA8B1F,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"}
|
|
@@ -10,6 +10,7 @@ const interface_1 = require("../configManager/interface");
|
|
|
10
10
|
const parser_1 = require("../configManager/parser");
|
|
11
11
|
const crypto_1 = require("crypto");
|
|
12
12
|
const metadataGraphPermssion_1 = require("./metadataGraphPermssion");
|
|
13
|
+
const metadataRscPermission_1 = require("./metadataRscPermission");
|
|
13
14
|
class MetadataUtil {
|
|
14
15
|
async parse(path, env) {
|
|
15
16
|
var _a, _b;
|
|
@@ -26,6 +27,7 @@ class MetadataUtil {
|
|
|
26
27
|
props[telemetry_1.TelemetryProperty.YmlSchemaVersion] = res.value.version;
|
|
27
28
|
props[telemetry_1.TelemetryProperty.SampleAppName] = MetadataUtil.parseSampleTag(res.value.additionalMetadata);
|
|
28
29
|
await metadataGraphPermssion_1.metadataGraphPermissionUtil.parseAadManifest(path, res.value, props);
|
|
30
|
+
await metadataRscPermission_1.metadataRscPermissionUtil.parseManifest(path, res.value, props);
|
|
29
31
|
(_b = globalVars_1.TOOLS.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(telemetry_1.TelemetryEvent.MetaData, props);
|
|
30
32
|
}
|
|
31
33
|
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;AACpC,qEAAuE;
|
|
1
|
+
{"version":3,"file":"metadataUtil.js","sourceRoot":"","sources":["../../../src/component/utils/metadataUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAQlE,cAAM,SAAS;IACb,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAQlE,cAAM,SAAS;IACb,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IAqBnD,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAYnF,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CAQhD;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}
|
|
@@ -13,6 +13,8 @@ const parser_1 = require("../configManager/parser");
|
|
|
13
13
|
const environmentName_1 = require("../../core/environmentName");
|
|
14
14
|
class PathUtils {
|
|
15
15
|
getYmlFilePath(projectPath, env) {
|
|
16
|
+
if (process.env.TEAMSFX_CONFIG_FILE_PATH)
|
|
17
|
+
return process.env.TEAMSFX_CONFIG_FILE_PATH;
|
|
16
18
|
const envName = env || process.env.TEAMSFX_ENV || "dev";
|
|
17
19
|
if (!envName)
|
|
18
20
|
throw new common_1.MissingRequiredInputError("env", "PathUtils");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkE;AAClE,gEAA0B;AAC1B,mDAA6B;AAC7B,kEAA0D;AAC1D,+CAAyF;AACzF,oDAAqD;AACrD,gEAAoE;AAEpE,MAAM,SAAS;IACb,cAAc,CAAC,WAAmB,EAAE,GAAY;QAC9C,MAAM,OAAO,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,KAAK,CAAC;QACxD,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,kCAAyB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CACvB,WAAW,EACX,OAAO,KAAK,wCAAsB,CAAC,eAAe,EAAE;YAClD,CAAC,CAAC,4BAAU,CAAC,eAAe;YAC5B,CAAC,CAAC,OAAO,KAAK,wCAAsB,CAAC,kBAAkB,EAAE;gBACzD,CAAC,CAAC,4BAAU,CAAC,kBAAkB;gBAC/B,CAAC,CAAC,4BAAU,CAAC,UAAU,CAC1B,CAAC;QACF,IAAI,kBAAE,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YAC9B,OAAO,OAAO,CAAC;SAChB;QACD,IAAI,wCAAsB,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE;YACvD,MAAM,IAAI,iCAAwB,CAAC,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;SACzD;aAAM;YACL,MAAM,IAAI,iCAAwB,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SAC/D;IACH,CAAC;IACD,KAAK,CAAC,gBAAgB,CAAC,WAAmB;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,MAAM,mBAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,QAAQ,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC;QACpC,IAAI,CAAC,YAAY,CAAC,qBAAqB;YAAE,YAAY,CAAC,qBAAqB,GAAG,OAAO,CAAC;QACtF,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,qBAAqB,CAAC;YACvE,CAAC,CAAC,YAAY,CAAC,qBAAqB;YACpC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,qBAAqB,CAAC,CAAC;QAC/D,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAAE,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,gBAAE,CAAC,aAAa,CAAC,CAAC;IAC3B,CAAC;IACD,KAAK,CAAC,cAAc,CAClB,WAAmB,EACnB,GAAW;QAEX,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAClE,IAAI,gBAAgB,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAC1C,IAAI,CAAC,UAAU;YAAE,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,EAAE,CAAC,CAAC;QACzD,OAAO,gBAAE,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;CACF;AAEY,QAAA,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":"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"}
|
package/build/core/FxCore.d.ts
CHANGED
|
@@ -7,7 +7,6 @@ import { ILifecycle } from "../component/configManager/interface";
|
|
|
7
7
|
import "../component/driver/index";
|
|
8
8
|
import { DriverContext } from "../component/driver/interface/commonArgs";
|
|
9
9
|
import "../component/driver/script/scriptDriver";
|
|
10
|
-
import { ErrorResult } from "../component/generator/copilotPlugin/helper";
|
|
11
10
|
import { ValidateTeamsAppInputs } from "../question";
|
|
12
11
|
import { CoreHookContext, PreProvisionResForVS, VersionCheckRes } from "./types";
|
|
13
12
|
import "../component/feature/sso";
|
|
@@ -85,6 +84,7 @@ export declare class FxCore {
|
|
|
85
84
|
* v3 only none lifecycle command
|
|
86
85
|
*/
|
|
87
86
|
validateAppPackage(inputs: ValidateTeamsAppInputs): Promise<Result<any, FxError>>;
|
|
87
|
+
validateWithTestCases(inputs: ValidateTeamsAppInputs): Promise<Result<any, FxError>>;
|
|
88
88
|
/**
|
|
89
89
|
* v3 only none lifecycle command
|
|
90
90
|
*/
|
|
@@ -165,8 +165,9 @@ export declare class FxCore {
|
|
|
165
165
|
publishInDeveloperPortal(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
166
166
|
injectCreateAPIKeyAction(ymlPath: string, authName: string, specRelativePath: string): Promise<void>;
|
|
167
167
|
copilotPluginAddAPI(inputs: Inputs): Promise<Result<undefined, FxError>>;
|
|
168
|
+
listPluginApiSpecs(inputs: Inputs): Promise<Result<string[], FxError>>;
|
|
168
169
|
copilotPluginLoadOpenAIManifest(inputs: Inputs): Promise<Result<OpenAIPluginManifest, FxError>>;
|
|
169
|
-
copilotPluginListOperations(inputs: Inputs): Promise<Result<ApiOperation[],
|
|
170
|
+
copilotPluginListOperations(inputs: Inputs): Promise<Result<ApiOperation[], FxError>>;
|
|
170
171
|
/**
|
|
171
172
|
* check project type info
|
|
172
173
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FxCore.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EAIZ,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,IAAI,EACJ,OAAO,EACP,UAAU,EACV,MAAM,EACN,qBAAqB,EAErB,oBAAoB,EAGpB,MAAM,EACN,KAAK,EACL,cAAc,EACd,KAAK,
|
|
1
|
+
{"version":3,"file":"FxCore.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"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"}
|
package/build/core/FxCore.js
CHANGED
|
@@ -19,7 +19,7 @@ const localizeUtils_1 = require("../common/localizeUtils");
|
|
|
19
19
|
const launchHelper_1 = require("../common/m365/launchHelper");
|
|
20
20
|
const projectSettingsHelper_1 = require("../common/projectSettingsHelper");
|
|
21
21
|
const projectTypeChecker_1 = require("../common/projectTypeChecker");
|
|
22
|
-
const
|
|
22
|
+
const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
|
|
23
23
|
const telemetry_1 = require("../common/telemetry");
|
|
24
24
|
const versionMetadata_1 = require("../common/versionMetadata");
|
|
25
25
|
const parser_1 = require("../component/configManager/parser");
|
|
@@ -47,6 +47,7 @@ const yml_1 = require("../error/yml");
|
|
|
47
47
|
const create_1 = require("../question/create");
|
|
48
48
|
const other_1 = require("../question/other");
|
|
49
49
|
const questionNames_1 = require("../question/questionNames");
|
|
50
|
+
const constants_3 = require("../question/constants");
|
|
50
51
|
const callback_1 = require("./callback");
|
|
51
52
|
const collaborator_1 = require("./collaborator");
|
|
52
53
|
const crypto_1 = require("./crypto");
|
|
@@ -60,6 +61,7 @@ const projectMigratorV3_1 = require("./middleware/projectMigratorV3");
|
|
|
60
61
|
const v3MigrationUtils_1 = require("./middleware/utils/v3MigrationUtils");
|
|
61
62
|
const telemetry_2 = require("./telemetry");
|
|
62
63
|
require("../component/feature/sso");
|
|
64
|
+
const PluginManifestUtils_1 = require("../component/driver/teamsApp/utils/PluginManifestUtils");
|
|
63
65
|
class FxCore {
|
|
64
66
|
constructor(tools) {
|
|
65
67
|
globalVars_1.setTools(tools);
|
|
@@ -311,6 +313,9 @@ class FxCore {
|
|
|
311
313
|
if (inputs["manifest-path"]) {
|
|
312
314
|
return await this.validateManifest(inputs);
|
|
313
315
|
}
|
|
316
|
+
else if (inputs[questionNames_1.QuestionNames.ValidateMethod] === other_1.TeamsAppValidationOptions.testCases().id) {
|
|
317
|
+
return await this.validateWithTestCases(inputs);
|
|
318
|
+
}
|
|
314
319
|
else {
|
|
315
320
|
return await this.validateAppPackage(inputs);
|
|
316
321
|
}
|
|
@@ -344,6 +349,16 @@ class FxCore {
|
|
|
344
349
|
const driver = typedi_1.Container.get("teamsApp/validateAppPackage");
|
|
345
350
|
return (await driver.execute(args, context)).result;
|
|
346
351
|
}
|
|
352
|
+
async validateWithTestCases(inputs) {
|
|
353
|
+
const context = utils_2.createDriverContext(inputs);
|
|
354
|
+
const args = {
|
|
355
|
+
appPackagePath: inputs["app-package-file-path"],
|
|
356
|
+
showMessage: true,
|
|
357
|
+
showProgressBar: true,
|
|
358
|
+
};
|
|
359
|
+
const driver = typedi_1.Container.get("teamsApp/validateWithTestCases");
|
|
360
|
+
return (await driver.execute(args, context)).result;
|
|
361
|
+
}
|
|
347
362
|
/**
|
|
348
363
|
* v3 only none lifecycle command
|
|
349
364
|
*/
|
|
@@ -625,6 +640,9 @@ class FxCore {
|
|
|
625
640
|
if (match[1].startsWith("TEAMSFX_ENV=")) {
|
|
626
641
|
writeStream.write(`TEAMSFX_ENV=${targetEnvName}${os.EOL}`);
|
|
627
642
|
}
|
|
643
|
+
else if (match[1].startsWith("APP_NAME_SUFFIX=")) {
|
|
644
|
+
writeStream.write(`APP_NAME_SUFFIX=${targetEnvName}${os.EOL}`);
|
|
645
|
+
}
|
|
628
646
|
else {
|
|
629
647
|
writeStream.write(`${match[1]}${os.EOL}`);
|
|
630
648
|
}
|
|
@@ -820,30 +838,41 @@ class FxCore {
|
|
|
820
838
|
const newOperations = inputs[questionNames_1.QuestionNames.ApiOperation];
|
|
821
839
|
const url = (_a = inputs[questionNames_1.QuestionNames.ApiSpecLocation]) !== null && _a !== void 0 ? _a : (_b = inputs.openAIPluginManifest) === null || _b === void 0 ? void 0 : _b.api.url;
|
|
822
840
|
const manifestPath = inputs[questionNames_1.QuestionNames.ManifestPath];
|
|
841
|
+
const isPlugin = inputs[questionNames_1.QuestionNames.Capabilities] === constants_3.copilotPluginApiSpecOptionId;
|
|
842
|
+
const context = utils_2.createContextV3();
|
|
823
843
|
// Get API spec file path from manifest
|
|
824
844
|
const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
|
|
825
845
|
if (manifestRes.isErr()) {
|
|
826
846
|
return teamsfx_api_1.err(manifestRes.error);
|
|
827
847
|
}
|
|
828
|
-
const apiSpecificationFile = manifestRes.value.composeExtensions[0].apiSpecificationFile;
|
|
829
|
-
const outputAPISpecPath = path.join(path.dirname(manifestPath), apiSpecificationFile);
|
|
830
848
|
// Merge existing operations in manifest.json
|
|
831
|
-
const specParser = new
|
|
832
|
-
|
|
833
|
-
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
|
|
837
|
-
const
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
|
|
849
|
+
const specParser = new m365_spec_parser_1.SpecParser(url, isPlugin
|
|
850
|
+
? helper_1.copilotPluginParserOptions
|
|
851
|
+
: {
|
|
852
|
+
allowBearerTokenAuth: featureFlags_1.isApiKeyEnabled(),
|
|
853
|
+
allowMultipleParameters: featureFlags_1.isMultipleParametersEnabled(),
|
|
854
|
+
});
|
|
855
|
+
const listResult = await specParser.list();
|
|
856
|
+
const apiResultList = listResult.APIs.filter((value) => value.isValid);
|
|
857
|
+
let existingOperations;
|
|
858
|
+
let outputAPISpecPath;
|
|
859
|
+
if (isPlugin) {
|
|
860
|
+
if (!inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath]) {
|
|
861
|
+
return teamsfx_api_1.err(new common_2.MissingRequiredInputError(questionNames_1.QuestionNames.DestinationApiSpecFilePath));
|
|
842
862
|
}
|
|
863
|
+
outputAPISpecPath = inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath];
|
|
864
|
+
existingOperations = await helper_1.listPluginExistingOperations(manifestRes.value, manifestPath, inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath]);
|
|
865
|
+
}
|
|
866
|
+
else {
|
|
867
|
+
const existingOperationIds = ManifestUtils_1.manifestUtils.getOperationIds(manifestRes.value);
|
|
868
|
+
existingOperations = apiResultList
|
|
869
|
+
.filter((operation) => existingOperationIds.includes(operation.operationId))
|
|
870
|
+
.map((operation) => operation.api);
|
|
871
|
+
const apiSpecificationFile = manifestRes.value.composeExtensions[0].apiSpecificationFile;
|
|
872
|
+
outputAPISpecPath = path.join(path.dirname(manifestPath), apiSpecificationFile);
|
|
843
873
|
}
|
|
844
874
|
const operations = [...existingOperations, ...newOperations];
|
|
845
875
|
const adaptiveCardFolder = path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ResponseTemplatesFolderName);
|
|
846
|
-
const context = utils_2.createContextV3();
|
|
847
876
|
try {
|
|
848
877
|
if (featureFlags_1.isApiKeyEnabled()) {
|
|
849
878
|
const authNames = new Set();
|
|
@@ -851,7 +880,9 @@ class FxCore {
|
|
|
851
880
|
for (const api of operations) {
|
|
852
881
|
const operation = apiResultList.find((op) => op.api === api);
|
|
853
882
|
if (operation) {
|
|
854
|
-
if (operation.auth &&
|
|
883
|
+
if (operation.auth &&
|
|
884
|
+
operation.auth.authScheme.type === "http" &&
|
|
885
|
+
operation.auth.authScheme.scheme === "bearer") {
|
|
855
886
|
authNames.add(operation.auth.name);
|
|
856
887
|
serverUrls.add(operation.server);
|
|
857
888
|
}
|
|
@@ -874,7 +905,17 @@ class FxCore {
|
|
|
874
905
|
}
|
|
875
906
|
}
|
|
876
907
|
}
|
|
877
|
-
|
|
908
|
+
let generateResult;
|
|
909
|
+
if (!isPlugin) {
|
|
910
|
+
generateResult = await specParser.generate(manifestPath, operations, outputAPISpecPath, adaptiveCardFolder);
|
|
911
|
+
}
|
|
912
|
+
else {
|
|
913
|
+
const pluginPathRes = await ManifestUtils_1.manifestUtils.getPluginFilePath(manifestRes.value, manifestPath);
|
|
914
|
+
if (pluginPathRes.isErr()) {
|
|
915
|
+
return teamsfx_api_1.err(pluginPathRes.error);
|
|
916
|
+
}
|
|
917
|
+
generateResult = await specParser.generateForCopilot(manifestPath, operations, outputAPISpecPath, pluginPathRes.value);
|
|
918
|
+
}
|
|
878
919
|
// Send SpecParser.generate() warnings
|
|
879
920
|
context.telemetryReporter.sendTelemetryEvent(helper_1.specParserGenerateResultTelemetryEvent, {
|
|
880
921
|
[helper_1.specParserGenerateResultAllSuccessTelemetryProperty]: generateResult.allSuccess.toString(),
|
|
@@ -890,7 +931,7 @@ class FxCore {
|
|
|
890
931
|
}
|
|
891
932
|
catch (e) {
|
|
892
933
|
let error;
|
|
893
|
-
if (e instanceof
|
|
934
|
+
if (e instanceof m365_spec_parser_1.SpecParserError) {
|
|
894
935
|
error = helper_1.convertSpecParserErrorToFxError(e);
|
|
895
936
|
}
|
|
896
937
|
else {
|
|
@@ -902,6 +943,25 @@ class FxCore {
|
|
|
902
943
|
void context.userInteraction.showMessage("info", message, false);
|
|
903
944
|
return teamsfx_api_1.ok(undefined);
|
|
904
945
|
}
|
|
946
|
+
async listPluginApiSpecs(inputs) {
|
|
947
|
+
try {
|
|
948
|
+
const manifestPath = inputs[questionNames_1.QuestionNames.ManifestPath];
|
|
949
|
+
const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
|
|
950
|
+
if (manifestRes.isErr()) {
|
|
951
|
+
return teamsfx_api_1.err(manifestRes.error);
|
|
952
|
+
}
|
|
953
|
+
const res = await PluginManifestUtils_1.pluginManifestUtils.getApiSpecFilePathFromTeamsManifest(manifestRes.value, manifestPath);
|
|
954
|
+
if (res.isOk()) {
|
|
955
|
+
return teamsfx_api_1.ok(res.value);
|
|
956
|
+
}
|
|
957
|
+
else {
|
|
958
|
+
return teamsfx_api_1.err(res.error);
|
|
959
|
+
}
|
|
960
|
+
}
|
|
961
|
+
catch (error) {
|
|
962
|
+
return teamsfx_api_1.err(error);
|
|
963
|
+
}
|
|
964
|
+
}
|
|
905
965
|
async copilotPluginLoadOpenAIManifest(inputs) {
|
|
906
966
|
try {
|
|
907
967
|
return teamsfx_api_1.ok(await helper_1.OpenAIPluginManifestHelper.loadOpenAIPluginManifest(inputs.domain));
|
|
@@ -911,7 +971,14 @@ class FxCore {
|
|
|
911
971
|
}
|
|
912
972
|
}
|
|
913
973
|
async copilotPluginListOperations(inputs) {
|
|
914
|
-
|
|
974
|
+
const res = await helper_1.listOperations(utils_2.createContextV3(), inputs.manifest, inputs.apiSpecUrl, inputs, inputs.includeExistingAPIs, inputs.shouldLogWarning);
|
|
975
|
+
if (res.isErr()) {
|
|
976
|
+
const msg = res.error.map((e) => e.content).join("\n");
|
|
977
|
+
return teamsfx_api_1.err(new teamsfx_api_1.UserError("FxCore", "ListOpenAPISpecOperationsError", msg, msg));
|
|
978
|
+
}
|
|
979
|
+
else {
|
|
980
|
+
return teamsfx_api_1.ok(res.value);
|
|
981
|
+
}
|
|
915
982
|
}
|
|
916
983
|
/**
|
|
917
984
|
* check project type info
|
|
@@ -1124,6 +1191,16 @@ tslib_1.__decorate([
|
|
|
1124
1191
|
tslib_1.__metadata("design:paramtypes", [Object]),
|
|
1125
1192
|
tslib_1.__metadata("design:returntype", Promise)
|
|
1126
1193
|
], FxCore.prototype, "validateAppPackage", null);
|
|
1194
|
+
tslib_1.__decorate([
|
|
1195
|
+
hooks_1.hooks([
|
|
1196
|
+
globalVars_1.ErrorContextMW({ component: "FxCore", stage: "validateWithTestCases", reset: true }),
|
|
1197
|
+
errorHandler_1.ErrorHandlerMW,
|
|
1198
|
+
concurrentLocker_1.ConcurrentLockerMW,
|
|
1199
|
+
]),
|
|
1200
|
+
tslib_1.__metadata("design:type", Function),
|
|
1201
|
+
tslib_1.__metadata("design:paramtypes", [Object]),
|
|
1202
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
1203
|
+
], FxCore.prototype, "validateWithTestCases", null);
|
|
1127
1204
|
tslib_1.__decorate([
|
|
1128
1205
|
hooks_1.hooks([
|
|
1129
1206
|
globalVars_1.ErrorContextMW({ component: "FxCore", stage: "createAppPackage", reset: true }),
|
|
@@ -1337,6 +1414,15 @@ tslib_1.__decorate([
|
|
|
1337
1414
|
tslib_1.__metadata("design:paramtypes", [Object]),
|
|
1338
1415
|
tslib_1.__metadata("design:returntype", Promise)
|
|
1339
1416
|
], FxCore.prototype, "copilotPluginAddAPI", null);
|
|
1417
|
+
tslib_1.__decorate([
|
|
1418
|
+
hooks_1.hooks([
|
|
1419
|
+
globalVars_1.ErrorContextMW({ component: "FxCore", stage: "copilotPluginListApiSpecs" }),
|
|
1420
|
+
errorHandler_1.ErrorHandlerMW,
|
|
1421
|
+
]),
|
|
1422
|
+
tslib_1.__metadata("design:type", Function),
|
|
1423
|
+
tslib_1.__metadata("design:paramtypes", [Object]),
|
|
1424
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
1425
|
+
], FxCore.prototype, "listPluginApiSpecs", null);
|
|
1340
1426
|
tslib_1.__decorate([
|
|
1341
1427
|
hooks_1.hooks([
|
|
1342
1428
|
globalVars_1.ErrorContextMW({ component: "FxCore", stage: "copilotPluginLoadOpenAIManifest" }),
|