@microsoft/teamsfx-core 0.8.1-alpha.e5278c29.0 → 0.9.0-rc.1
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 +1 -3
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -3
- package/build/common/constants.js.map +1 -1
- package/build/common/localSettingsConstants.d.ts +5 -0
- package/build/common/localSettingsConstants.d.ts.map +1 -1
- package/build/common/localSettingsConstants.js +6 -1
- package/build/common/localSettingsConstants.js.map +1 -1
- package/build/common/localSettingsProvider.d.ts +9 -5
- package/build/common/localSettingsProvider.d.ts.map +1 -1
- package/build/common/localSettingsProvider.js +99 -7
- package/build/common/localSettingsProvider.js.map +1 -1
- package/build/common/telemetry.d.ts +17 -2
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +17 -1
- package/build/common/telemetry.js.map +1 -1
- package/build/common/tools.d.ts +31 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +76 -4
- package/build/common/tools.js.map +1 -1
- package/build/core/environment.d.ts +4 -4
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +16 -17
- package/build/core/environment.js.map +1 -1
- package/build/core/error.d.ts +2 -3
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +10 -8
- package/build/core/error.js.map +1 -1
- package/build/core/index.d.ts +5 -5
- package/build/core/index.d.ts.map +1 -1
- package/build/core/index.js +203 -104
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +46 -39
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/envInfoLoader.d.ts +1 -1
- package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoader.js +26 -27
- package/build/core/middleware/envInfoLoader.js.map +1 -1
- package/build/core/middleware/envInfoWriter.d.ts.map +1 -1
- package/build/core/middleware/envInfoWriter.js +8 -5
- package/build/core/middleware/envInfoWriter.js.map +1 -1
- package/build/core/middleware/errorHandler.d.ts.map +1 -1
- package/build/core/middleware/errorHandler.js +4 -4
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/index.d.ts +16 -0
- package/build/core/middleware/index.d.ts.map +1 -0
- package/build/core/middleware/index.js +19 -0
- package/build/core/middleware/index.js.map +1 -0
- package/build/core/middleware/localSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/localSettingsLoader.js +13 -6
- package/build/core/middleware/localSettingsLoader.js.map +1 -1
- package/build/core/middleware/localSettingsWriter.d.ts.map +1 -1
- package/build/core/middleware/localSettingsWriter.js +24 -26
- package/build/core/middleware/localSettingsWriter.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts +2 -1
- package/build/core/middleware/projectMigrator.d.ts.map +1 -1
- package/build/core/middleware/projectMigrator.js +147 -23
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.d.ts +1 -1
- package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +3 -7
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectSettingsWriter.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsWriter.js +34 -31
- package/build/core/middleware/projectSettingsWriter.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +7 -0
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/solutionLoader.d.ts.map +1 -1
- package/build/core/middleware/solutionLoader.js +4 -5
- package/build/core/middleware/solutionLoader.js.map +1 -1
- package/build/core/permissionRequest.d.ts.map +1 -1
- package/build/core/permissionRequest.js +2 -1
- package/build/core/permissionRequest.js.map +1 -1
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +17 -2
- package/build/core/question.js.map +1 -1
- package/build/core/tools.d.ts +2 -2
- package/build/core/tools.d.ts.map +1 -1
- package/build/core/tools.js +14 -71
- package/build/core/tools.js.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.d.ts.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.js +6 -2
- package/build/plugins/resource/aad/aadAppClient.js.map +1 -1
- package/build/plugins/resource/aad/constants.d.ts +6 -0
- package/build/plugins/resource/aad/constants.d.ts.map +1 -1
- package/build/plugins/resource/aad/constants.js +8 -1
- package/build/plugins/resource/aad/constants.js.map +1 -1
- package/build/plugins/resource/aad/errors.js +7 -7
- package/build/plugins/resource/aad/errors.js.map +1 -1
- package/build/plugins/resource/aad/graph.d.ts.map +1 -1
- package/build/plugins/resource/aad/graph.js +3 -1
- package/build/plugins/resource/aad/graph.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +2 -1
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/aad/utils/common.d.ts +4 -1
- package/build/plugins/resource/aad/utils/common.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/common.js +23 -0
- package/build/plugins/resource/aad/utils/common.js.map +1 -1
- package/build/plugins/resource/aad/v2/index.d.ts +1 -1
- package/build/plugins/resource/aad/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/v2/index.js +2 -2
- package/build/plugins/resource/aad/v2/index.js.map +1 -1
- package/build/plugins/resource/apim/v2/index.d.ts +1 -1
- package/build/plugins/resource/apim/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/apim/v2/index.js +2 -2
- package/build/plugins/resource/apim/v2/index.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +7 -1
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +156 -5
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/index.d.ts +1 -1
- package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/index.js +8 -3
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts +5 -5
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +102 -53
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/utils/utils.d.ts +2 -0
- package/build/plugins/resource/appstudio/utils/utils.d.ts.map +1 -0
- package/build/plugins/resource/appstudio/utils/utils.js +16 -0
- package/build/plugins/resource/appstudio/utils/utils.js.map +1 -0
- package/build/plugins/resource/appstudio/v2/index.d.ts +1 -1
- package/build/plugins/resource/appstudio/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.js +3 -3
- package/build/plugins/resource/appstudio/v2/index.js.map +1 -1
- package/build/plugins/resource/bot/aadRegistration.d.ts +1 -1
- package/build/plugins/resource/bot/aadRegistration.d.ts.map +1 -1
- package/build/plugins/resource/bot/aadRegistration.js +13 -4
- package/build/plugins/resource/bot/aadRegistration.js.map +1 -1
- package/build/plugins/resource/bot/configs/provisionConfig.d.ts +2 -2
- package/build/plugins/resource/bot/configs/provisionConfig.d.ts.map +1 -1
- package/build/plugins/resource/bot/configs/provisionConfig.js +4 -4
- package/build/plugins/resource/bot/configs/provisionConfig.js.map +1 -1
- package/build/plugins/resource/bot/deployMgr.d.ts.map +1 -1
- package/build/plugins/resource/bot/deployMgr.js +5 -0
- package/build/plugins/resource/bot/deployMgr.js.map +1 -1
- package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/plugin.js +9 -15
- package/build/plugins/resource/bot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/resources/strings.d.ts +2 -2
- package/build/plugins/resource/bot/resources/strings.d.ts.map +1 -1
- package/build/plugins/resource/bot/resources/strings.js +2 -2
- package/build/plugins/resource/bot/resources/strings.js.map +1 -1
- package/build/plugins/resource/bot/v2/index.d.ts +1 -1
- package/build/plugins/resource/bot/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/index.js +2 -2
- package/build/plugins/resource/bot/v2/index.js.map +1 -1
- package/build/plugins/resource/frontend/ops/deploy.d.ts.map +1 -1
- package/build/plugins/resource/frontend/ops/deploy.js +5 -0
- package/build/plugins/resource/frontend/ops/deploy.js.map +1 -1
- package/build/plugins/resource/frontend/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/plugin.js +20 -12
- package/build/plugins/resource/frontend/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/v2/index.d.ts +1 -1
- package/build/plugins/resource/frontend/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v2/index.js +2 -2
- package/build/plugins/resource/frontend/v2/index.js.map +1 -1
- package/build/plugins/resource/function/constants.d.ts +2 -2
- package/build/plugins/resource/function/constants.d.ts.map +1 -1
- package/build/plugins/resource/function/constants.js +2 -2
- package/build/plugins/resource/function/constants.js.map +1 -1
- package/build/plugins/resource/function/ops/deploy.d.ts.map +1 -1
- package/build/plugins/resource/function/ops/deploy.js +5 -0
- package/build/plugins/resource/function/ops/deploy.js.map +1 -1
- package/build/plugins/resource/function/ops/provision.d.ts +1 -1
- package/build/plugins/resource/function/ops/provision.d.ts.map +1 -1
- package/build/plugins/resource/function/ops/provision.js +2 -2
- package/build/plugins/resource/function/ops/provision.js.map +1 -1
- package/build/plugins/resource/function/plugin.js +3 -3
- package/build/plugins/resource/function/plugin.js.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.js +3 -5
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.js.map +1 -1
- package/build/plugins/resource/function/v2/index.d.ts +1 -1
- package/build/plugins/resource/function/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/function/v2/index.js +2 -2
- package/build/plugins/resource/function/v2/index.js.map +1 -1
- package/build/plugins/resource/identity/config.d.ts +2 -2
- package/build/plugins/resource/identity/config.d.ts.map +1 -1
- package/build/plugins/resource/identity/config.js +2 -2
- package/build/plugins/resource/identity/config.js.map +1 -1
- package/build/plugins/resource/identity/constants.d.ts +6 -6
- package/build/plugins/resource/identity/constants.d.ts.map +1 -1
- package/build/plugins/resource/identity/constants.js +6 -6
- package/build/plugins/resource/identity/constants.js.map +1 -1
- package/build/plugins/resource/identity/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/index.js +15 -16
- package/build/plugins/resource/identity/index.js.map +1 -1
- package/build/plugins/resource/identity/utils/messages.d.ts +1 -1
- package/build/plugins/resource/identity/utils/messages.d.ts.map +1 -1
- package/build/plugins/resource/identity/utils/messages.js +1 -1
- package/build/plugins/resource/identity/utils/messages.js.map +1 -1
- package/build/plugins/resource/localdebug/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/index.js +26 -21
- package/build/plugins/resource/localdebug/index.js.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.d.ts +1 -1
- package/build/plugins/resource/localdebug/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.js +2 -2
- package/build/plugins/resource/localdebug/v2/index.js.map +1 -1
- package/build/plugins/resource/sql/constants.d.ts +1 -1
- package/build/plugins/resource/sql/constants.d.ts.map +1 -1
- package/build/plugins/resource/sql/constants.js +1 -1
- package/build/plugins/resource/sql/constants.js.map +1 -1
- package/build/plugins/resource/sql/plugin.js +3 -3
- package/build/plugins/resource/sql/plugin.js.map +1 -1
- package/build/plugins/resource/utils4v2.d.ts +7 -6
- package/build/plugins/resource/utils4v2.d.ts.map +1 -1
- package/build/plugins/resource/utils4v2.js +76 -66
- package/build/plugins/resource/utils4v2.js.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js +2 -2
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +29 -24
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts +6 -1
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.js +86 -30
- package/build/plugins/solution/fx-solution/commonQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +8 -2
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +7 -1
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +1 -1
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +91 -70
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/adaptor.d.ts +1 -1
- package/build/plugins/solution/fx-solution/v2/adaptor.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/adaptor.js +4 -2
- package/build/plugins/solution/fx-solution/v2/adaptor.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.js +3 -3
- package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts +4 -4
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js +24 -24
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executor.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executor.js +4 -4
- package/build/plugins/solution/fx-solution/v2/executor.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js +0 -7
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +10 -17
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/package.js +2 -2
- package/build/plugins/solution/fx-solution/v2/package.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.js +3 -3
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js +6 -3
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts +3 -2
- package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.js +8 -7
- package/build/plugins/solution/fx-solution/v2/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts +1 -0
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +18 -7
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/package.json +7 -7
- package/resource/strings.json +5 -6
- package/templates/plugins/resource/aad/bicep/parameters.json +5 -5
- package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep +2 -2
- package/templates/plugins/resource/bot/bicep/botProvision.template.bicep +2 -2
- package/templates/plugins/resource/bot/bicep/module.template.bicep +2 -2
- package/templates/plugins/resource/bot/bicep/parameters.json +3 -3
- package/templates/plugins/resource/function/bicep/functionConfiguration.template.bicep +6 -2
- package/templates/plugins/resource/function/bicep/functionProvision.template.bicep +2 -2
- package/templates/plugins/resource/function/bicep/module.template.bicep +2 -2
- package/templates/plugins/resource/identity/bicep/output.template.bicep +2 -2
- package/templates/plugins/resource/identity/bicep/userAssignedIdentity.template.bicep +3 -3
- package/templates/plugins/resource/spfx/solution/manifest_multi_env.json +2 -2
- package/templates/plugins/resource/sql/bicep/parameters.json +3 -3
|
@@ -29,10 +29,8 @@ export declare class PluginDisplayName {
|
|
|
29
29
|
static readonly Solution = "Teams Toolkit";
|
|
30
30
|
}
|
|
31
31
|
export declare class FeatureFlagName {
|
|
32
|
-
static readonly MultiEnv = "TEAMSFX_MULTI_ENV";
|
|
33
|
-
static readonly ArmSupport = "TEAMSFX_ARM_SUPPORT";
|
|
34
32
|
static readonly BicepEnvCheckerEnable = "TEAMSFX_BICEP_ENV_CHECKER_ENABLE";
|
|
35
|
-
static readonly RemoteCollaboration = "TEAMSFX_REMOTE_COL";
|
|
36
33
|
static readonly APIV2 = "TEAMSFX_APIV2";
|
|
34
|
+
static readonly InsiderPreview = "TEAMSFX_INSIDER_PREVIEW";
|
|
37
35
|
}
|
|
38
36
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,YAAY,WAAW;IACvC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,qCAAqC;IAC3E,MAAM,CAAC,QAAQ,CAAC,kBAAkB,wBAAwB;CAC3D;AAED,eAAO,MAAM,WAAW,oCAAoC,CAAC;AAE7D,qBAAa,KAAK;IAChB,MAAM,CAAC,QAAQ,CAAC,8BAA8B,EAAE,MAAM,CAA0B;IAChF,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE,MAAM,CAA2B;IAC9E,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE,MAAM,CAA2B;IAC9E,MAAM,CAAC,QAAQ,CAAC,8BAA8B,EAAE,MAAM,CAA8B;IACpF,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAqB;CAC/D;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,aAAa,0CAA0C;IACvE,MAAM,CAAC,QAAQ,CAAC,GAAG,0CAA0C;CAC9D;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,GAAG,mCAAmC;IACtD,MAAM,CAAC,QAAQ,CAAC,eAAe,kCAAkC;IACjE,MAAM,CAAC,QAAQ,CAAC,UAAU,6BAA6B;IACvD,MAAM,CAAC,QAAQ,CAAC,GAAG,qBAAqB;IACxC,MAAM,CAAC,QAAQ,CAAC,UAAU,6BAA6B;IACvD,MAAM,CAAC,QAAQ,CAAC,QAAQ,2BAA2B;IACnD,MAAM,CAAC,QAAQ,CAAC,QAAQ,0BAA0B;IAClD,MAAM,CAAC,QAAQ,CAAC,QAAQ,0BAA0B;CACnD;AACD,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,mBAAmB;CAC5C;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,YAAY,WAAW;IACvC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,qCAAqC;IAC3E,MAAM,CAAC,QAAQ,CAAC,kBAAkB,wBAAwB;CAC3D;AAED,eAAO,MAAM,WAAW,oCAAoC,CAAC;AAE7D,qBAAa,KAAK;IAChB,MAAM,CAAC,QAAQ,CAAC,8BAA8B,EAAE,MAAM,CAA0B;IAChF,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE,MAAM,CAA2B;IAC9E,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE,MAAM,CAA2B;IAC9E,MAAM,CAAC,QAAQ,CAAC,8BAA8B,EAAE,MAAM,CAA8B;IACpF,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAqB;CAC/D;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,aAAa,0CAA0C;IACvE,MAAM,CAAC,QAAQ,CAAC,GAAG,0CAA0C;CAC9D;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,GAAG,mCAAmC;IACtD,MAAM,CAAC,QAAQ,CAAC,eAAe,kCAAkC;IACjE,MAAM,CAAC,QAAQ,CAAC,UAAU,6BAA6B;IACvD,MAAM,CAAC,QAAQ,CAAC,GAAG,qBAAqB;IACxC,MAAM,CAAC,QAAQ,CAAC,UAAU,6BAA6B;IACvD,MAAM,CAAC,QAAQ,CAAC,QAAQ,2BAA2B;IACnD,MAAM,CAAC,QAAQ,CAAC,QAAQ,0BAA0B;IAClD,MAAM,CAAC,QAAQ,CAAC,QAAQ,0BAA0B;CACnD;AACD,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,mBAAmB;CAC5C;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,qBAAqB,sCAAsC;IAC3E,MAAM,CAAC,QAAQ,CAAC,KAAK,mBAAmB;IACxC,MAAM,CAAC,QAAQ,CAAC,cAAc,6BAA6B;CAC5D"}
|
|
@@ -39,9 +39,7 @@ PluginDisplayName.Solution = "Teams Toolkit";
|
|
|
39
39
|
class FeatureFlagName {
|
|
40
40
|
}
|
|
41
41
|
exports.FeatureFlagName = FeatureFlagName;
|
|
42
|
-
FeatureFlagName.MultiEnv = "TEAMSFX_MULTI_ENV";
|
|
43
|
-
FeatureFlagName.ArmSupport = "TEAMSFX_ARM_SUPPORT";
|
|
44
42
|
FeatureFlagName.BicepEnvCheckerEnable = "TEAMSFX_BICEP_ENV_CHECKER_ENABLE";
|
|
45
|
-
FeatureFlagName.RemoteCollaboration = "TEAMSFX_REMOTE_COL";
|
|
46
43
|
FeatureFlagName.APIV2 = "TEAMSFX_APIV2";
|
|
44
|
+
FeatureFlagName.InsiderPreview = "TEAMSFX_INSIDER_PREVIEW";
|
|
47
45
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";;;AAAA,MAAa,cAAc;;AAA3B,wCAIC;AAHiB,2BAAY,GAAG,OAAO,CAAC;AACvB,qCAAsB,GAAG,iCAAiC,CAAC;AAC3D,iCAAkB,GAAG,oBAAoB,CAAC;AAG/C,QAAA,WAAW,GAAG,iCAAiC,CAAC;AAE7D,MAAa,KAAK;;AAAlB,sBAMC;AALiB,oCAA8B,GAAW,sBAAsB,CAAC;AAChE,iCAA2B,GAAW,uBAAuB,CAAC;AAC9D,iCAA2B,GAAW,uBAAuB,CAAC;AAC9D,oCAA8B,GAAW,0BAA0B,CAAC;AACpE,uBAAiB,GAAW,iBAAiB,CAAC;AAGhE,MAAa,aAAa;;AAA1B,sCAGC;AAFiB,2BAAa,GAAG,sCAAsC,CAAC;AACvD,iBAAG,GAAG,sCAAsC,CAAC;AAG/D,MAAa,eAAe;;AAA5B,0CASC;AARiB,mBAAG,GAAG,+BAA+B,CAAC;AACtC,+BAAe,GAAG,8BAA8B,CAAC;AACjD,0BAAU,GAAG,yBAAyB,CAAC;AACvC,mBAAG,GAAG,iBAAiB,CAAC;AACxB,0BAAU,GAAG,yBAAyB,CAAC;AACvC,wBAAQ,GAAG,uBAAuB,CAAC;AACnC,wBAAQ,GAAG,sBAAsB,CAAC;AAClC,wBAAQ,GAAG,sBAAsB,CAAC;AAEpD,MAAa,iBAAiB;;AAA9B,8CAEC;AADiB,0BAAQ,GAAG,eAAe,CAAC;AAG7C,MAAa,eAAe;;AAA5B,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";;;AAAA,MAAa,cAAc;;AAA3B,wCAIC;AAHiB,2BAAY,GAAG,OAAO,CAAC;AACvB,qCAAsB,GAAG,iCAAiC,CAAC;AAC3D,iCAAkB,GAAG,oBAAoB,CAAC;AAG/C,QAAA,WAAW,GAAG,iCAAiC,CAAC;AAE7D,MAAa,KAAK;;AAAlB,sBAMC;AALiB,oCAA8B,GAAW,sBAAsB,CAAC;AAChE,iCAA2B,GAAW,uBAAuB,CAAC;AAC9D,iCAA2B,GAAW,uBAAuB,CAAC;AAC9D,oCAA8B,GAAW,0BAA0B,CAAC;AACpE,uBAAiB,GAAW,iBAAiB,CAAC;AAGhE,MAAa,aAAa;;AAA1B,sCAGC;AAFiB,2BAAa,GAAG,sCAAsC,CAAC;AACvD,iBAAG,GAAG,sCAAsC,CAAC;AAG/D,MAAa,eAAe;;AAA5B,0CASC;AARiB,mBAAG,GAAG,+BAA+B,CAAC;AACtC,+BAAe,GAAG,8BAA8B,CAAC;AACjD,0BAAU,GAAG,yBAAyB,CAAC;AACvC,mBAAG,GAAG,iBAAiB,CAAC;AACxB,0BAAU,GAAG,yBAAyB,CAAC;AACvC,wBAAQ,GAAG,uBAAuB,CAAC;AACnC,wBAAQ,GAAG,sBAAsB,CAAC;AAClC,wBAAQ,GAAG,sBAAsB,CAAC;AAEpD,MAAa,iBAAiB;;AAA9B,8CAEC;AADiB,0BAAQ,GAAG,eAAe,CAAC;AAG7C,MAAa,eAAe;;AAA5B,0CAIC;AAHiB,qCAAqB,GAAG,kCAAkC,CAAC;AAC3D,qBAAK,GAAG,eAAe,CAAC;AACxB,8BAAc,GAAG,yBAAyB,CAAC"}
|
|
@@ -40,4 +40,9 @@ export declare const LocalSettingsBotKeys: Readonly<{
|
|
|
40
40
|
BotDomain: string;
|
|
41
41
|
BotEndpoint: string;
|
|
42
42
|
}>;
|
|
43
|
+
export declare const LocalSettingsEncryptKeys: Readonly<{
|
|
44
|
+
ClientSecret: string;
|
|
45
|
+
SimpleAuthEnvironmentVariableParams: string;
|
|
46
|
+
BotPassword: string;
|
|
47
|
+
}>;
|
|
43
48
|
//# sourceMappingURL=localSettingsConstants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsConstants.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,yBAAyB;;;EAGpC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;EAWhC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;EAQpC,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;;;;EAOnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;EAQ/B,CAAC"}
|
|
1
|
+
{"version":3,"file":"localSettingsConstants.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,yBAAyB;;;EAGpC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;EAWhC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;EAQpC,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;;;;EAOnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;EAQ/B,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;EAInC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = void 0;
|
|
5
|
+
exports.LocalSettingsEncryptKeys = exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = void 0;
|
|
6
6
|
exports.LocalSettingsTeamsAppKeys = Object.freeze({
|
|
7
7
|
TenantId: "tenantId",
|
|
8
8
|
TeamsAppId: "teamsAppId",
|
|
@@ -45,4 +45,9 @@ exports.LocalSettingsBotKeys = Object.freeze({
|
|
|
45
45
|
BotDomain: "botDomain",
|
|
46
46
|
BotEndpoint: "botEndpoint",
|
|
47
47
|
});
|
|
48
|
+
exports.LocalSettingsEncryptKeys = Object.freeze({
|
|
49
|
+
ClientSecret: "clientSecret",
|
|
50
|
+
SimpleAuthEnvironmentVariableParams: "SimpleAuthEnvironmentVariableParams",
|
|
51
|
+
BotPassword: "botPassword",
|
|
52
|
+
});
|
|
48
53
|
//# sourceMappingURL=localSettingsConstants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsConstants.js","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEA,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC;IACjD,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,cAAc;IAC5B,QAAQ,EAAE,UAAU;IACpB,uBAAuB,EAAE,yBAAyB;IAClD,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,iBAAiB,EAAE,mBAAmB;IACtC,kBAAkB,EAAE,oBAAoB;IACxC,mCAAmC,EAAE,qCAAqC;IAC1E,yBAAyB,EAAE,qBAAqB;CACjD,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;IAC1B,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,gBAAgB,EAAE,kBAAkB;IACpC,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,eAAe,EAAE,iBAAiB;IAClC,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,SAAS,EAAE,WAAW;IACtB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;IAC1B,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"localSettingsConstants.js","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEA,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC;IACjD,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,cAAc;IAC5B,QAAQ,EAAE,UAAU;IACpB,uBAAuB,EAAE,yBAAyB;IAClD,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,iBAAiB,EAAE,mBAAmB;IACtC,kBAAkB,EAAE,oBAAoB;IACxC,mCAAmC,EAAE,qCAAqC;IAC1E,yBAAyB,EAAE,qBAAqB;CACjD,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;IAC1B,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,gBAAgB,EAAE,kBAAkB;IACpC,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,eAAe,EAAE,iBAAiB;IAClC,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,SAAS,EAAE,WAAW;IACtB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;IAC1B,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,YAAY,EAAE,cAAc;IAC5B,mCAAmC,EAAE,qCAAqC;IAC1E,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
|
-
import { ConfigMap, Json, LocalSettings } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { ConfigMap, CryptoProvider, Json, LocalSettings } from "@microsoft/teamsfx-api";
|
|
2
2
|
export declare const localSettingsFileName = "localSettings.json";
|
|
3
3
|
export declare class LocalSettingsProvider {
|
|
4
4
|
readonly localSettingsFilePath: string;
|
|
5
5
|
constructor(workspaceFolder: string);
|
|
6
|
-
init(includeFrontend: boolean, includeBackend: boolean,
|
|
6
|
+
init(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean): LocalSettings;
|
|
7
7
|
initV2(includeFrontend: boolean, includeBackend: boolean, includeBot: boolean): Json;
|
|
8
8
|
incrementalInit(localSettings: LocalSettings, addBackaned: boolean, addBot: boolean): LocalSettings;
|
|
9
|
-
load(): Promise<LocalSettings | undefined>;
|
|
10
|
-
loadV2(): Promise<Json | undefined>;
|
|
11
|
-
|
|
9
|
+
load(cryptoProvider?: CryptoProvider): Promise<LocalSettings | undefined>;
|
|
10
|
+
loadV2(cryptoProvider?: CryptoProvider): Promise<Json | undefined>;
|
|
11
|
+
private decryptLocalSettings;
|
|
12
|
+
save(localSettings: LocalSettings, cryptoProvider?: CryptoProvider): Promise<void>;
|
|
13
|
+
saveJson(localSettingsJson: Json, cryptoProvider?: CryptoProvider): Promise<Json>;
|
|
14
|
+
private convertToLocalSettings;
|
|
15
|
+
private convertToLocalSettingsJson;
|
|
12
16
|
initSimpleAuth(): ConfigMap;
|
|
13
17
|
initFrontend(): ConfigMap;
|
|
14
18
|
initBackend(): ConfigMap;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsProvider.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,
|
|
1
|
+
{"version":3,"file":"localSettingsProvider.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,IAAI,EACJ,aAAa,EACd,MAAM,wBAAwB,CAAC;AAWhC,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAG1D,qBAAa,qBAAqB;IAChC,SAAgB,qBAAqB,EAAE,MAAM,CAAC;gBAClC,eAAe,EAAE,MAAM;IAM5B,IAAI,CACT,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,GACpC,aAAa;IA8BT,MAAM,CAAC,eAAe,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,IAAI;IA2BpF,eAAe,CACpB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,OAAO,GACd,aAAa;IAYH,IAAI,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAoBzE,MAAM,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAc/E,OAAO,CAAC,oBAAoB;IA6Cf,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClF,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,0BAA0B;IAmBlC,cAAc,IAAI,SAAS;IAW3B,YAAY,IAAI,SAAS;IAazB,WAAW,IAAI,SAAS;IAUxB,OAAO,IAAI,SAAS;CAarB"}
|
|
@@ -9,13 +9,14 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
9
9
|
const localSettingsConstants_1 = require("./localSettingsConstants");
|
|
10
10
|
const tools_1 = require("./tools");
|
|
11
11
|
exports.localSettingsFileName = "localSettings.json";
|
|
12
|
+
const crypto = "crypto";
|
|
12
13
|
class LocalSettingsProvider {
|
|
13
14
|
constructor(workspaceFolder) {
|
|
14
15
|
this.localSettingsFilePath = tools_1.isMultiEnvEnabled()
|
|
15
16
|
? `${workspaceFolder}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/${exports.localSettingsFileName}`
|
|
16
17
|
: `${workspaceFolder}/.${teamsfx_api_1.ConfigFolderName}/${exports.localSettingsFileName}`;
|
|
17
18
|
}
|
|
18
|
-
init(includeFrontend, includeBackend,
|
|
19
|
+
init(includeFrontend, includeBackend, includeBotOrMessageExtension) {
|
|
19
20
|
// initialize Teams app related config for local debug.
|
|
20
21
|
const teamsAppLocalConfig = new teamsfx_api_1.ConfigMap();
|
|
21
22
|
teamsAppLocalConfig.set(localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId, "");
|
|
@@ -33,7 +34,7 @@ class LocalSettingsProvider {
|
|
|
33
34
|
localSettings.backend = this.initBackend();
|
|
34
35
|
}
|
|
35
36
|
// initialize bot local settings.
|
|
36
|
-
if (
|
|
37
|
+
if (includeBotOrMessageExtension) {
|
|
37
38
|
localSettings.bot = this.initBot();
|
|
38
39
|
}
|
|
39
40
|
return localSettings;
|
|
@@ -69,9 +70,9 @@ class LocalSettingsProvider {
|
|
|
69
70
|
}
|
|
70
71
|
return localSettings;
|
|
71
72
|
}
|
|
72
|
-
async load() {
|
|
73
|
+
async load(cryptoProvider) {
|
|
73
74
|
if (await fs.pathExists(this.localSettingsFilePath)) {
|
|
74
|
-
const localSettingsJson = await fs.
|
|
75
|
+
const localSettingsJson = await fs.readJson(this.localSettingsFilePath);
|
|
75
76
|
const localSettings = {
|
|
76
77
|
teamsApp: teamsfx_api_1.ConfigMap.fromJSON(localSettingsJson.teamsApp),
|
|
77
78
|
auth: teamsfx_api_1.ConfigMap.fromJSON(localSettingsJson.auth),
|
|
@@ -79,25 +80,116 @@ class LocalSettingsProvider {
|
|
|
79
80
|
backend: teamsfx_api_1.ConfigMap.fromJSON(localSettingsJson.backend),
|
|
80
81
|
bot: teamsfx_api_1.ConfigMap.fromJSON(localSettingsJson.bot),
|
|
81
82
|
};
|
|
83
|
+
if (localSettings && cryptoProvider) {
|
|
84
|
+
this.decryptLocalSettings(localSettings, cryptoProvider);
|
|
85
|
+
}
|
|
82
86
|
return localSettings;
|
|
83
87
|
}
|
|
84
88
|
else {
|
|
85
89
|
return undefined;
|
|
86
90
|
}
|
|
87
91
|
}
|
|
88
|
-
async loadV2() {
|
|
92
|
+
async loadV2(cryptoProvider) {
|
|
89
93
|
if (await fs.pathExists(this.localSettingsFilePath)) {
|
|
90
|
-
const localSettingsJson = await fs.
|
|
94
|
+
const localSettingsJson = await fs.readJson(this.localSettingsFilePath);
|
|
95
|
+
if (localSettingsJson && cryptoProvider) {
|
|
96
|
+
const localSettings = this.convertToLocalSettings(localSettingsJson);
|
|
97
|
+
this.decryptLocalSettings(localSettings, cryptoProvider);
|
|
98
|
+
return this.convertToLocalSettingsJson(localSettings);
|
|
99
|
+
}
|
|
91
100
|
return localSettingsJson;
|
|
92
101
|
}
|
|
93
102
|
else {
|
|
94
103
|
return undefined;
|
|
95
104
|
}
|
|
96
105
|
}
|
|
97
|
-
|
|
106
|
+
decryptLocalSettings(localSettings, cryptoProvider) {
|
|
107
|
+
if (localSettings.auth) {
|
|
108
|
+
if (localSettings.auth.get(localSettingsConstants_1.LocalSettingsEncryptKeys.ClientSecret) &&
|
|
109
|
+
localSettings.auth.get(localSettingsConstants_1.LocalSettingsEncryptKeys.ClientSecret).startsWith(crypto)) {
|
|
110
|
+
const decryptedResult = cryptoProvider.decrypt(localSettings.auth.get(localSettingsConstants_1.LocalSettingsEncryptKeys.ClientSecret));
|
|
111
|
+
if (decryptedResult.isOk()) {
|
|
112
|
+
localSettings.auth.set(localSettingsConstants_1.LocalSettingsEncryptKeys.ClientSecret, decryptedResult.value);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
if (localSettings.auth.get(localSettingsConstants_1.LocalSettingsEncryptKeys.SimpleAuthEnvironmentVariableParams) &&
|
|
116
|
+
localSettings.auth
|
|
117
|
+
.get(localSettingsConstants_1.LocalSettingsEncryptKeys.SimpleAuthEnvironmentVariableParams)
|
|
118
|
+
.startsWith(crypto)) {
|
|
119
|
+
const decryptedResult = cryptoProvider.decrypt(localSettings.auth.get(localSettingsConstants_1.LocalSettingsEncryptKeys.SimpleAuthEnvironmentVariableParams));
|
|
120
|
+
if (decryptedResult.isOk()) {
|
|
121
|
+
localSettings.auth.set(localSettingsConstants_1.LocalSettingsEncryptKeys.SimpleAuthEnvironmentVariableParams, decryptedResult.value);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
if (localSettings.bot) {
|
|
126
|
+
if (localSettings.bot.get(localSettingsConstants_1.LocalSettingsEncryptKeys.BotPassword) &&
|
|
127
|
+
localSettings.bot.get(localSettingsConstants_1.LocalSettingsEncryptKeys.BotPassword).startsWith(crypto)) {
|
|
128
|
+
const decryptedResult = cryptoProvider.decrypt(localSettings.bot.get(localSettingsConstants_1.LocalSettingsEncryptKeys.BotPassword));
|
|
129
|
+
if (decryptedResult.isOk()) {
|
|
130
|
+
localSettings.bot.set(localSettingsConstants_1.LocalSettingsEncryptKeys.BotPassword, decryptedResult.value);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
async save(localSettings, cryptoProvider) {
|
|
98
136
|
await fs.createFile(this.localSettingsFilePath);
|
|
137
|
+
if (cryptoProvider) {
|
|
138
|
+
if (localSettings.auth) {
|
|
139
|
+
if (localSettings.auth.get(localSettingsConstants_1.LocalSettingsEncryptKeys.ClientSecret)) {
|
|
140
|
+
const encryptedSecret = cryptoProvider.encrypt(localSettings.auth.get(localSettingsConstants_1.LocalSettingsEncryptKeys.ClientSecret));
|
|
141
|
+
if (encryptedSecret.isOk()) {
|
|
142
|
+
localSettings.auth.set(localSettingsConstants_1.LocalSettingsEncryptKeys.ClientSecret, encryptedSecret.value);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
if (localSettings.auth.get(localSettingsConstants_1.LocalSettingsEncryptKeys.SimpleAuthEnvironmentVariableParams)) {
|
|
146
|
+
const encryptedSecret = cryptoProvider.encrypt(localSettings.auth.get(localSettingsConstants_1.LocalSettingsEncryptKeys.SimpleAuthEnvironmentVariableParams));
|
|
147
|
+
if (encryptedSecret.isOk()) {
|
|
148
|
+
localSettings.auth.set(localSettingsConstants_1.LocalSettingsEncryptKeys.SimpleAuthEnvironmentVariableParams, encryptedSecret.value);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
if (localSettings.bot && localSettings.bot.get(localSettingsConstants_1.LocalSettingsEncryptKeys.BotPassword)) {
|
|
153
|
+
const encryptedSecret = cryptoProvider.encrypt(localSettings.bot.get(localSettingsConstants_1.LocalSettingsEncryptKeys.BotPassword));
|
|
154
|
+
if (encryptedSecret.isOk()) {
|
|
155
|
+
localSettings.bot.set(localSettingsConstants_1.LocalSettingsEncryptKeys.BotPassword, encryptedSecret.value);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
}
|
|
99
159
|
await fs.writeFile(this.localSettingsFilePath, JSON.stringify(localSettings, null, 4));
|
|
100
160
|
}
|
|
161
|
+
async saveJson(localSettingsJson, cryptoProvider) {
|
|
162
|
+
const localSettings = this.convertToLocalSettings(localSettingsJson);
|
|
163
|
+
await this.save(localSettings);
|
|
164
|
+
return this.convertToLocalSettingsJson(localSettings);
|
|
165
|
+
}
|
|
166
|
+
convertToLocalSettings(localSettingsJson) {
|
|
167
|
+
const localSettings = {
|
|
168
|
+
teamsApp: teamsfx_api_1.ConfigMap.fromJSON(localSettingsJson.teamsApp),
|
|
169
|
+
auth: teamsfx_api_1.ConfigMap.fromJSON(localSettingsJson.auth),
|
|
170
|
+
frontend: teamsfx_api_1.ConfigMap.fromJSON(localSettingsJson.frontend),
|
|
171
|
+
backend: teamsfx_api_1.ConfigMap.fromJSON(localSettingsJson.backend),
|
|
172
|
+
bot: teamsfx_api_1.ConfigMap.fromJSON(localSettingsJson.bot),
|
|
173
|
+
};
|
|
174
|
+
return localSettings;
|
|
175
|
+
}
|
|
176
|
+
convertToLocalSettingsJson(localSettings) {
|
|
177
|
+
var _a, _b;
|
|
178
|
+
const localSettingsJson = {
|
|
179
|
+
teamsApp: (_a = localSettings.teamsApp) === null || _a === void 0 ? void 0 : _a.toJSON(),
|
|
180
|
+
auth: (_b = localSettings.auth) === null || _b === void 0 ? void 0 : _b.toJSON(),
|
|
181
|
+
};
|
|
182
|
+
if (localSettings.frontend) {
|
|
183
|
+
localSettingsJson["frontend"] = localSettings.frontend.toJSON();
|
|
184
|
+
}
|
|
185
|
+
if (localSettings.backend) {
|
|
186
|
+
localSettingsJson["backend"] = localSettings.backend.toJSON();
|
|
187
|
+
}
|
|
188
|
+
if (localSettings.bot) {
|
|
189
|
+
localSettingsJson["bot"] = localSettings.bot.toJSON();
|
|
190
|
+
}
|
|
191
|
+
return localSettingsJson;
|
|
192
|
+
}
|
|
101
193
|
initSimpleAuth() {
|
|
102
194
|
// simple auth is only required by frontend
|
|
103
195
|
const authLocalConfig = new teamsfx_api_1.ConfigMap();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsProvider.js","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,qDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"localSettingsProvider.js","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,qDAA+B;AAC/B,wDAOgC;AAChC,qEAOkC;AAClC,mCAA4C;AAE/B,QAAA,qBAAqB,GAAG,oBAAoB,CAAC;AAC1D,MAAM,MAAM,GAAG,QAAQ,CAAC;AAExB,MAAa,qBAAqB;IAEhC,YAAY,eAAuB;QACjC,IAAI,CAAC,qBAAqB,GAAG,yBAAiB,EAAE;YAC9C,CAAC,CAAC,GAAG,eAAe,KAAK,8BAAgB,IAAI,oCAAsB,IAAI,6BAAqB,EAAE;YAC9F,CAAC,CAAC,GAAG,eAAe,KAAK,8BAAgB,IAAI,6BAAqB,EAAE,CAAC;IACzE,CAAC;IAEM,IAAI,CACT,eAAwB,EACxB,cAAuB,EACvB,4BAAqC;QAErC,uDAAuD;QACvD,MAAM,mBAAmB,GAAG,IAAI,uBAAS,EAAE,CAAC;QAC5C,mBAAmB,CAAC,GAAG,CAAC,kDAAyB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAChE,mBAAmB,CAAC,GAAG,CAAC,kDAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAElE,MAAM,aAAa,GAAkB;YACnC,QAAQ,EAAE,mBAAmB;SAC9B,CAAC;QAEF,aAAa,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAE3C,sDAAsD;QACtD,IAAI,eAAe,EAAE;YACnB,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;SAC9C;QAED,qCAAqC;QACrC,IAAI,cAAc,EAAE;YAClB,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;SAC5C;QAED,iCAAiC;QACjC,IAAI,4BAA4B,EAAE;YAChC,aAAa,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;SACpC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,eAAwB,EAAE,cAAuB,EAAE,UAAmB;QAClF,MAAM,aAAa,GAAS;YAC1B,QAAQ,EAAE;gBACR,CAAC,kDAAyB,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACxC,CAAC,kDAAyB,CAAC,UAAU,CAAC,EAAE,EAAE;aAC3C;SACF,CAAC;QAEF,sDAAsD;QACtD,IAAI,eAAe,EAAE;YACnB,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,CAAC;YACtD,aAAa,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,CAAC;SACrD;QAED,qCAAqC;QACrC,IAAI,cAAc,EAAE;YAClB,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;SACrD;QAED,iCAAiC;QACjC,IAAI,UAAU,EAAE;YACd,aAAa,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC;SAC7C;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,eAAe,CACpB,aAA4B,EAC5B,WAAoB,EACpB,MAAe;QAEf,IAAI,CAAC,aAAa,CAAC,OAAO,IAAI,WAAW,EAAE;YACzC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;SAC5C;QAED,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,MAAM,EAAE;YAChC,aAAa,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;SACpC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,cAA+B;QAC/C,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE;YACnD,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACxE,MAAM,aAAa,GAAkB;gBACnC,QAAQ,EAAE,uBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAE;gBACzD,IAAI,EAAE,uBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAChD,QAAQ,EAAE,uBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC;gBACxD,OAAO,EAAE,uBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC;gBACtD,GAAG,EAAE,uBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC;aAC/C,CAAC;YAEF,IAAI,aAAa,IAAI,cAAc,EAAE;gBACnC,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;aAC1D;YACD,OAAO,aAAa,CAAC;SACtB;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,cAA+B;QACjD,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE;YACnD,MAAM,iBAAiB,GAAS,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAC9E,IAAI,iBAAiB,IAAI,cAAc,EAAE;gBACvC,MAAM,aAAa,GAAkB,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;gBACpF,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;gBACzD,OAAO,IAAI,CAAC,0BAA0B,CAAC,aAAa,CAAC,CAAC;aACvD;YACD,OAAO,iBAAiB,CAAC;SAC1B;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEO,oBAAoB,CAAC,aAA4B,EAAE,cAA8B;QACvF,IAAI,aAAa,CAAC,IAAI,EAAE;YACtB,IACE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,YAAY,CAAC;gBAC7D,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAChF;gBACA,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAC5C,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,YAAY,CAAC,CAC9D,CAAC;gBACF,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE;oBAC1B,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,YAAY,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;iBACtF;aACF;YACD,IACE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,mCAAmC,CAAC;gBACpF,aAAa,CAAC,IAAI;qBACf,GAAG,CAAC,iDAAwB,CAAC,mCAAmC,CAAC;qBACjE,UAAU,CAAC,MAAM,CAAC,EACrB;gBACA,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAC5C,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,mCAAmC,CAAC,CACrF,CAAC;gBACF,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE;oBAC1B,aAAa,CAAC,IAAI,CAAC,GAAG,CACpB,iDAAwB,CAAC,mCAAmC,EAC5D,eAAe,CAAC,KAAK,CACtB,CAAC;iBACH;aACF;SACF;QACD,IAAI,aAAa,CAAC,GAAG,EAAE;YACrB,IACE,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,iDAAwB,CAAC,WAAW,CAAC;gBAC3D,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,iDAAwB,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAC9E;gBACA,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAC5C,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,iDAAwB,CAAC,WAAW,CAAC,CAC5D,CAAC;gBACF,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE;oBAC1B,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,iDAAwB,CAAC,WAAW,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;iBACpF;aACF;SACF;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,aAA4B,EAAE,cAA+B;QAC7E,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAChD,IAAI,cAAc,EAAE;YAClB,IAAI,aAAa,CAAC,IAAI,EAAE;gBACtB,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,YAAY,CAAC,EAAE;oBACjE,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAC5C,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,YAAY,CAAC,CAC9D,CAAC;oBACF,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE;wBAC1B,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,YAAY,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;qBACtF;iBACF;gBACD,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,mCAAmC,CAAC,EAAE;oBACxF,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAC5C,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAwB,CAAC,mCAAmC,CAAC,CACrF,CAAC;oBACF,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE;wBAC1B,aAAa,CAAC,IAAI,CAAC,GAAG,CACpB,iDAAwB,CAAC,mCAAmC,EAC5D,eAAe,CAAC,KAAK,CACtB,CAAC;qBACH;iBACF;aACF;YACD,IAAI,aAAa,CAAC,GAAG,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,iDAAwB,CAAC,WAAW,CAAC,EAAE;gBACpF,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAC5C,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,iDAAwB,CAAC,WAAW,CAAC,CAC5D,CAAC;gBACF,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE;oBAC1B,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,iDAAwB,CAAC,WAAW,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;iBACpF;aACF;SACF;QACD,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACzF,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,iBAAuB,EAAE,cAA+B;QAC5E,MAAM,aAAa,GAAG,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;QACrE,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,0BAA0B,CAAC,aAAa,CAAC,CAAC;IACxD,CAAC;IAEO,sBAAsB,CAAC,iBAAuB;QACpD,MAAM,aAAa,GAAkB;YACnC,QAAQ,EAAE,uBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAE;YACzD,IAAI,EAAE,uBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC;YAChD,QAAQ,EAAE,uBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC;YACxD,OAAO,EAAE,uBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC;YACtD,GAAG,EAAE,uBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC;SAC/C,CAAC;QACF,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,0BAA0B,CAAC,aAA4B;;QAC7D,MAAM,iBAAiB,GAAS;YAC9B,QAAQ,EAAE,MAAA,aAAa,CAAC,QAAQ,0CAAE,MAAM,EAAE;YAC1C,IAAI,EAAE,MAAA,aAAa,CAAC,IAAI,0CAAE,MAAM,EAAE;SACnC,CAAC;QAEF,IAAI,aAAa,CAAC,QAAQ,EAAE;YAC1B,iBAAiB,CAAC,UAAU,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;SACjE;QACD,IAAI,aAAa,CAAC,OAAO,EAAE;YACzB,iBAAiB,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;SAC/D;QACD,IAAI,aAAa,CAAC,GAAG,EAAE;YACrB,iBAAiB,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;SACvD;QAED,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,cAAc;QACZ,2CAA2C;QAC3C,MAAM,eAAe,GAAG,IAAI,uBAAS,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,8CAAqB,CAAC,CAAC;QAClD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;SAC9B;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,YAAY;QACV,MAAM,mBAAmB,GAAG,IAAI,uBAAS,EAAE,CAAC;QAC5C,mBAAmB,CAAC,GAAG,CAAC,kDAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnE,mBAAmB,CAAC,GAAG,CAAC,kDAAyB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC/D,mBAAmB,CAAC,GAAG,CAAC,kDAAyB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACtE,mBAAmB,CAAC,GAAG,CAAC,kDAAyB,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACnE,mBAAmB,CAAC,GAAG,CAAC,kDAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAClE,mBAAmB,CAAC,GAAG,CAAC,kDAAyB,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACjE,mBAAmB,CAAC,GAAG,CAAC,kDAAyB,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAEnE,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,WAAW;QACT,MAAM,kBAAkB,GAAG,IAAI,uBAAS,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,iDAAwB,CAAC,CAAC;QACrD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;SACjC;QAED,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,OAAO;QACL,MAAM,cAAc,GAAG,IAAI,uBAAS,EAAE,CAAC;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,6CAAoB,CAAC,CAAC;QACjD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,GAAG,KAAK,6CAAoB,CAAC,SAAS,EAAE;gBAC1C,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aAChC;iBAAM;gBACL,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;aAC7B;SACF;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;CACF;AA3RD,sDA2RC"}
|
|
@@ -9,7 +9,10 @@ export declare enum TelemetryProperty {
|
|
|
9
9
|
ErrorMessage = "error-message",
|
|
10
10
|
SampleAppName = "sample-app-name",
|
|
11
11
|
ProjectId = "project-id",
|
|
12
|
-
CorrelationId = "correlation-id"
|
|
12
|
+
CorrelationId = "correlation-id",
|
|
13
|
+
Env = "env",
|
|
14
|
+
CustomizeResourceGroupType = "customize-resource-group-type",
|
|
15
|
+
EnvConfig = "env-config"
|
|
13
16
|
}
|
|
14
17
|
export declare enum TelemetryEvent {
|
|
15
18
|
DownloadSampleStart = "download-sample-start",
|
|
@@ -17,7 +20,10 @@ export declare enum TelemetryEvent {
|
|
|
17
20
|
ProjectUpgrade = "project-upgrade",
|
|
18
21
|
ProjectUpgradeStart = "project-upgrade-start",
|
|
19
22
|
ReadJson = "read-json",
|
|
20
|
-
DecryptUserdata = "decrypt-userdata"
|
|
23
|
+
DecryptUserdata = "decrypt-userdata",
|
|
24
|
+
CheckResourceGroupStart = "check-resource-group-start",
|
|
25
|
+
CheckResourceGroup = "check-resource-group",
|
|
26
|
+
EnvConfig = "env-config"
|
|
21
27
|
}
|
|
22
28
|
export declare enum TelemetrySuccess {
|
|
23
29
|
Yes = "yes",
|
|
@@ -34,6 +40,15 @@ export declare enum Component {
|
|
|
34
40
|
core = "core",
|
|
35
41
|
solution = "solution"
|
|
36
42
|
}
|
|
43
|
+
export declare enum CustomizeResourceGroupType {
|
|
44
|
+
CommandLine = "command-line",
|
|
45
|
+
EnvConfig = "env-config",
|
|
46
|
+
EnvProfile = "env-profile",
|
|
47
|
+
InteractiveCreateDefault = "interactive-create-default",
|
|
48
|
+
InteractiveCreateCustomized = "interactive-create-customized",
|
|
49
|
+
InteractiveUseExisting = "interactive-use-existing",
|
|
50
|
+
FallbackDefault = "fallback-default"
|
|
51
|
+
}
|
|
37
52
|
export declare function sendTelemetryEvent(component: string, eventName: string, properties?: {
|
|
38
53
|
[p: string]: string;
|
|
39
54
|
}, measurements?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAgC,MAAM,wBAAwB,CAAC;AAG/E,oBAAY,iBAAiB;IAC3B,WAAW,iBAAiB;IAC5B,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,aAAa,oBAAoB;IACjC,SAAS,eAAe;IACxB,aAAa,mBAAmB;
|
|
1
|
+
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAgC,MAAM,wBAAwB,CAAC;AAG/E,oBAAY,iBAAiB;IAC3B,WAAW,iBAAiB;IAC5B,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,aAAa,oBAAoB;IACjC,SAAS,eAAe;IACxB,aAAa,mBAAmB;IAChC,GAAG,QAAQ;IACX,0BAA0B,kCAAkC;IAC5D,SAAS,eAAe;CACzB;AAED,oBAAY,cAAc;IACxB,mBAAmB,0BAA0B;IAC7C,cAAc,oBAAoB;IAClC,cAAc,oBAAoB;IAClC,mBAAmB,0BAA0B;IAC7C,QAAQ,cAAc;IACtB,eAAe,qBAAqB;IACpC,uBAAuB,+BAA+B;IACtD,kBAAkB,yBAAyB;IAC3C,SAAS,eAAe;CACzB;AAED,oBAAY,gBAAgB;IAC1B,GAAG,QAAQ;IACX,EAAE,OAAO;CACV;AAED,oBAAY,kBAAkB;IAC5B,SAAS,SAAS;IAClB,WAAW,WAAW;CACvB;AAED,oBAAY,SAAS;IACnB,GAAG,cAAc;IACjB,GAAG,QAAQ;IACX,EAAE,OAAO;IACT,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,oBAAY,0BAA0B;IACpC,WAAW,iBAAiB;IAC5B,SAAS,eAAe;IACxB,UAAU,gBAAgB;IAC1B,wBAAwB,+BAA+B;IACvD,2BAA2B,kCAAkC;IAC7D,sBAAsB,6BAA6B;IACnD,eAAe,qBAAqB;CACrC;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACpC,YAAY,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACrC,IAAI,CAMN;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACnC,IAAI,CAkBN"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.sendTelemetryErrorEvent = exports.sendTelemetryEvent = exports.Component = exports.TelemetryErrorType = exports.TelemetrySuccess = exports.TelemetryEvent = exports.TelemetryProperty = void 0;
|
|
5
|
+
exports.sendTelemetryErrorEvent = exports.sendTelemetryEvent = exports.CustomizeResourceGroupType = exports.Component = exports.TelemetryErrorType = exports.TelemetrySuccess = exports.TelemetryEvent = exports.TelemetryProperty = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const core_1 = require("../core");
|
|
8
8
|
var TelemetryProperty;
|
|
@@ -17,6 +17,9 @@ var TelemetryProperty;
|
|
|
17
17
|
TelemetryProperty["SampleAppName"] = "sample-app-name";
|
|
18
18
|
TelemetryProperty["ProjectId"] = "project-id";
|
|
19
19
|
TelemetryProperty["CorrelationId"] = "correlation-id";
|
|
20
|
+
TelemetryProperty["Env"] = "env";
|
|
21
|
+
TelemetryProperty["CustomizeResourceGroupType"] = "customize-resource-group-type";
|
|
22
|
+
TelemetryProperty["EnvConfig"] = "env-config";
|
|
20
23
|
})(TelemetryProperty = exports.TelemetryProperty || (exports.TelemetryProperty = {}));
|
|
21
24
|
var TelemetryEvent;
|
|
22
25
|
(function (TelemetryEvent) {
|
|
@@ -26,6 +29,9 @@ var TelemetryEvent;
|
|
|
26
29
|
TelemetryEvent["ProjectUpgradeStart"] = "project-upgrade-start";
|
|
27
30
|
TelemetryEvent["ReadJson"] = "read-json";
|
|
28
31
|
TelemetryEvent["DecryptUserdata"] = "decrypt-userdata";
|
|
32
|
+
TelemetryEvent["CheckResourceGroupStart"] = "check-resource-group-start";
|
|
33
|
+
TelemetryEvent["CheckResourceGroup"] = "check-resource-group";
|
|
34
|
+
TelemetryEvent["EnvConfig"] = "env-config";
|
|
29
35
|
})(TelemetryEvent = exports.TelemetryEvent || (exports.TelemetryEvent = {}));
|
|
30
36
|
var TelemetrySuccess;
|
|
31
37
|
(function (TelemetrySuccess) {
|
|
@@ -45,6 +51,16 @@ var Component;
|
|
|
45
51
|
Component["core"] = "core";
|
|
46
52
|
Component["solution"] = "solution";
|
|
47
53
|
})(Component = exports.Component || (exports.Component = {}));
|
|
54
|
+
var CustomizeResourceGroupType;
|
|
55
|
+
(function (CustomizeResourceGroupType) {
|
|
56
|
+
CustomizeResourceGroupType["CommandLine"] = "command-line";
|
|
57
|
+
CustomizeResourceGroupType["EnvConfig"] = "env-config";
|
|
58
|
+
CustomizeResourceGroupType["EnvProfile"] = "env-profile";
|
|
59
|
+
CustomizeResourceGroupType["InteractiveCreateDefault"] = "interactive-create-default";
|
|
60
|
+
CustomizeResourceGroupType["InteractiveCreateCustomized"] = "interactive-create-customized";
|
|
61
|
+
CustomizeResourceGroupType["InteractiveUseExisting"] = "interactive-use-existing";
|
|
62
|
+
CustomizeResourceGroupType["FallbackDefault"] = "fallback-default";
|
|
63
|
+
})(CustomizeResourceGroupType = exports.CustomizeResourceGroupType || (exports.CustomizeResourceGroupType = {}));
|
|
48
64
|
function sendTelemetryEvent(component, eventName, properties, measurements) {
|
|
49
65
|
if (!properties) {
|
|
50
66
|
properties = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA+E;AAC/E,kCAA4C;AAE5C,IAAY,
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}
|
package/build/common/tools.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export declare function ensureUniqueFolder(folderPath: string): Promise<string>;
|
|
|
15
15
|
* @param {Map} map to convert.
|
|
16
16
|
* @returns {Json} converted Json.
|
|
17
17
|
*/
|
|
18
|
-
export declare function mapToJson(map
|
|
18
|
+
export declare function mapToJson(map?: Map<any, any>): Json;
|
|
19
19
|
/**
|
|
20
20
|
* Convert an `Object` to a Map recursively
|
|
21
21
|
* @param {Json} Json to convert.
|
|
@@ -67,5 +67,35 @@ export declare function getResourceGroupNameFromResourceId(resourceId: string):
|
|
|
67
67
|
export declare function getSubscriptionIdFromResourceId(resourceId: string): string;
|
|
68
68
|
export declare function parseFromResourceId(pattern: RegExp, resourceId: string): string;
|
|
69
69
|
export declare function waitSeconds(second: number): Promise<void>;
|
|
70
|
+
export declare function getUuid(): string;
|
|
70
71
|
export declare function isSPFxProject(projectSettings?: ProjectSettings): boolean;
|
|
72
|
+
export declare function getHashedEnv(envName: string): string;
|
|
73
|
+
/** Redact user content in "obj";
|
|
74
|
+
*
|
|
75
|
+
* DFS "obj" and "jsonSchema" together to redact the following things:
|
|
76
|
+
* - properties that is not defined in jsonSchema
|
|
77
|
+
* - the value of properties that is defined in jsonSchema, but the keys will remain
|
|
78
|
+
*
|
|
79
|
+
* Example:
|
|
80
|
+
* Input:
|
|
81
|
+
* ```
|
|
82
|
+
* obj = {
|
|
83
|
+
* "name": "some name",
|
|
84
|
+
* "user defined property": {
|
|
85
|
+
* "key1": "value1"
|
|
86
|
+
* }
|
|
87
|
+
* }
|
|
88
|
+
* jsonSchema = {
|
|
89
|
+
* "type": "object",
|
|
90
|
+
* "properties": {
|
|
91
|
+
* "name": { "type": "string" }
|
|
92
|
+
* }
|
|
93
|
+
* }
|
|
94
|
+
* ```
|
|
95
|
+
* Output:
|
|
96
|
+
* ```
|
|
97
|
+
* {"name": null}
|
|
98
|
+
* ```
|
|
99
|
+
**/
|
|
100
|
+
export declare function redactObject(obj: unknown, jsonSchema: unknown, maxRecursionDepth?: number): unknown;
|
|
71
101
|
//# sourceMappingURL=tools.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":";AAEA,OAAO,EAEL,oBAAoB,EAEpB,SAAS,EAET,OAAO,EACP,IAAI,EAGJ,MAAM,EAGN,gBAAgB,EAChB,eAAe,EACf,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAChC,OAAO,MAAM,MAAM,SAAS,CAAC;AAE7B,OAAO,EAAQ,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"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"}
|
package/build/common/tools.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isSPFxProject = exports.waitSeconds = exports.parseFromResourceId = exports.getSubscriptionIdFromResourceId = exports.getResourceGroupNameFromResourceId = exports.getSiteNameFromResourceId = exports.getStorageAccountNameFromResourceId = exports.copyFiles = exports.getAppStudioEndpoint = exports.getAppDirectory = exports.compileHandlebarsTemplateString = exports.generateBicepFiles = exports.isRemoteCollaborateEnabled = exports.isBicepEnvCheckerEnabled = exports.isArmSupportEnabled = exports.isMultiEnvEnabled = exports.isFeatureFlagEnabled = exports.askSubscription = exports.isUserCancelError = exports.getStrings = exports.deepCopy = exports.downloadSampleHook = exports.saveFilesRecursively = exports.fetchCodeZip = exports.deserializeDict = exports.serializeDict = exports.mergeSerectData = exports.sperateSecretData = exports.dataNeedEncryption = exports.CryptoDataMatchers = exports.objectToConfigMap = exports.objectToMap = exports.mapToJson = exports.ensureUniqueFolder = exports.npmInstall = exports.Executor = void 0;
|
|
3
|
+
exports.redactObject = exports.getHashedEnv = exports.isSPFxProject = exports.getUuid = exports.waitSeconds = exports.parseFromResourceId = exports.getSubscriptionIdFromResourceId = exports.getResourceGroupNameFromResourceId = exports.getSiteNameFromResourceId = exports.getStorageAccountNameFromResourceId = exports.copyFiles = exports.getAppStudioEndpoint = exports.getAppDirectory = exports.compileHandlebarsTemplateString = exports.generateBicepFiles = exports.isRemoteCollaborateEnabled = exports.isBicepEnvCheckerEnabled = exports.isArmSupportEnabled = exports.isMultiEnvEnabled = exports.isFeatureFlagEnabled = exports.askSubscription = exports.isUserCancelError = exports.getStrings = exports.deepCopy = exports.downloadSampleHook = exports.saveFilesRecursively = exports.fetchCodeZip = exports.deserializeDict = exports.serializeDict = exports.mergeSerectData = exports.sperateSecretData = exports.dataNeedEncryption = exports.CryptoDataMatchers = exports.objectToConfigMap = exports.objectToMap = exports.mapToJson = exports.ensureUniqueFolder = exports.npmInstall = exports.Executor = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
// Copyright (c) Microsoft Corporation.
|
|
6
6
|
// Licensed under the MIT license.
|
|
@@ -15,6 +15,7 @@ const util_1 = require("util");
|
|
|
15
15
|
const uuid = tslib_1.__importStar(require("uuid"));
|
|
16
16
|
const folder_1 = require("../folder");
|
|
17
17
|
const constants_1 = require("./constants");
|
|
18
|
+
const crypto = tslib_1.__importStar(require("crypto"));
|
|
18
19
|
Handlebars.registerHelper("contains", (value, array, options) => {
|
|
19
20
|
array = array instanceof Array ? array : [array];
|
|
20
21
|
return array.indexOf(value) > -1 ? options.fn(this) : "";
|
|
@@ -53,6 +54,8 @@ exports.ensureUniqueFolder = ensureUniqueFolder;
|
|
|
53
54
|
* @returns {Json} converted Json.
|
|
54
55
|
*/
|
|
55
56
|
function mapToJson(map) {
|
|
57
|
+
if (!map)
|
|
58
|
+
return {};
|
|
56
59
|
const out = {};
|
|
57
60
|
for (const entry of map.entries()) {
|
|
58
61
|
if (entry[1] instanceof Map) {
|
|
@@ -366,11 +369,11 @@ function isFeatureFlagEnabled(featureFlagName, defaultValue = false) {
|
|
|
366
369
|
}
|
|
367
370
|
exports.isFeatureFlagEnabled = isFeatureFlagEnabled;
|
|
368
371
|
function isMultiEnvEnabled() {
|
|
369
|
-
return isFeatureFlagEnabled(constants_1.FeatureFlagName.
|
|
372
|
+
return isFeatureFlagEnabled(constants_1.FeatureFlagName.InsiderPreview, false);
|
|
370
373
|
}
|
|
371
374
|
exports.isMultiEnvEnabled = isMultiEnvEnabled;
|
|
372
375
|
function isArmSupportEnabled() {
|
|
373
|
-
return isFeatureFlagEnabled(constants_1.FeatureFlagName.
|
|
376
|
+
return isFeatureFlagEnabled(constants_1.FeatureFlagName.InsiderPreview, false);
|
|
374
377
|
}
|
|
375
378
|
exports.isArmSupportEnabled = isArmSupportEnabled;
|
|
376
379
|
function isBicepEnvCheckerEnabled() {
|
|
@@ -378,7 +381,7 @@ function isBicepEnvCheckerEnabled() {
|
|
|
378
381
|
}
|
|
379
382
|
exports.isBicepEnvCheckerEnabled = isBicepEnvCheckerEnabled;
|
|
380
383
|
function isRemoteCollaborateEnabled() {
|
|
381
|
-
return isFeatureFlagEnabled(constants_1.FeatureFlagName.
|
|
384
|
+
return isFeatureFlagEnabled(constants_1.FeatureFlagName.InsiderPreview, false);
|
|
382
385
|
}
|
|
383
386
|
exports.isRemoteCollaborateEnabled = isRemoteCollaborateEnabled;
|
|
384
387
|
async function generateBicepFiles(templateFilePath, context) {
|
|
@@ -496,6 +499,10 @@ async function waitSeconds(second) {
|
|
|
496
499
|
return new Promise((resolve) => setTimeout(resolve, second * 1000));
|
|
497
500
|
}
|
|
498
501
|
exports.waitSeconds = waitSeconds;
|
|
502
|
+
function getUuid() {
|
|
503
|
+
return uuid.v4();
|
|
504
|
+
}
|
|
505
|
+
exports.getUuid = getUuid;
|
|
499
506
|
function isSPFxProject(projectSettings) {
|
|
500
507
|
const solutionSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings;
|
|
501
508
|
if (solutionSettings) {
|
|
@@ -505,4 +512,69 @@ function isSPFxProject(projectSettings) {
|
|
|
505
512
|
return false;
|
|
506
513
|
}
|
|
507
514
|
exports.isSPFxProject = isSPFxProject;
|
|
515
|
+
function getHashedEnv(envName) {
|
|
516
|
+
return crypto.createHash("sha256").update(envName).digest("hex");
|
|
517
|
+
}
|
|
518
|
+
exports.getHashedEnv = getHashedEnv;
|
|
519
|
+
function isBasicJsonSchema(jsonSchema) {
|
|
520
|
+
if (!jsonSchema || typeof jsonSchema !== "object") {
|
|
521
|
+
return false;
|
|
522
|
+
}
|
|
523
|
+
return typeof jsonSchema["type"] === "string";
|
|
524
|
+
}
|
|
525
|
+
function _redactObject(obj, jsonSchema, maxRecursionDepth = 8, depth = 0) {
|
|
526
|
+
if (depth >= maxRecursionDepth) {
|
|
527
|
+
// prevent stack overflow if anything bad happens
|
|
528
|
+
return null;
|
|
529
|
+
}
|
|
530
|
+
if (!obj || !isBasicJsonSchema(jsonSchema)) {
|
|
531
|
+
return null;
|
|
532
|
+
}
|
|
533
|
+
if (!(jsonSchema.type === "object" &&
|
|
534
|
+
jsonSchema.properties &&
|
|
535
|
+
typeof jsonSchema.properties === "object")) {
|
|
536
|
+
// non-object types including unsupported types
|
|
537
|
+
return null;
|
|
538
|
+
}
|
|
539
|
+
const newObj = {};
|
|
540
|
+
const objAny = obj;
|
|
541
|
+
for (const key in jsonSchema.properties) {
|
|
542
|
+
if (key in objAny && objAny[key] !== undefined) {
|
|
543
|
+
const filteredObj = _redactObject(objAny[key], jsonSchema.properties[key], maxRecursionDepth, depth + 1);
|
|
544
|
+
newObj[key] = filteredObj;
|
|
545
|
+
}
|
|
546
|
+
}
|
|
547
|
+
return newObj;
|
|
548
|
+
}
|
|
549
|
+
/** Redact user content in "obj";
|
|
550
|
+
*
|
|
551
|
+
* DFS "obj" and "jsonSchema" together to redact the following things:
|
|
552
|
+
* - properties that is not defined in jsonSchema
|
|
553
|
+
* - the value of properties that is defined in jsonSchema, but the keys will remain
|
|
554
|
+
*
|
|
555
|
+
* Example:
|
|
556
|
+
* Input:
|
|
557
|
+
* ```
|
|
558
|
+
* obj = {
|
|
559
|
+
* "name": "some name",
|
|
560
|
+
* "user defined property": {
|
|
561
|
+
* "key1": "value1"
|
|
562
|
+
* }
|
|
563
|
+
* }
|
|
564
|
+
* jsonSchema = {
|
|
565
|
+
* "type": "object",
|
|
566
|
+
* "properties": {
|
|
567
|
+
* "name": { "type": "string" }
|
|
568
|
+
* }
|
|
569
|
+
* }
|
|
570
|
+
* ```
|
|
571
|
+
* Output:
|
|
572
|
+
* ```
|
|
573
|
+
* {"name": null}
|
|
574
|
+
* ```
|
|
575
|
+
**/
|
|
576
|
+
function redactObject(obj, jsonSchema, maxRecursionDepth = 8) {
|
|
577
|
+
return _redactObject(obj, jsonSchema, maxRecursionDepth, 0);
|
|
578
|
+
}
|
|
579
|
+
exports.redactObject = redactObject;
|
|
508
580
|
//# sourceMappingURL=tools.js.map
|