@microsoft/teamsfx-core 2.0.10-alpha.530dccdb5.0 → 2.0.10-alpha.535ba4ece.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/client/teamsDevPortalClient.d.ts +1 -0
- package/build/client/teamsDevPortalClient.d.ts.map +1 -1
- package/build/client/teamsDevPortalClient.js +16 -1
- package/build/client/teamsDevPortalClient.js.map +1 -1
- package/build/common/constants.d.ts +0 -16
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -18
- package/build/common/constants.js.map +1 -1
- package/build/common/correlator.d.ts +1 -0
- package/build/common/correlator.d.ts.map +1 -1
- package/build/common/correlator.js +6 -1
- package/build/common/correlator.js.map +1 -1
- package/build/common/featureFlags.d.ts +43 -4
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +75 -16
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/globalState.js +1 -1
- package/build/common/globalState.js.map +1 -1
- package/build/common/globalVars.d.ts +1 -0
- package/build/common/globalVars.d.ts.map +1 -1
- package/build/common/globalVars.js +2 -1
- package/build/common/globalVars.js.map +1 -1
- package/build/common/projectTypeChecker.js +1 -1
- package/build/common/projectTypeChecker.js.map +1 -1
- package/build/common/samples.js +2 -2
- package/build/common/samples.js.map +1 -1
- package/build/common/secretmasker/dict.d.ts +22 -0
- package/build/common/secretmasker/dict.d.ts.map +1 -0
- package/build/common/secretmasker/dict.js +83 -0
- package/build/common/secretmasker/dict.js.map +1 -0
- package/build/common/secretmasker/feature.d.ts +15 -0
- package/build/common/secretmasker/feature.d.ts.map +1 -0
- package/build/common/secretmasker/feature.js +148 -0
- package/build/common/secretmasker/feature.js.map +1 -0
- package/build/common/secretmasker/masker.d.ts +12 -0
- package/build/common/secretmasker/masker.d.ts.map +1 -0
- package/build/common/secretmasker/masker.js +54 -0
- package/build/common/secretmasker/masker.js.map +1 -0
- package/build/common/stringUtils.d.ts +3 -5
- package/build/common/stringUtils.d.ts.map +1 -1
- package/build/common/stringUtils.js +11 -103
- package/build/common/stringUtils.js.map +1 -1
- package/build/common/telemetry.d.ts +3 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +5 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/common/tools.d.ts +1 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +9 -3
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts +3 -0
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +14 -1
- package/build/common/utils.js.map +1 -1
- package/build/common/wrappedAxiosClient.d.ts.map +1 -1
- package/build/common/wrappedAxiosClient.js +10 -0
- package/build/common/wrappedAxiosClient.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +11 -120
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +1 -1
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +9 -1
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +1 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +1 -0
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +4 -1
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.d.ts +5 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.d.ts.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.js +21 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.js.map +1 -0
- package/build/component/driver/apiKey/utility/constants.d.ts +1 -1
- package/build/component/driver/apiKey/utility/constants.js +1 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +3 -1
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +10 -1
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botAadApp/utility/constants.d.ts +1 -0
- package/build/component/driver/botAadApp/utility/constants.d.ts.map +1 -1
- package/build/component/driver/botAadApp/utility/constants.js +1 -0
- package/build/component/driver/botAadApp/utility/constants.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js +7 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -1
- package/build/component/driver/oauth/create.d.ts.map +1 -1
- package/build/component/driver/oauth/create.js +33 -3
- package/build/component/driver/oauth/create.js.map +1 -1
- package/build/component/driver/oauth/error/oauthDisablePKCEError.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.js +21 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.js.map +1 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.js +21 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.js.map +1 -0
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts +2 -0
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts +1 -0
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/update.d.ts.map +1 -1
- package/build/component/driver/oauth/update.js +11 -0
- package/build/component/driver/oauth/update.js.map +1 -1
- package/build/component/driver/oauth/utility/constants.d.ts +1 -1
- package/build/component/driver/oauth/utility/constants.js +1 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +21 -22
- 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 +4 -15
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +14 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +131 -2
- 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 +10 -10
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts +2 -0
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts +3 -3
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +2 -2
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +3 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +37 -13
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +3 -3
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +2 -2
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +3 -3
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +37 -7
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +16 -2
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/generator/apiSpec/generator.d.ts +0 -6
- package/build/component/generator/apiSpec/generator.d.ts.map +1 -1
- package/build/component/generator/apiSpec/generator.js +56 -157
- package/build/component/generator/apiSpec/generator.js.map +1 -1
- package/build/component/generator/apiSpec/helper.d.ts +10 -1
- package/build/component/generator/apiSpec/helper.d.ts.map +1 -1
- package/build/component/generator/apiSpec/helper.js +118 -8
- package/build/component/generator/apiSpec/helper.js.map +1 -1
- package/build/component/generator/constant.d.ts +1 -0
- package/build/component/generator/constant.d.ts.map +1 -1
- package/build/component/generator/constant.js +2 -1
- package/build/component/generator/constant.js.map +1 -1
- package/build/component/generator/copilotExtension/generator.d.ts +19 -0
- package/build/component/generator/copilotExtension/generator.d.ts.map +1 -0
- package/build/component/generator/copilotExtension/generator.js +84 -0
- package/build/component/generator/copilotExtension/generator.js.map +1 -0
- package/build/component/generator/error.d.ts +1 -1
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +2 -2
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.js +1 -1
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorProvider.d.ts.map +1 -1
- package/build/component/generator/generatorProvider.js +4 -2
- package/build/component/generator/generatorProvider.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +1 -2
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +16 -16
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +9 -9
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.d.ts +1 -0
- package/build/component/generator/spfx/utils/utils.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +11 -7
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +0 -35
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.d.ts.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.js +19 -5
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/component/generator/utils.js +1 -1
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/local/localCertificateManager.d.ts.map +1 -1
- package/build/component/local/localCertificateManager.js +4 -2
- package/build/component/local/localCertificateManager.js.map +1 -1
- package/build/component/utils/envFunctionUtils.d.ts +12 -0
- package/build/component/utils/envFunctionUtils.d.ts.map +1 -0
- package/build/component/utils/envFunctionUtils.js +185 -0
- package/build/component/utils/envFunctionUtils.js.map +1 -0
- package/build/core/FxCore.d.ts +30 -0
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +332 -11
- package/build/core/FxCore.js.map +1 -1
- package/build/core/middleware/concurrentLocker.js +2 -2
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/error/common.d.ts +1 -1
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +7 -2
- package/build/error/common.js.map +1 -1
- package/build/error/script.d.ts +2 -2
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +14 -8
- package/build/error/script.js.map +1 -1
- package/build/error/teamsApp.d.ts.map +1 -1
- package/build/error/teamsApp.js +3 -1
- package/build/error/teamsApp.js.map +1 -1
- package/build/index.d.ts +2 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +6 -2
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +28 -13
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +95 -67
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +78 -45
- package/build/question/create.js.map +1 -1
- package/build/question/generator.js +2 -0
- 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/AddPluginInputs.d.ts +1 -1
- package/build/question/inputs/AddPluginInputs.d.ts.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +5 -1
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/inputs/UninstallInputs.d.ts +22 -0
- package/build/question/inputs/UninstallInputs.d.ts.map +1 -0
- package/build/question/inputs/UninstallInputs.js +5 -0
- package/build/question/inputs/UninstallInputs.js.map +1 -0
- package/build/question/inputs/index.d.ts +1 -0
- package/build/question/inputs/index.d.ts.map +1 -1
- package/build/question/inputs/index.js +1 -0
- package/build/question/inputs/index.js.map +1 -1
- package/build/question/options/AddPluginOptions.js +1 -1
- package/build/question/options/AddPluginOptions.js.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +16 -4
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/UninstallOptions.d.ts +10 -0
- package/build/question/options/UninstallOptions.d.ts.map +1 -0
- package/build/question/options/UninstallOptions.js +44 -0
- package/build/question/options/UninstallOptions.js.map +1 -0
- package/build/question/options/index.d.ts +1 -0
- package/build/question/options/index.d.ts.map +1 -1
- package/build/question/options/index.js +1 -0
- package/build/question/options/index.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 +128 -5
- package/build/question/other.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -0
- package/package.json +10 -7
- package/resource/dict.zip +0 -0
- package/resource/package.nls.json +146 -91
- package/resource/yaml-schema/v1.6/yaml.schema.json +13 -0
- package/resource/yaml-schema/yaml.schema.json +13 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureStaticWebAppGetDeploymentTokenDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;AAElC,mCAAiC;AAGjC,6CAA0C;AAC1C,sFAAmF;AACnF,qEAAqE;AACrE,kDAAyE;AAEzE,kFAG+C;AAC/C,0DAAgE;AAChE,wDAA6D;AAC7D,oEAAsE;AACtE,iHAA8G;AAE9G,MAAM,WAAW,GAAG,uCAAuC,CAAC;AAG5D,IAAa,yCAAyC,iDAAtD,MAAa,yCAAyC;IAAtD;QACW,gBAAW,GAAW,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"azureStaticWebAppGetDeploymentTokenDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ const addStartAndEndTelemetry_1 = require("./addStartAndEndTelemetry");
|
|
|
16
16
|
function addSWADeployTelemetry(eventName) {
|
|
17
17
|
return async (ctx, next) => {
|
|
18
18
|
const name = ctx.arguments[4];
|
|
19
|
-
const command = stringUtils_1.
|
|
19
|
+
const command = stringUtils_1.maskSecret(ctx.arguments[0].args);
|
|
20
20
|
// only add telemetry for script
|
|
21
21
|
if (!(name === null || name === void 0 ? void 0 : name.includes("deploy to Azure Static Web Apps"))) {
|
|
22
22
|
await next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addSWADeployTelemetry.js","sourceRoot":"","sources":["../../../../src/component/driver/middleware/addSWADeployTelemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,2CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"addSWADeployTelemetry.js","sourceRoot":"","sources":["../../../../src/component/driver/middleware/addSWADeployTelemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,2CAAyC;AACzC,6DAAyD;AACzD,yDAA8D;AAC9D,kEAAkE;AAClE,mFAG8C;AAE9C,uEAA8D;AAE9D;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,SAAiB;IACrD,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;QACpD,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAuB,CAAC;QACpD,MAAM,OAAO,GAAG,wBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAc,CAAC,CAAC;QAC5D,gCAAgC;QAChC,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,iCAAiC,CAAC,CAAA,EAAE;YACtD,MAAM,IAAI,EAAE,CAAC;YACb,OAAO;SACR;QACD,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAsB,CAAC;QAC5D,IAAI,iBAAiB,GAAyC,SAAS,CAAC;QACxE,IAAI,aAAa,CAAC,iBAAiB,EAAE;YACnC,iBAAiB,GAAG,IAAI,mDAAwB,CAAC,aAAa,CAAC,iBAAiB,EAAE;gBAChF,aAAa,EAAE,kCAAiB,CAAC,uBAAuB;aACzD,CAAC,CAAC;SACJ;QACD,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;QACpC,MAAM,IAAI,EAAE,CAAC;QACb,MAAM,QAAQ,GAAG,wBAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAE/C,MAAM,MAAM,GAAG,2CAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;QAE9E,MAAM,eAAe,GAA2B;YAC9C,SAAS,EAAE,SAAS;YACpB,UAAU,kBAAI,OAAO,EAAE,OAAO,IAAK,aAAa,CAAC,mBAAmB,CAAE;YACtE,YAAY,EAAE,EAAE,CAAC,6BAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE;SACzD,CAAC;QAEF,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE;YACjB,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,YAAY,CAAC,eAAe,CAAC,CAAC;SAClD;aAAM;YACL,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;SAChE;IACH,CAAC,CAAC;AACJ,CAAC;AAnCD,sDAmCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/oauth/create.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAStE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/oauth/create.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAStE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAU9D,qBACa,iBAAkB,YAAW,UAAU;IAClD,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAAmD;IAG5D,OAAO,CAClB,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IA8G3B,OAAO,CAAC,YAAY;IAuEpB,OAAO,CAAC,cAAc;YAYR,0BAA0B;CAsDzC"}
|
|
@@ -21,6 +21,7 @@ const oauthNameTooLong_1 = require("./error/oauthNameTooLong");
|
|
|
21
21
|
const createOauthOutputs_1 = require("./interface/createOauthOutputs");
|
|
22
22
|
const constants_3 = require("./utility/constants");
|
|
23
23
|
const utility_1 = require("./utility/utility");
|
|
24
|
+
const oauthIdentityProviderInvalid_1 = require("./error/oauthIdentityProviderInvalid");
|
|
24
25
|
const actionName = "oauth/register"; // DO NOT MODIFY the name
|
|
25
26
|
const helpLink = "https://aka.ms/teamsfx-actions/oauth-register";
|
|
26
27
|
const supportedFlows = ["authorizationCode"];
|
|
@@ -61,11 +62,16 @@ let CreateOauthDriver = class CreateOauthDriver {
|
|
|
61
62
|
args.clientId = clientId;
|
|
62
63
|
}
|
|
63
64
|
const clientSecret = process.env[constants_2.QuestionNames.OauthClientSecret];
|
|
64
|
-
if (clientSecret) {
|
|
65
|
+
if (clientSecret && !args.isPKCEEnabled && args.identityProvider !== "MicrosoftEntra") {
|
|
65
66
|
args.clientSecret = clientSecret;
|
|
66
67
|
}
|
|
67
68
|
this.validateArgs(args);
|
|
68
69
|
const authInfo = await utility_1.getandValidateOauthInfoFromSpec(args, context, actionName);
|
|
70
|
+
if (args.identityProvider === "MicrosoftEntra") {
|
|
71
|
+
if (!authInfo.authorizationEndpoint.includes("microsoftonline")) {
|
|
72
|
+
throw new oauthIdentityProviderInvalid_1.OauthIdentityProviderInvalid(actionName);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
69
75
|
const oauthRegistration = await this.mapArgsToOauthRegistration(context.m365TokenProvider, args, authInfo);
|
|
70
76
|
const oauthRegistrationRes = await teamsDevPortalClient_1.teamsDevPortalClient.createOauthRegistration(appStudioToken, oauthRegistration);
|
|
71
77
|
outputs.set(outputEnvVarNames.get(createOauthOutputs_1.OutputKeys.configurationId), oauthRegistrationRes.configurationRegistrationId.oAuthConfigId);
|
|
@@ -124,8 +130,19 @@ let CreateOauthDriver = class CreateOauthDriver {
|
|
|
124
130
|
if (typeof args.clientId !== "string" || !args.clientId) {
|
|
125
131
|
invalidParameters.push("clientId");
|
|
126
132
|
}
|
|
127
|
-
if (args.
|
|
128
|
-
invalidParameters.push("
|
|
133
|
+
if (args.isPKCEEnabled && typeof args.isPKCEEnabled !== "boolean") {
|
|
134
|
+
invalidParameters.push("isPKCEEnabled");
|
|
135
|
+
}
|
|
136
|
+
if (args.identityProvider &&
|
|
137
|
+
(typeof args.identityProvider !== "string" ||
|
|
138
|
+
(args.identityProvider !== "Custom" && args.identityProvider !== "MicrosoftEntra"))) {
|
|
139
|
+
invalidParameters.push("identityProvider");
|
|
140
|
+
}
|
|
141
|
+
const isCustomIdentityProvider = !args.identityProvider || args.identityProvider === "Custom";
|
|
142
|
+
if (!args.isPKCEEnabled || isCustomIdentityProvider) {
|
|
143
|
+
if (args.clientSecret && !this.validateSecret(args.clientSecret)) {
|
|
144
|
+
invalidParameters.push("clientSecret");
|
|
145
|
+
}
|
|
129
146
|
}
|
|
130
147
|
if (args.refreshUrl && typeof args.refreshUrl !== "string") {
|
|
131
148
|
invalidParameters.push("refreshUrl");
|
|
@@ -157,6 +174,17 @@ let CreateOauthDriver = class CreateOauthDriver {
|
|
|
157
174
|
const applicableToApps = args.applicableToApps
|
|
158
175
|
? args.applicableToApps
|
|
159
176
|
: OauthRegistration_1.OauthRegistrationAppType.AnyApp;
|
|
177
|
+
if (args.identityProvider === "MicrosoftEntra") {
|
|
178
|
+
return {
|
|
179
|
+
description: args.name,
|
|
180
|
+
targetUrlsShouldStartWith: authInfo.domain,
|
|
181
|
+
applicableToApps: applicableToApps,
|
|
182
|
+
m365AppId: applicableToApps === OauthRegistration_1.OauthRegistrationAppType.SpecificApp ? args.appId : "",
|
|
183
|
+
targetAudience: targetAudience,
|
|
184
|
+
clientId: args.clientId,
|
|
185
|
+
identityProvider: "MicrosoftEntra",
|
|
186
|
+
};
|
|
187
|
+
}
|
|
160
188
|
return {
|
|
161
189
|
description: args.name,
|
|
162
190
|
targetUrlsShouldStartWith: authInfo.domain,
|
|
@@ -165,10 +193,12 @@ let CreateOauthDriver = class CreateOauthDriver {
|
|
|
165
193
|
targetAudience: targetAudience,
|
|
166
194
|
clientId: args.clientId,
|
|
167
195
|
clientSecret: (_a = args.clientSecret) !== null && _a !== void 0 ? _a : "",
|
|
196
|
+
isPKCEEnabled: !!args.isPKCEEnabled,
|
|
168
197
|
authorizationEndpoint: authInfo.authorizationEndpoint,
|
|
169
198
|
tokenExchangeEndpoint: authInfo.tokenExchangeEndpoint,
|
|
170
199
|
tokenRefreshEndpoint: (_b = args.refreshUrl) !== null && _b !== void 0 ? _b : authInfo.tokenRefreshEndpoint,
|
|
171
200
|
scopes: authInfo.scopes,
|
|
201
|
+
identityProvider: "Custom",
|
|
172
202
|
// TODO: add this part back after TDP update
|
|
173
203
|
// manageableByUsers: [
|
|
174
204
|
// {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/oauth/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,6CAA0C;AAC1C,wDAA4F;AAC5F,mCAAiC;AACjC,+EAA4E;AAC5E,yDAAyE;AACzE,iEAAmE;AACnE,kDAA+E;AAC/E,2DAA4D;AAC5D,4DAAyD;AACzD,8GAA2G;AAG3G,mFAAgF;AAChF,gFAIkD;AAClD,yCAAiD;AACjD,+DAAiE;AAEjE,uEAAgF;AAChF,mDAAuF;AACvF,+CAA+E;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/oauth/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthDisablePKCEError.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/error/oauthDisablePKCEError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,qBAAa,qBAAsB,SAAQ,SAAS;gBACtC,UAAU,EAAE,MAAM;CAQ/B"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.OauthDisablePKCEError = void 0;
|
|
6
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
+
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
8
|
+
const errorCode = "OauthDisablePKCEError";
|
|
9
|
+
const messageKey = "driver.oauth.error.oauthDisablePKCEError";
|
|
10
|
+
class OauthDisablePKCEError extends teamsfx_api_1.UserError {
|
|
11
|
+
constructor(actionName) {
|
|
12
|
+
super({
|
|
13
|
+
source: actionName,
|
|
14
|
+
name: errorCode,
|
|
15
|
+
message: localizeUtils_1.getDefaultString(messageKey),
|
|
16
|
+
displayMessage: localizeUtils_1.getLocalizedString(messageKey),
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
exports.OauthDisablePKCEError = OauthDisablePKCEError;
|
|
21
|
+
//# sourceMappingURL=oauthDisablePKCEError.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthDisablePKCEError.js","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/error/oauthDisablePKCEError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;AAExF,MAAM,SAAS,GAAG,uBAAuB,CAAC;AAC1C,MAAM,UAAU,GAAG,0CAA0C,CAAC;AAE9D,MAAa,qBAAsB,SAAQ,uBAAS;IAClD,YAAY,UAAkB;QAC5B,KAAK,CAAC;YACJ,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,CAAC;YACrC,cAAc,EAAE,kCAAkB,CAAC,UAAU,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC;CACF;AATD,sDASC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthIdentityProviderInvalid.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/error/oauthIdentityProviderInvalid.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,qBAAa,4BAA6B,SAAQ,SAAS;gBAC7C,UAAU,EAAE,MAAM;CAQ/B"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.OauthIdentityProviderInvalid = void 0;
|
|
6
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
+
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
8
|
+
const errorCode = "OauthIdentityProviderInvalid";
|
|
9
|
+
const messageKey = "driver.oauth.error.OauthIdentityProviderInvalid";
|
|
10
|
+
class OauthIdentityProviderInvalid extends teamsfx_api_1.UserError {
|
|
11
|
+
constructor(actionName) {
|
|
12
|
+
super({
|
|
13
|
+
source: actionName,
|
|
14
|
+
name: errorCode,
|
|
15
|
+
message: localizeUtils_1.getDefaultString(messageKey),
|
|
16
|
+
displayMessage: localizeUtils_1.getLocalizedString(messageKey),
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
exports.OauthIdentityProviderInvalid = OauthIdentityProviderInvalid;
|
|
21
|
+
//# sourceMappingURL=oauthIdentityProviderInvalid.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthIdentityProviderInvalid.js","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/error/oauthIdentityProviderInvalid.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;AAExF,MAAM,SAAS,GAAG,8BAA8B,CAAC;AACjD,MAAM,UAAU,GAAG,iDAAiD,CAAC;AAErE,MAAa,4BAA6B,SAAQ,uBAAS;IACzD,YAAY,UAAkB;QAC5B,KAAK,CAAC;YACJ,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,CAAC;YACrC,cAAc,EAAE,kCAAkB,CAAC,UAAU,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC;CACF;AATD,oEASC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOauthArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/interface/createOauthArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"createOauthArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/interface/createOauthArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateOauthArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/interface/updateOauthArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
|
|
1
|
+
{"version":3,"file":"updateOauthArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/interface/updateOauthArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/oauth/update.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAQtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/oauth/update.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAQtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAQ9D,qBACa,iBAAkB,YAAW,UAAU;IAClD,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAAmD;IAG5D,OAAO,CAClB,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IA8F3B,OAAO,CAAC,YAAY;IA+CpB,OAAO,CAAC,wBAAwB;IA+ChC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,0BAA0B;CAiBnC"}
|
|
@@ -16,6 +16,7 @@ const OauthRegistration_1 = require("../teamsApp/interfaces/OauthRegistration");
|
|
|
16
16
|
const oauthNameTooLong_1 = require("./error/oauthNameTooLong");
|
|
17
17
|
const constants_2 = require("./utility/constants");
|
|
18
18
|
const utility_1 = require("./utility/utility");
|
|
19
|
+
const oauthDisablePKCEError_1 = require("./error/oauthDisablePKCEError");
|
|
19
20
|
const actionName = "oauth/update"; // DO NOT MODIFY the name
|
|
20
21
|
const helpLink = "https://aka.ms/teamsfx-actions/oauth-update";
|
|
21
22
|
let UpdateOauthDriver = class UpdateOauthDriver {
|
|
@@ -40,6 +41,9 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
40
41
|
}
|
|
41
42
|
const appStudioToken = appStudioTokenRes.value;
|
|
42
43
|
const getOauthRes = await teamsDevPortalClient_1.teamsDevPortalClient.getOauthRegistrationById(appStudioToken, args.configurationId);
|
|
44
|
+
if (getOauthRes.isPKCEEnabled && !args.isPKCEEnabled) {
|
|
45
|
+
throw new oauthDisablePKCEError_1.OauthDisablePKCEError(actionName);
|
|
46
|
+
}
|
|
43
47
|
const diffMsgs = this.compareOauthRegistration(getOauthRes, args, domain);
|
|
44
48
|
// If there is no difference, skip the update
|
|
45
49
|
if (!diffMsgs || diffMsgs.length === 0) {
|
|
@@ -117,6 +121,9 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
117
121
|
args.targetAudience !== OauthRegistration_1.OauthRegistrationTargetAudience.HomeTenant) {
|
|
118
122
|
invalidParameters.push("targetAudience");
|
|
119
123
|
}
|
|
124
|
+
if (args.isPKCEEnabled && typeof args.isPKCEEnabled !== "boolean") {
|
|
125
|
+
invalidParameters.push("isPKCEEnabled");
|
|
126
|
+
}
|
|
120
127
|
if (invalidParameters.length > 0) {
|
|
121
128
|
throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
122
129
|
}
|
|
@@ -142,6 +149,9 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
142
149
|
!domain.every((value) => current.targetUrlsShouldStartWith.includes(value))) {
|
|
143
150
|
diffMsgs.push(`targetUrlsShouldStartWith: ${current.targetUrlsShouldStartWith.join(",")} => ${domain.join(",")}`);
|
|
144
151
|
}
|
|
152
|
+
if (current.isPKCEEnabled !== input.isPKCEEnabled) {
|
|
153
|
+
diffMsgs.push(`isPKCEEnabled: ${(!!current.isPKCEEnabled).toString()} => ${(!!input.isPKCEEnabled).toString()}`);
|
|
154
|
+
}
|
|
145
155
|
return diffMsgs;
|
|
146
156
|
}
|
|
147
157
|
// Should skip confirm box if only targetUrlsShouldStartWith is different and the url contains devtunnel
|
|
@@ -165,6 +175,7 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
165
175
|
applicableToApps: applicableToApps,
|
|
166
176
|
m365AppId: applicableToApps === OauthRegistration_1.OauthRegistrationAppType.SpecificApp ? args.appId : "",
|
|
167
177
|
targetAudience: targetAudience,
|
|
178
|
+
isPKCEEnabled: !!args.isPKCEEnabled,
|
|
168
179
|
};
|
|
169
180
|
}
|
|
170
181
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/oauth/update.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,6CAA0C;AAC1C,wDAAyE;AACzE,mCAAiC;AACjC,+EAA4E;AAC5E,yDAA4D;AAC5D,iEAAmE;AACnE,kDAA+E;AAG/E,mFAAgF;AAChF,gFAIkD;AAClD,+DAAiE;AAEjE,mDAAqD;AACrD,+CAAoE;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/oauth/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export declare const logMessageKeys: {
|
|
|
7
7
|
skipUpdateOauth: string;
|
|
8
8
|
successUpdateOauth: string;
|
|
9
9
|
};
|
|
10
|
-
export declare const maxSecretLength =
|
|
10
|
+
export declare const maxSecretLength = 512;
|
|
11
11
|
export declare const minSecretLength = 10;
|
|
12
12
|
export declare const maxDomainPerOauth = 1;
|
|
13
13
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -12,7 +12,7 @@ exports.logMessageKeys = {
|
|
|
12
12
|
skipUpdateOauth: "driver.oauth.log.skipUpdateOauth",
|
|
13
13
|
successUpdateOauth: "driver.oauth.log.successUpdateOauth",
|
|
14
14
|
};
|
|
15
|
-
exports.maxSecretLength =
|
|
15
|
+
exports.maxSecretLength = 512;
|
|
16
16
|
exports.minSecretLength = 10;
|
|
17
17
|
exports.maxDomainPerOauth = 1;
|
|
18
18
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAC/E,OAAO,aAAa,MAAM,eAAe,CAAC;AAM1C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAC/E,OAAO,aAAa,MAAM,eAAe,CAAC;AAM1C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAGjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAMtE,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgBhE;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAoB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAM3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CA0ElD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAUlE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD"}
|
|
@@ -17,7 +17,6 @@ const path = tslib_1.__importStar(require("path"));
|
|
|
17
17
|
const typedi_1 = require("typedi");
|
|
18
18
|
const script_1 = require("../../../error/script");
|
|
19
19
|
const commonConstant_1 = require("../../constant/commonConstant");
|
|
20
|
-
const messages_1 = require("../../messages");
|
|
21
20
|
const charsetUtils_1 = require("../../utils/charsetUtils");
|
|
22
21
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
23
22
|
const stringUtils_1 = require("../../../common/stringUtils");
|
|
@@ -51,8 +50,8 @@ async function defaultShell() {
|
|
|
51
50
|
exports.defaultShell = defaultShell;
|
|
52
51
|
let ScriptDriver = class ScriptDriver {
|
|
53
52
|
async _run(typedArgs, context) {
|
|
54
|
-
var _a
|
|
55
|
-
await ((_a = context.progressBar) === null || _a === void 0 ? void 0 : _a.next(
|
|
53
|
+
var _a;
|
|
54
|
+
await ((_a = context.progressBar) === null || _a === void 0 ? void 0 : _a.next("Running script"));
|
|
56
55
|
const res = await executeCommand(typedArgs.run, context.projectPath, context.logProvider, context.ui, typedArgs.workingDirectory, undefined, typedArgs.shell, typedArgs.timeout, typedArgs.redirectTo);
|
|
57
56
|
if (res.isErr())
|
|
58
57
|
return teamsfx_api_1.err(res.error);
|
|
@@ -63,9 +62,7 @@ let ScriptDriver = class ScriptDriver {
|
|
|
63
62
|
async execute(args, ctx) {
|
|
64
63
|
const typedArgs = args;
|
|
65
64
|
const res = await this._run(typedArgs, ctx);
|
|
66
|
-
const summaries = res.isOk()
|
|
67
|
-
? [`Successfully executed command ${stringUtils_1.maskSecretValues(args.run)}`]
|
|
68
|
-
: [];
|
|
65
|
+
const summaries = res.isOk() ? [`Successfully executed command`] : [];
|
|
69
66
|
return { result: res, summaries: summaries };
|
|
70
67
|
}
|
|
71
68
|
};
|
|
@@ -86,10 +83,10 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
86
83
|
return new Promise((resolve) => {
|
|
87
84
|
var _a, _b;
|
|
88
85
|
const finalShell = shell || dshell;
|
|
89
|
-
|
|
90
|
-
if (typeof finalShell === "string" && finalShell.includes("cmd")) {
|
|
91
|
-
|
|
92
|
-
}
|
|
86
|
+
const finalCmd = command;
|
|
87
|
+
// if (typeof finalShell === "string" && finalShell.includes("cmd")) {
|
|
88
|
+
// finalCmd = `%ComSpec% /D /E:ON /V:OFF /S /C "CALL ${command}"`;
|
|
89
|
+
// }
|
|
93
90
|
const platform = os_1.default.platform();
|
|
94
91
|
let workingDir = workingDirectory || ".";
|
|
95
92
|
workingDir = path.isAbsolute(workingDir) ? workingDir : path.join(projectPath, workingDir);
|
|
@@ -100,7 +97,9 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
100
97
|
if (redirectTo) {
|
|
101
98
|
appendFile = path.isAbsolute(redirectTo) ? redirectTo : path.join(projectPath, redirectTo);
|
|
102
99
|
}
|
|
103
|
-
logProvider.verbose(`Start to run command: "${stringUtils_1.
|
|
100
|
+
logProvider.verbose(`Start to run command: "${stringUtils_1.maskSecret(finalCmd, {
|
|
101
|
+
replace: "***",
|
|
102
|
+
})}" with args: ${JSON.stringify({
|
|
104
103
|
shell: finalShell,
|
|
105
104
|
cwd: workingDir,
|
|
106
105
|
encoding: systemEncoding,
|
|
@@ -126,7 +125,9 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
126
125
|
const outputString = allOutputStrings.join("");
|
|
127
126
|
const outputObject = parseSetOutputCommand(outputString);
|
|
128
127
|
if (Object.keys(outputObject).length > 0)
|
|
129
|
-
logProvider.verbose(`script output env variables: ${stringUtils_1.
|
|
128
|
+
logProvider.verbose(`script output env variables: ${stringUtils_1.maskSecret(JSON.stringify(outputObject), {
|
|
129
|
+
replace: "***",
|
|
130
|
+
})}`);
|
|
130
131
|
resolve(teamsfx_api_1.ok([outputString, outputObject]));
|
|
131
132
|
}
|
|
132
133
|
});
|
|
@@ -138,7 +139,7 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
138
139
|
};
|
|
139
140
|
(_a = cp.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
|
|
140
141
|
const str = bufferToString(data, systemEncoding);
|
|
141
|
-
logProvider.info(` [script stdout] ${stringUtils_1.
|
|
142
|
+
logProvider.info(` [script stdout] ${stringUtils_1.maskSecret(str, { replace: "***" })}`);
|
|
142
143
|
dataHandler(str);
|
|
143
144
|
});
|
|
144
145
|
const handler = getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler);
|
|
@@ -149,7 +150,7 @@ exports.executeCommand = executeCommand;
|
|
|
149
150
|
function getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler) {
|
|
150
151
|
return (data) => {
|
|
151
152
|
const str = bufferToString(data, systemEncoding);
|
|
152
|
-
logProvider.warning(` [script stderr] ${stringUtils_1.
|
|
153
|
+
logProvider.warning(` [script stderr] ${stringUtils_1.maskSecret(str, { replace: "***" })}`);
|
|
153
154
|
dataHandler(str);
|
|
154
155
|
stderrStrings.push(str);
|
|
155
156
|
};
|
|
@@ -164,23 +165,21 @@ function bufferToString(data, systemEncoding) {
|
|
|
164
165
|
exports.bufferToString = bufferToString;
|
|
165
166
|
function convertScriptErrorToFxError(error, run) {
|
|
166
167
|
if (error.killed) {
|
|
167
|
-
return new script_1.ScriptTimeoutError(error);
|
|
168
|
+
return new script_1.ScriptTimeoutError(error, run);
|
|
168
169
|
}
|
|
169
170
|
else {
|
|
170
|
-
return new script_1.ScriptExecutionError(error);
|
|
171
|
+
return new script_1.ScriptExecutionError(error, run);
|
|
171
172
|
}
|
|
172
173
|
}
|
|
173
174
|
exports.convertScriptErrorToFxError = convertScriptErrorToFxError;
|
|
174
175
|
function parseSetOutputCommand(stdout) {
|
|
175
|
-
const regex =
|
|
176
|
+
const regex = /::(set-teamsfx-env|set-output)\s+(\w+)=((["'])(.*?)\4|[^"'\s]+)/g;
|
|
176
177
|
const output = {};
|
|
177
178
|
let match;
|
|
178
179
|
while ((match = regex.exec(stdout))) {
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
output[key] = value;
|
|
183
|
-
}
|
|
180
|
+
const key = match[2];
|
|
181
|
+
const value = match[5] !== undefined ? match[5] : match[3];
|
|
182
|
+
output[key] = value;
|
|
184
183
|
}
|
|
185
184
|
return output;
|
|
186
185
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,6CAA0C;AAC1C,wDAA+E;AAC/E,0EAA0C;AAC1C,gEAA0B;AAC1B,oEAA+B;AAC/B,oDAAoB;AACpB,mDAA6B;AAC7B,mCAAiC;AACjC,kDAAiF;AACjF,kEAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appStudio.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/appStudio.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,WAAW,EACX,iBAAiB,EAGjB,MAAM,EAKP,MAAM,wBAAwB,CAAC;AA0BhC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"appStudio.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/appStudio.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,WAAW,EACX,iBAAiB,EAGjB,MAAM,EAKP,MAAM,wBAAwB,CAAC;AA0BhC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAKpE,wBAAsB,qCAAqC,CACzD,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAoBnC;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAsJ/C;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAmE/B;AAED,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CA4CtC"}
|
|
@@ -26,6 +26,7 @@ const createAppPackage_1 = require("./createAppPackage");
|
|
|
26
26
|
const errors_1 = require("./errors");
|
|
27
27
|
const results_1 = require("./results");
|
|
28
28
|
const ManifestUtils_1 = require("./utils/ManifestUtils");
|
|
29
|
+
const utils_1 = require("../../../common/utils");
|
|
29
30
|
async function checkIfAppInDifferentAcountSameTenant(teamsAppId, tokenProvider, logger) {
|
|
30
31
|
const appStudioTokenRes = await tokenProvider.getAccessToken({
|
|
31
32
|
scopes: constants_1.AppStudioScopes,
|
|
@@ -59,11 +60,11 @@ async function updateManifestV3(ctx, inputs) {
|
|
|
59
60
|
const updateTeamsAppArgs = {
|
|
60
61
|
appPackagePath: createAppPackageArgs.outputZipPath,
|
|
61
62
|
};
|
|
62
|
-
const driverContext = generateDriverContext(ctx, inputs);
|
|
63
|
+
const driverContext = utils_1.generateDriverContext(ctx, inputs);
|
|
63
64
|
await envUtil_1.envUtil.readEnv(inputs.projectPath, state.ENV_NAME);
|
|
64
65
|
// render manifest
|
|
65
66
|
let manifest;
|
|
66
|
-
const manifestResult = await ManifestUtils_1.manifestUtils.getManifestV3(manifestTemplatePath);
|
|
67
|
+
const manifestResult = await ManifestUtils_1.manifestUtils.getManifestV3(manifestTemplatePath, driverContext);
|
|
67
68
|
if (manifestResult.isErr()) {
|
|
68
69
|
return teamsfx_api_1.err(manifestResult.error);
|
|
69
70
|
}
|
|
@@ -164,7 +165,7 @@ exports.updateManifestV3 = updateManifestV3;
|
|
|
164
165
|
async function updateTeamsAppV3ForPublish(ctx, inputs) {
|
|
165
166
|
var _a;
|
|
166
167
|
let teamsAppId;
|
|
167
|
-
const driverContext = generateDriverContext(ctx, inputs);
|
|
168
|
+
const driverContext = utils_1.generateDriverContext(ctx, inputs);
|
|
168
169
|
const updateTeamsAppArgs = {
|
|
169
170
|
appPackagePath: inputs[constants_2.QuestionNames.AppPackagePath],
|
|
170
171
|
};
|
|
@@ -262,18 +263,6 @@ async function getAppPackage(teamsAppId, m365TokenProvider, logProvider) {
|
|
|
262
263
|
}
|
|
263
264
|
}
|
|
264
265
|
exports.getAppPackage = getAppPackage;
|
|
265
|
-
function generateDriverContext(ctx, inputs) {
|
|
266
|
-
return {
|
|
267
|
-
azureAccountProvider: ctx.tokenProvider.azureAccountProvider,
|
|
268
|
-
m365TokenProvider: ctx.tokenProvider.m365TokenProvider,
|
|
269
|
-
ui: ctx.userInteraction,
|
|
270
|
-
progressBar: undefined,
|
|
271
|
-
logProvider: ctx.logProvider,
|
|
272
|
-
telemetryReporter: ctx.telemetryReporter,
|
|
273
|
-
projectPath: ctx.projectPath,
|
|
274
|
-
platform: inputs.platform,
|
|
275
|
-
};
|
|
276
|
-
}
|
|
277
266
|
function generateCreateAppPackageArgs(projectPath, manifestTemplatePath, envName) {
|
|
278
267
|
const manifestFileName = path.join(projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.BuildFolderName, `manifest.${envName}.json`);
|
|
279
268
|
return {
|