@microsoft/teamsfx-core 1.2.2-alpha.01a113d2.0 → 1.2.2-alpha.4ce002ea.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/local/constants.d.ts +0 -1
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +0 -1
- package/build/common/local/constants.js.map +1 -1
- package/build/common/local/localEnvManager.js +1 -1
- package/build/common/local/localEnvManager.js.map +1 -1
- package/build/common/local/portChecker.d.ts +2 -2
- package/build/common/local/portChecker.d.ts.map +1 -1
- package/build/common/local/portChecker.js +18 -5
- package/build/common/local/portChecker.js.map +1 -1
- package/build/common/local/taskDefinition.d.ts +0 -7
- package/build/common/local/taskDefinition.d.ts.map +1 -1
- package/build/common/local/taskDefinition.js +1 -51
- package/build/common/local/taskDefinition.js.map +1 -1
- package/build/common/localSettingsConstants.d.ts +2 -1
- package/build/common/localSettingsConstants.d.ts.map +1 -1
- package/build/common/localSettingsConstants.js +3 -2
- package/build/common/localSettingsConstants.js.map +1 -1
- package/build/common/localSettingsProvider.d.ts +3 -3
- package/build/common/localSettingsProvider.d.ts.map +1 -1
- package/build/common/localSettingsProvider.js +13 -11
- package/build/common/localSettingsProvider.js.map +1 -1
- package/build/common/permissionInterface.d.ts +1 -3
- package/build/common/permissionInterface.d.ts.map +1 -1
- package/build/common/permissionInterface.js +0 -2
- package/build/common/permissionInterface.js.map +1 -1
- package/build/common/projectSettingsValidator.d.ts +4 -0
- package/build/common/projectSettingsValidator.d.ts.map +1 -0
- package/build/common/projectSettingsValidator.js +65 -0
- package/build/common/projectSettingsValidator.js.map +1 -0
- package/build/common/telemetry.d.ts +3 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +2 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/template-utils/templatesActions.js +2 -2
- package/build/common/template-utils/templatesUtils.d.ts +2 -1
- package/build/common/template-utils/templatesUtils.d.ts.map +1 -1
- package/build/common/template-utils/templatesUtils.js +25 -7
- package/build/common/template-utils/templatesUtils.js.map +1 -1
- package/build/common/tools.d.ts +0 -4
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +1 -8
- package/build/common/tools.js.map +1 -1
- package/build/core/error.d.ts +2 -0
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +10 -2
- package/build/core/error.js.map +1 -1
- package/build/core/index.d.ts +0 -1
- package/build/core/index.d.ts.map +1 -1
- package/build/core/index.js +5 -25
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/CommonErrorHandlerMW.d.ts +14 -0
- package/build/core/middleware/CommonErrorHandlerMW.d.ts.map +1 -0
- package/build/core/middleware/CommonErrorHandlerMW.js +55 -0
- package/build/core/middleware/CommonErrorHandlerMW.js.map +1 -0
- package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoader.js +2 -1
- package/build/core/middleware/envInfoLoader.js.map +1 -1
- package/build/core/middleware/localSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/localSettingsLoader.js +4 -2
- package/build/core/middleware/localSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts.map +1 -1
- package/build/core/middleware/projectMigrator.js +1 -5
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +1 -1
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/pvm/broker.d.ts +24 -0
- package/build/core/pvm/broker.d.ts.map +1 -0
- package/build/core/pvm/broker.js +93 -0
- package/build/core/pvm/broker.js.map +1 -0
- package/build/core/pvm/constant.d.ts +9 -0
- package/build/core/pvm/constant.d.ts.map +1 -0
- package/build/core/pvm/constant.js +12 -0
- package/build/core/pvm/constant.js.map +1 -0
- package/build/core/pvm/depot.d.ts +43 -0
- package/build/core/pvm/depot.d.ts.map +1 -0
- package/build/core/pvm/depot.js +242 -0
- package/build/core/pvm/depot.js.map +1 -0
- package/build/core/pvm/pvm.d.ts +50 -0
- package/build/core/pvm/pvm.d.ts.map +1 -0
- package/build/core/pvm/pvm.js +92 -0
- package/build/core/pvm/pvm.js.map +1 -0
- package/build/core/pvm/type.d.ts +11 -0
- package/build/core/pvm/type.d.ts.map +1 -0
- package/build/core/pvm/type.js +3 -0
- package/build/core/pvm/type.js.map +1 -0
- package/build/core/pvm/utility.d.ts +2 -0
- package/build/core/pvm/utility.d.ts.map +1 -0
- package/build/core/pvm/utility.js +10 -0
- package/build/core/pvm/utility.js.map +1 -0
- package/build/core/tools.d.ts.map +1 -1
- package/build/core/tools.js +2 -6
- package/build/core/tools.js.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.d.ts +8 -8
- package/build/plugins/resource/aad/aadAppClient.d.ts.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.js +29 -29
- package/build/plugins/resource/aad/aadAppClient.js.map +1 -1
- package/build/plugins/resource/aad/index.d.ts +1 -0
- package/build/plugins/resource/aad/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/index.js +1 -0
- package/build/plugins/resource/aad/index.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts +4 -3
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +13 -13
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/aad/utils/common.d.ts +6 -4
- package/build/plugins/resource/aad/utils/common.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/common.js +60 -21
- package/build/plugins/resource/aad/utils/common.js.map +1 -1
- package/build/plugins/resource/aad/utils/configs.d.ts +9 -1
- package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/configs.js +232 -0
- package/build/plugins/resource/aad/utils/configs.js.map +1 -1
- package/build/plugins/resource/aad/utils/telemetry.d.ts +0 -1
- package/build/plugins/resource/aad/utils/telemetry.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/telemetry.js +10 -17
- package/build/plugins/resource/aad/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/aad/utils/tokenProvider.d.ts +6 -2
- package/build/plugins/resource/aad/utils/tokenProvider.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/tokenProvider.js +11 -11
- package/build/plugins/resource/aad/utils/tokenProvider.js.map +1 -1
- package/build/plugins/resource/aad/v2/index.d.ts +10 -11
- package/build/plugins/resource/aad/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/v2/index.js.map +1 -1
- package/build/plugins/resource/aad/v3/index.d.ts +24 -0
- package/build/plugins/resource/aad/v3/index.d.ts.map +1 -0
- package/build/plugins/resource/aad/v3/index.js +248 -0
- package/build/plugins/resource/aad/v3/index.js.map +1 -0
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.js +11 -3
- package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +2 -2
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts +8 -4
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.js +13 -12
- package/build/plugins/resource/appstudio/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.d.ts +10 -1
- package/build/plugins/resource/appstudio/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.js +36 -2
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -1
- package/build/plugins/resource/bot/aadRegistration.d.ts.map +1 -1
- package/build/plugins/resource/bot/aadRegistration.js +5 -4
- package/build/plugins/resource/bot/aadRegistration.js.map +1 -1
- package/build/plugins/resource/bot/enums/programmingLanguage.d.ts +2 -1
- package/build/plugins/resource/bot/enums/programmingLanguage.d.ts.map +1 -1
- package/build/plugins/resource/bot/enums/programmingLanguage.js +1 -0
- package/build/plugins/resource/bot/enums/programmingLanguage.js.map +1 -1
- package/build/plugins/resource/bot/index.js +3 -2
- package/build/plugins/resource/bot/index.js.map +1 -1
- package/build/plugins/resource/frontend/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/index.js +3 -2
- package/build/plugins/resource/frontend/index.js.map +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.d.ts +4 -3
- package/build/plugins/resource/frontend/resources/templateInfo.d.ts.map +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js +8 -7
- package/build/plugins/resource/frontend/resources/templateInfo.js.map +1 -1
- package/build/plugins/resource/localdebug/constants.d.ts +0 -1
- package/build/plugins/resource/localdebug/constants.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/constants.js +0 -1
- package/build/plugins/resource/localdebug/constants.js.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.js +1 -4
- package/build/plugins/resource/localdebug/v2/index.js.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.js +2 -2
- package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
- package/build/plugins/resource/utils4v2.d.ts +15 -16
- package/build/plugins/resource/utils4v2.d.ts.map +1 -1
- package/build/plugins/resource/utils4v2.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +25 -13
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +2 -4
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +3 -5
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js +12 -4
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/tasks.js +1 -4
- package/build/plugins/solution/fx-solution/debug/util/tasks.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts +0 -1
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +0 -10
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/checkPermission.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/checkPermission.js +25 -13
- package/build/plugins/solution/fx-solution/v2/checkPermission.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/grantPermission.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/grantPermission.js +26 -14
- package/build/plugins/solution/fx-solution/v2/grantPermission.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.js +20 -10
- package/build/plugins/solution/fx-solution/v2/listCollaborator.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts +0 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.js +0 -2
- package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addResource.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addResource.js +13 -10
- package/build/plugins/solution/fx-solution/v3/addResource.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/constants.js +1 -1
- package/build/plugins/solution/fx-solution/v3/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provision.js +5 -0
- package/build/plugins/solution/fx-solution/v3/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provisionLocal.js +17 -36
- package/build/plugins/solution/fx-solution/v3/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.d.ts +5 -0
- package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.js +10 -0
- package/build/plugins/solution/fx-solution/v3/solutionGlobalVars.js.map +1 -0
- package/package.json +7 -3
- package/resource/strings.json +28 -1
- package/templates/plugins/solution/{main.bicep → mainConfig.bicep} +0 -12
- package/templates/plugins/solution/mainProvision.bicep +10 -0
- package/build/plugins/solution/fx-solution/v2/listAllCollaborators.d.ts +0 -5
- package/build/plugins/solution/fx-solution/v2/listAllCollaborators.d.ts.map +0 -1
- package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js +0 -118
- package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAIA,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,UAAU;IAClC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,SAAS;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;CAC/B;AAED,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,eAAO,MAAM,iBAAiB,2BAA2B,CAAC;AAE1D,eAAO,MAAM,gBAAgB;;;;;;;;;;EAU3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;EAe9B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAe1B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;EAS/B,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;EAGxC,CAAC;AAEH,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
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAIA,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,UAAU;IAClC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,SAAS;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;CAC/B;AAED,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,eAAO,MAAM,iBAAiB,2BAA2B,CAAC;AAE1D,eAAO,MAAM,gBAAgB;;;;;;;;;;EAU3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;EAe9B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAe1B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;EAS/B,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;EAGxC,CAAC;AAEH,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;;;;;;;EAO/B,CAAC;AAEH,qBAAa,qBAAqB;IAChC,gBAAuB,YAAY,EAAE,MAAM,CAAmB;IAC9D,gBAAuB,WAAW,EAAE,MAAM,CAAmB;IAC7D,gBAAuB,YAAY,EAAE,MAAM,CAAqC;CACjF"}
|
|
@@ -111,7 +111,6 @@ exports.LocalSettingsBackendKeys = Object.freeze({
|
|
|
111
111
|
SqlPassword: "sqlPassword",
|
|
112
112
|
});
|
|
113
113
|
exports.LocalSettingsBotKeys = Object.freeze({
|
|
114
|
-
SkipNgrok: "skipNgrok",
|
|
115
114
|
BotId: "botId",
|
|
116
115
|
BotPassword: "botPassword",
|
|
117
116
|
BotAadObjectId: "botAadObjectId",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ class LocalEnvManager {
|
|
|
61
61
|
return await npmLogHelper_1.getNpmInstallLogInfo();
|
|
62
62
|
}
|
|
63
63
|
async getPortsInUse(projectPath, projectSettings) {
|
|
64
|
-
return await portChecker_1.getPortsInUse(projectPath, projectSettings);
|
|
64
|
+
return await portChecker_1.getPortsInUse(projectPath, projectSettings, false, this.logger);
|
|
65
65
|
}
|
|
66
66
|
async getLocalSettings(projectPath, cryptoOption) {
|
|
67
67
|
const localSettingsProvider = new localSettingsProvider_1.LocalSettingsProvider(projectPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,wDAUgC;AAChC,qDAA+B;AAC/B,mDAA6B;AAE7B,+DAA2D;AAC3D,oEAAiE;AACjE,iDAAyE;AACzE,+CAA8C;AAC9C,oCAAuC;AACvC,8CAAgD;AAChD,4CAA6D;AAC7D,6DAAuD;AACvD,mEAAgE;AAChE,uEAAoE;AAEpE,MAAa,eAAe;IAK1B,YAAY,MAAoB,EAAE,SAA6B,EAAE,EAAoB;QACnF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAEM,qBAAqB,CAAC,eAAgC;QAC3D,MAAM,SAAS,GAAe,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,6CAAqB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QAC/E,MAAM,iBAAiB,GAAG,6CAAqB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACnF,MAAM,cAAc,GAAG,6CAAqB,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAG,6CAAqB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAErE,SAAS;QACT,IAAI,MAAM,EAAE;YACV,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,QAAQ,CAAC,CAAC;SACnC;aAAM,IAAI,cAAc,EAAE;YACzB,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,YAAY,CAAC,CAAC;SACvC;aAAM;YACL,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,SAAS,CAAC,CAAC;SACpC;QAED,SAAS;QACT,IAAI,CAAC,eAAe,IAAI,iBAAiB,CAAC,IAAI,cAAc,EAAE;YAC5D,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,MAAM,CAAC,CAAC;SACjC;QAED,qBAAqB;QACrB,IAAI,cAAc,EAAE;YAClB,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,aAAa,CAAC,CAAC;SACxC;QAED,QAAQ;QACR,IAAI,UAAU,EAAE;YACd,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,KAAK,CAAC,CAAC;SAChC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,WAAmB,EACnB,eAAgC,EAChC,aAA+B;QAE/B,OAAO,MAAM,wCAAkB,CAAC,WAAW,EAAE,eAAe,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5F,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC/B,OAAO,MAAM,mCAAoB,EAAE,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,WAAmB,EACnB,eAAgC;QAEhC,OAAO,MAAM,2BAAa,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { ProjectSettings } from "@microsoft/teamsfx-api";
|
|
2
|
-
export declare function getPortsInUse(projectPath: string, projectSettings: ProjectSettings, ignoreDebugPort?: boolean): Promise<number[]>;
|
|
1
|
+
import { LogProvider, ProjectSettings } from "@microsoft/teamsfx-api";
|
|
2
|
+
export declare function getPortsInUse(projectPath: string, projectSettings: ProjectSettings, ignoreDebugPort?: boolean, logger?: LogProvider): Promise<number[]>;
|
|
3
3
|
//# sourceMappingURL=portChecker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAmB,MAAM,wBAAwB,CAAC;AA+CvF,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC,CA+CnB"}
|
|
@@ -4,11 +4,14 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.getPortsInUse = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
8
|
const path = tslib_1.__importStar(require("path"));
|
|
8
9
|
const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
|
|
9
10
|
const constants_1 = require("./constants");
|
|
10
11
|
const packageJsonHelper_1 = require("./packageJsonHelper");
|
|
11
12
|
const projectSettingsHelper_1 = require("./projectSettingsHelper");
|
|
13
|
+
const error_1 = require("../../core/error");
|
|
14
|
+
const telemetry_1 = require("../telemetry");
|
|
12
15
|
const frontendPortsV1 = [3000];
|
|
13
16
|
const frontendPorts = [53000];
|
|
14
17
|
const simpleAuthPorts = [55000];
|
|
@@ -19,28 +22,38 @@ const backendServicePorts = [7071];
|
|
|
19
22
|
const botDebugPortRegex = /--inspect[\s]*=[\s"']*9239/im;
|
|
20
23
|
const botDebugPorts = [9239];
|
|
21
24
|
const botServicePorts = [3978];
|
|
22
|
-
async function detectPortListening(port) {
|
|
25
|
+
async function detectPortListening(port, logger) {
|
|
23
26
|
try {
|
|
27
|
+
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DetectPortStart, { port: port.toString() });
|
|
24
28
|
const portChosen = await detect_port_1.default(port);
|
|
29
|
+
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DetectPort, {
|
|
30
|
+
portChosen: portChosen.toString(),
|
|
31
|
+
port: port.toString(),
|
|
32
|
+
});
|
|
25
33
|
return portChosen !== port;
|
|
26
34
|
}
|
|
27
|
-
catch (
|
|
35
|
+
catch (error) {
|
|
28
36
|
// ignore any error to not block debugging
|
|
37
|
+
telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DetectPort, teamsfx_api_1.returnUserError(error, error_1.CoreSource, "DetectPortError"));
|
|
38
|
+
logger === null || logger === void 0 ? void 0 : logger.warning(`Failed to detect port. ${error === null || error === void 0 ? void 0 : error.message} `);
|
|
29
39
|
return false;
|
|
30
40
|
}
|
|
31
41
|
}
|
|
32
|
-
async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
|
|
42
|
+
async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort, logger) {
|
|
33
43
|
const ports = [];
|
|
34
44
|
const includeFrontend = projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettings);
|
|
35
45
|
if (includeFrontend) {
|
|
36
46
|
const migrateFromV1 = projectSettingsHelper_1.ProjectSettingsHelper.isMigrateFromV1(projectSettings);
|
|
37
47
|
if (!migrateFromV1) {
|
|
38
48
|
ports.push(...frontendPorts);
|
|
39
|
-
ports.push(...simpleAuthPorts);
|
|
40
49
|
}
|
|
41
50
|
else {
|
|
42
51
|
ports.push(...frontendPortsV1);
|
|
43
52
|
}
|
|
53
|
+
const includeSimpleAuth = projectSettingsHelper_1.ProjectSettingsHelper.includeSimpleAuth(projectSettings);
|
|
54
|
+
if (includeSimpleAuth) {
|
|
55
|
+
ports.push(...simpleAuthPorts);
|
|
56
|
+
}
|
|
44
57
|
}
|
|
45
58
|
const includeBackend = projectSettingsHelper_1.ProjectSettingsHelper.includeBackend(projectSettings);
|
|
46
59
|
if (includeBackend) {
|
|
@@ -64,7 +77,7 @@ async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
|
|
|
64
77
|
}
|
|
65
78
|
const portsInUse = [];
|
|
66
79
|
for (const port of ports) {
|
|
67
|
-
if (await detectPortListening(port)) {
|
|
80
|
+
if (await detectPortListening(port, logger)) {
|
|
68
81
|
portsInUse.push(port);
|
|
69
82
|
}
|
|
70
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;
|
|
1
|
+
{"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,13 +12,6 @@ export interface ITaskDefinition {
|
|
|
12
12
|
[key: string]: string;
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
|
-
export declare class NpmTaskDefinition {
|
|
16
|
-
private static command;
|
|
17
|
-
private static nameSuffix;
|
|
18
|
-
static frontend(workspaceFolder: string, isWatchTask: boolean): ITaskDefinition;
|
|
19
|
-
static backend(workspaceFolder: string, isWatchTask: boolean, funcBinFolders: string[] | undefined): ITaskDefinition;
|
|
20
|
-
static bot(workspaceFolder: string, isWatchTask: boolean): ITaskDefinition;
|
|
21
|
-
}
|
|
22
15
|
export declare class TaskDefinition {
|
|
23
16
|
static frontendStart(workspaceFolder: string): ITaskDefinition;
|
|
24
17
|
static backendStart(workspaceFolder: string, programmingLanguage: string | undefined, funcCommand: string, enableLanguageWorker: boolean): ITaskDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"taskDefinition.d.ts","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE;QACX,SAAS,EAAE,OAAO,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACjC;
|
|
1
|
+
{"version":3,"file":"taskDefinition.d.ts","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE;QACX,SAAS,EAAE,OAAO,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACjC;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY9D,MAAM,CAAC,YAAY,CACjB,eAAe,EAAE,MAAM,EACvB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,OAAO,GAC5B,eAAe;IAmBlB,MAAM,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY7D,MAAM,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,eAAe;IAa9F,MAAM,CAAC,QAAQ,CACb,eAAe,EAAE,MAAM,EACvB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,aAAa,EAAE,OAAO,GACrB,eAAe;IAkBlB,MAAM,CAAC,UAAU,CACf,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,OAAO,EAClB,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,GACpC,eAAe;IAqBlB,MAAM,CAAC,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAYhE,MAAM,CAAC,cAAc,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY/D,MAAM,CAAC,wBAAwB,CAC7B,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,GACrB,eAAe;IAalB,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY3D,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY5D,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAczD,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;CAa3D"}
|
|
@@ -2,61 +2,11 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.TaskDefinition =
|
|
5
|
+
exports.TaskDefinition = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const constants_1 = require("./constants");
|
|
8
8
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
9
9
|
const system_1 = require("../deps-checker/util/system");
|
|
10
|
-
// This type of task executes npm script of each component.
|
|
11
|
-
class NpmTaskDefinition {
|
|
12
|
-
static command(isWatchTask) {
|
|
13
|
-
return isWatchTask ? "npm run watch:teamsfx" : "npm run dev:teamsfx";
|
|
14
|
-
}
|
|
15
|
-
static nameSuffix(isWatchTask) {
|
|
16
|
-
return isWatchTask ? "watch" : "dev";
|
|
17
|
-
}
|
|
18
|
-
static frontend(workspaceFolder, isWatchTask) {
|
|
19
|
-
return {
|
|
20
|
-
name: `frontend ${NpmTaskDefinition.nameSuffix(isWatchTask)}`,
|
|
21
|
-
command: NpmTaskDefinition.command(isWatchTask),
|
|
22
|
-
cwd: path_1.default.join(workspaceFolder, constants_1.FolderName.Frontend),
|
|
23
|
-
execOptions: {
|
|
24
|
-
needShell: true,
|
|
25
|
-
},
|
|
26
|
-
isBackground: true,
|
|
27
|
-
};
|
|
28
|
-
}
|
|
29
|
-
static backend(workspaceFolder, isWatchTask, funcBinFolders) {
|
|
30
|
-
var _a;
|
|
31
|
-
return {
|
|
32
|
-
name: `backend ${NpmTaskDefinition.nameSuffix(isWatchTask)}`,
|
|
33
|
-
command: NpmTaskDefinition.command(isWatchTask),
|
|
34
|
-
cwd: path_1.default.join(workspaceFolder, constants_1.FolderName.Function),
|
|
35
|
-
execOptions: {
|
|
36
|
-
needShell: true,
|
|
37
|
-
},
|
|
38
|
-
isBackground: true,
|
|
39
|
-
env: funcBinFolders
|
|
40
|
-
? {
|
|
41
|
-
// put portable func at the end since func checker prefers global func
|
|
42
|
-
PATH: `${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}${path_1.default.delimiter}${funcBinFolders.join(path_1.default.delimiter)}`,
|
|
43
|
-
}
|
|
44
|
-
: undefined,
|
|
45
|
-
};
|
|
46
|
-
}
|
|
47
|
-
static bot(workspaceFolder, isWatchTask) {
|
|
48
|
-
return {
|
|
49
|
-
name: `bot ${NpmTaskDefinition.nameSuffix(isWatchTask)}`,
|
|
50
|
-
command: NpmTaskDefinition.command(isWatchTask),
|
|
51
|
-
cwd: path_1.default.join(workspaceFolder, constants_1.FolderName.Bot),
|
|
52
|
-
execOptions: {
|
|
53
|
-
needShell: true,
|
|
54
|
-
},
|
|
55
|
-
isBackground: true,
|
|
56
|
-
};
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
exports.NpmTaskDefinition = NpmTaskDefinition;
|
|
60
10
|
class TaskDefinition {
|
|
61
11
|
static frontendStart(workspaceFolder) {
|
|
62
12
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"taskDefinition.js","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,2CAAiF;AACjF,wDAAwB;AACxB,wDAAwD;AAexD,
|
|
1
|
+
{"version":3,"file":"taskDefinition.js","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,2CAAiF;AACjF,wDAAwB;AACxB,wDAAwD;AAexD,MAAa,cAAc;IACzB,MAAM,CAAC,aAAa,CAAC,eAAuB;QAC1C,OAAO;YACL,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,yBAAyB;YAClC,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CACjB,eAAuB,EACvB,mBAAuC,EACvC,WAAmB,EACnB,oBAA6B;QAE7B,yGAAyG;QACzG,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3F,MAAM,IAAI,GACR,mBAAmB,KAAK,+BAAmB,CAAC,UAAU;YACpD,CAAC,CAAC,sBAAsB,iBAAiB,2BAA2B;YACpE,CAAC,CAAC,sBAAsB,iBAAiB,2BAA2B,CAAC;QACzE,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,GAAG,WAAW,IAAI,IAAI,EAAE;YACjC,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,kBAAS,EAAE;aACrB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,eAAuB;QACzC,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,iBAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,cAAsB,EAAE,eAAmC;QAC1E,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,CAAC,kCAAkC,CAAC;YAC1C,GAAG,EAAE,eAAe;YACpB,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CACb,eAAuB,EACvB,mBAAuC,EACvC,aAAsB;QAEtB,sEAAsE;QACtE,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,MAAM,OAAO,GACX,mBAAmB,KAAK,+BAAmB,CAAC,UAAU;YACpD,CAAC,CAAC,2BAA2B,UAAU,+CAA+C;YACtF,CAAC,CAAC,eAAe,UAAU,2BAA2B,CAAC;QAC3D,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,UAAU,CACf,eAAuB,EACvB,SAAkB,EAClB,eAAqC;;QAErC,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,SAAS;gBAChB,CAAC,CAAC,mEAAmE;gBACrE,CAAC,CAAC,8BAA8B;YAClC,GAAG,EAAE,eAAe;gBAClB,CAAC,CAAC;oBACE,IAAI,EAAE,GAAG,eAAe,CAAC,IAAI,CAAC,cAAI,CAAC,SAAS,CAAC,GAAG,cAAI,CAAC,SAAS,GAC5D,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,mCAAI,EACtB,EAAE;iBACH;gBACH,CAAC,CAAC,SAAS;YACb,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,CAAC,SAAS;SACzB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,eAAuB;QAC5C,OAAO;YACL,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,eAAuB;QAC3C,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,wBAAwB,CAC7B,eAAuB,EACvB,cAAsB;QAEtB,OAAO;YACL,IAAI,EAAE,4BAA4B;YAClC,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,KAAK,EAAE,yBAAyB,CAAC;YAC5E,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,eAAuB;QACvC,OAAO;YACL,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,eAAuB;QACxC,OAAO;YACL,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,IAAI,CAAC;YAChD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,eAAuB;QACrC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,MAAM;YACf,IAAI,EAAE,CAAC,GAAG,QAAQ,gCAAgC,EAAE,gBAAgB,EAAE,YAAY,CAAC;YACnF,GAAG,EAAE,QAAQ;YACb,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,eAAuB;QACtC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,MAAM;YACf,IAAI,EAAE,CAAC,GAAG,QAAQ,gCAAgC,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,CAAC;YACzF,GAAG,EAAE,QAAQ;YACb,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;CACF;AAxMD,wCAwMC"}
|
|
@@ -10,6 +10,8 @@ export declare const LocalSettingsAuthKeys: Readonly<{
|
|
|
10
10
|
OauthAuthority: string;
|
|
11
11
|
OauthHost: string;
|
|
12
12
|
ApplicationIdUris: string;
|
|
13
|
+
}>;
|
|
14
|
+
export declare const LocalSettingsSimpleAuthKeys: Readonly<{
|
|
13
15
|
SimpleAuthFilePath: string;
|
|
14
16
|
SimpleAuthEnvironmentVariableParams: string;
|
|
15
17
|
SimpleAuthServiceEndpoint: string;
|
|
@@ -33,7 +35,6 @@ export declare const LocalSettingsBackendKeys: Readonly<{
|
|
|
33
35
|
SqlPassword: string;
|
|
34
36
|
}>;
|
|
35
37
|
export declare const LocalSettingsBotKeys: Readonly<{
|
|
36
|
-
SkipNgrok: string;
|
|
37
38
|
BotId: string;
|
|
38
39
|
BotPassword: string;
|
|
39
40
|
BotAadObjectId: string;
|
|
@@ -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
|
|
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;;;;;;;;EAQhC,CAAC;AAEH,eAAO,MAAM,2BAA2B;;;;EAItC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;;EASpC,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;;;;EAOnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;EAO/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.LocalSettingsEncryptKeys = exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = void 0;
|
|
5
|
+
exports.LocalSettingsEncryptKeys = exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsSimpleAuthKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = void 0;
|
|
6
6
|
exports.LocalSettingsTeamsAppKeys = Object.freeze({
|
|
7
7
|
TenantId: "tenantId",
|
|
8
8
|
TeamsAppId: "teamsAppId",
|
|
@@ -15,6 +15,8 @@ exports.LocalSettingsAuthKeys = Object.freeze({
|
|
|
15
15
|
OauthAuthority: "oauthAuthority",
|
|
16
16
|
OauthHost: "oauthHost",
|
|
17
17
|
ApplicationIdUris: "applicationIdUris",
|
|
18
|
+
});
|
|
19
|
+
exports.LocalSettingsSimpleAuthKeys = Object.freeze({
|
|
18
20
|
SimpleAuthFilePath: "simpleAuthFilePath",
|
|
19
21
|
SimpleAuthEnvironmentVariableParams: "SimpleAuthEnvironmentVariableParams",
|
|
20
22
|
SimpleAuthServiceEndpoint: "AuthServiceEndpoint",
|
|
@@ -38,7 +40,6 @@ exports.LocalSettingsBackendKeys = Object.freeze({
|
|
|
38
40
|
SqlPassword: "sqlPassword",
|
|
39
41
|
});
|
|
40
42
|
exports.LocalSettingsBotKeys = Object.freeze({
|
|
41
|
-
SkipNgrok: "skipNgrok",
|
|
42
43
|
BotId: "botId",
|
|
43
44
|
BotPassword: "botPassword",
|
|
44
45
|
BotAadObjectId: "botAadObjectId",
|
|
@@ -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;
|
|
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;CACvC,CAAC,CAAC;AAEU,QAAA,2BAA2B,GAAG,MAAM,CAAC,MAAM,CAAC;IACvD,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,YAAY,EAAE,cAAc;IAC5B,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,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"}
|
|
@@ -3,8 +3,8 @@ 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, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean): LocalSettings;
|
|
7
|
-
initV2(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean): Json;
|
|
6
|
+
init(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean, includeSimpleAuth?: boolean): LocalSettings;
|
|
7
|
+
initV2(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean, includeSimpleAuth?: boolean): Json;
|
|
8
8
|
incrementalInitV2(localSettingsJson: Json, addBackaned: boolean, addBot: boolean, addFrontend: boolean): Json;
|
|
9
9
|
load(cryptoProvider?: CryptoProvider): Promise<LocalSettings | undefined>;
|
|
10
10
|
loadV2(cryptoProvider?: CryptoProvider): Promise<Json | undefined>;
|
|
@@ -13,7 +13,7 @@ export declare class LocalSettingsProvider {
|
|
|
13
13
|
saveJson(localSettingsJson: Json, cryptoProvider?: CryptoProvider): Promise<Json>;
|
|
14
14
|
private convertToLocalSettings;
|
|
15
15
|
convertToLocalSettingsJson(localSettings: LocalSettings): Json;
|
|
16
|
-
|
|
16
|
+
initAuth(includeSimpleAuth?: boolean): ConfigMap;
|
|
17
17
|
initFrontend(): ConfigMap;
|
|
18
18
|
initBackend(): ConfigMap;
|
|
19
19
|
initBot(): ConfigMap;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;IAI5B,IAAI,CACT,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,EACrB,iBAAiB,UAAQ,GACxB,aAAa;IAgCT,MAAM,CACX,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,EACrB,iBAAiB,UAAQ,GACxB,IAAI;IA8BA,iBAAiB,CACtB,iBAAiB,EAAE,IAAI,EACvB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,OAAO,GACnB,IAAI;IAiBM,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,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAsB9D,QAAQ,CAAC,iBAAiB,UAAQ,GAAG,SAAS;IAmB9C,YAAY,IAAI,SAAS;IAczB,WAAW,IAAI,SAAS;IAUxB,OAAO,IAAI,SAAS;CASrB"}
|
|
@@ -13,7 +13,7 @@ class LocalSettingsProvider {
|
|
|
13
13
|
constructor(workspaceFolder) {
|
|
14
14
|
this.localSettingsFilePath = `${workspaceFolder}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/${exports.localSettingsFileName}`;
|
|
15
15
|
}
|
|
16
|
-
init(includeFrontend, includeBackend, includeBotOrMessageExtension, migrateFromV1 = false) {
|
|
16
|
+
init(includeFrontend, includeBackend, includeBotOrMessageExtension, migrateFromV1 = false, includeSimpleAuth = false) {
|
|
17
17
|
// initialize Teams app related config for local debug.
|
|
18
18
|
const teamsAppLocalConfig = new teamsfx_api_1.ConfigMap();
|
|
19
19
|
teamsAppLocalConfig.set(localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId, "");
|
|
@@ -22,7 +22,7 @@ class LocalSettingsProvider {
|
|
|
22
22
|
teamsApp: teamsAppLocalConfig,
|
|
23
23
|
};
|
|
24
24
|
if (!migrateFromV1) {
|
|
25
|
-
localSettings.auth = this.
|
|
25
|
+
localSettings.auth = this.initAuth(includeSimpleAuth);
|
|
26
26
|
}
|
|
27
27
|
// initialize frontend and simple auth local settings.
|
|
28
28
|
if (includeFrontend) {
|
|
@@ -38,7 +38,7 @@ class LocalSettingsProvider {
|
|
|
38
38
|
}
|
|
39
39
|
return localSettings;
|
|
40
40
|
}
|
|
41
|
-
initV2(includeFrontend, includeBackend, includeBotOrMessageExtension, migrateFromV1 = false) {
|
|
41
|
+
initV2(includeFrontend, includeBackend, includeBotOrMessageExtension, migrateFromV1 = false, includeSimpleAuth = false) {
|
|
42
42
|
const localSettings = {
|
|
43
43
|
teamsApp: {
|
|
44
44
|
[localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId]: "",
|
|
@@ -46,7 +46,7 @@ class LocalSettingsProvider {
|
|
|
46
46
|
},
|
|
47
47
|
};
|
|
48
48
|
if (!migrateFromV1) {
|
|
49
|
-
localSettings.auth = this.
|
|
49
|
+
localSettings.auth = this.initAuth(includeSimpleAuth).toJSON();
|
|
50
50
|
}
|
|
51
51
|
// initialize frontend and simple auth local settings.
|
|
52
52
|
if (includeFrontend) {
|
|
@@ -197,13 +197,20 @@ class LocalSettingsProvider {
|
|
|
197
197
|
}
|
|
198
198
|
return localSettingsJson;
|
|
199
199
|
}
|
|
200
|
-
|
|
200
|
+
initAuth(includeSimpleAuth = false) {
|
|
201
201
|
// simple auth is only required by frontend
|
|
202
202
|
const authLocalConfig = new teamsfx_api_1.ConfigMap();
|
|
203
203
|
const keys = Object.values(localSettingsConstants_1.LocalSettingsAuthKeys);
|
|
204
204
|
for (const key of keys) {
|
|
205
205
|
authLocalConfig.set(key, "");
|
|
206
206
|
}
|
|
207
|
+
// If simple auth is activated, add simple auth related configs.
|
|
208
|
+
if (includeSimpleAuth) {
|
|
209
|
+
const simpleAuthKeys = Object.values(localSettingsConstants_1.LocalSettingsSimpleAuthKeys);
|
|
210
|
+
for (const key of simpleAuthKeys) {
|
|
211
|
+
authLocalConfig.set(key, "");
|
|
212
|
+
}
|
|
213
|
+
}
|
|
207
214
|
return authLocalConfig;
|
|
208
215
|
}
|
|
209
216
|
initFrontend() {
|
|
@@ -230,12 +237,7 @@ class LocalSettingsProvider {
|
|
|
230
237
|
const botLocalConfig = new teamsfx_api_1.ConfigMap();
|
|
231
238
|
const keys = Object.values(localSettingsConstants_1.LocalSettingsBotKeys);
|
|
232
239
|
for (const key of keys) {
|
|
233
|
-
|
|
234
|
-
botLocalConfig.set(key, false);
|
|
235
|
-
}
|
|
236
|
-
else {
|
|
237
|
-
botLocalConfig.set(key, "");
|
|
238
|
-
}
|
|
240
|
+
botLocalConfig.set(key, "");
|
|
239
241
|
}
|
|
240
242
|
return botLocalConfig;
|
|
241
243
|
}
|
|
@@ -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,wDAOgC;AAChC,
|
|
1
|
+
{"version":3,"file":"localSettingsProvider.js","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,7 @@ export declare enum CollaborationState {
|
|
|
9
9
|
NotProvisioned = "NotProvisioned",
|
|
10
10
|
M365TenantNotMatch = "M365TenantNotMatch",
|
|
11
11
|
EmptyM365Tenant = "EmptyM365Tenant",
|
|
12
|
-
|
|
13
|
-
m365AccountNotSignedIn = "M365AccountNotSignedIn",
|
|
14
|
-
ERROR = "ERROR"
|
|
12
|
+
m365AccountNotSignedIn = "M365AccountNotSignedIn"
|
|
15
13
|
}
|
|
16
14
|
export interface CollaborationStateResult {
|
|
17
15
|
state: CollaborationState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissionInterface.d.ts","sourceRoot":"","sources":["../../src/common/permissionInterface.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAC7B;AAED,oBAAY,kBAAkB;IAC5B,EAAE,OAAO;IACT,cAAc,mBAAmB;IACjC,kBAAkB,uBAAuB;IACzC,eAAe,oBAAoB;IACnC,
|
|
1
|
+
{"version":3,"file":"permissionInterface.d.ts","sourceRoot":"","sources":["../../src/common/permissionInterface.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAC7B;AAED,oBAAY,kBAAkB;IAC5B,EAAE,OAAO;IACT,cAAc,mBAAmB;IACjC,kBAAkB,uBAAuB;IACzC,eAAe,oBAAoB;IACnC,sBAAsB,2BAA2B;CAClD;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B"}
|
|
@@ -9,8 +9,6 @@ var CollaborationState;
|
|
|
9
9
|
CollaborationState["NotProvisioned"] = "NotProvisioned";
|
|
10
10
|
CollaborationState["M365TenantNotMatch"] = "M365TenantNotMatch";
|
|
11
11
|
CollaborationState["EmptyM365Tenant"] = "EmptyM365Tenant";
|
|
12
|
-
CollaborationState["SolutionIsNotIdle"] = "SolutionIsNotIdle";
|
|
13
12
|
CollaborationState["m365AccountNotSignedIn"] = "M365AccountNotSignedIn";
|
|
14
|
-
CollaborationState["ERROR"] = "ERROR";
|
|
15
13
|
})(CollaborationState = exports.CollaborationState || (exports.CollaborationState = {}));
|
|
16
14
|
//# sourceMappingURL=permissionInterface.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissionInterface.js","sourceRoot":"","sources":["../../src/common/permissionInterface.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AASlC,IAAY,
|
|
1
|
+
{"version":3,"file":"permissionInterface.js","sourceRoot":"","sources":["../../src/common/permissionInterface.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AASlC,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,+BAAS,CAAA;IACT,uDAAiC,CAAA;IACjC,+DAAyC,CAAA;IACzC,yDAAmC,CAAA;IACnC,uEAAiD,CAAA;AACnD,CAAC,EANW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAM7B"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { ProjectSettings } from "@microsoft/teamsfx-api";
|
|
2
|
+
export declare function validateProjectSettings(projectSettings: ProjectSettings): string | undefined;
|
|
3
|
+
export declare function validateProjectSettingsV3(projectSettings: ProjectSettings): string | undefined;
|
|
4
|
+
//# sourceMappingURL=projectSettingsValidator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectSettingsValidator.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAM,MAAM,wBAAwB,CAAC;AAO7D,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAsB5F;AAED,wBAAgB,yBAAyB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAW9F"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.validateProjectSettingsV3 = exports.validateProjectSettings = void 0;
|
|
6
|
+
const question_1 = require("../plugins/solution/fx-solution/question");
|
|
7
|
+
function validateProjectSettings(projectSettings) {
|
|
8
|
+
if (!projectSettings)
|
|
9
|
+
return "empty projectSettings";
|
|
10
|
+
if (!projectSettings.solutionSettings)
|
|
11
|
+
return "empty solutionSettings";
|
|
12
|
+
const solutionSettings = projectSettings.solutionSettings;
|
|
13
|
+
if (solutionSettings.hostType === undefined)
|
|
14
|
+
return "empty solutionSettings.hostType";
|
|
15
|
+
let validateRes = validateStringArray(solutionSettings.azureResources);
|
|
16
|
+
if (validateRes) {
|
|
17
|
+
return `solutionSettings.azureResources validation failed: ${validateRes}`;
|
|
18
|
+
}
|
|
19
|
+
validateRes = validateStringArray(solutionSettings.capabilities, [
|
|
20
|
+
question_1.TabOptionItem.id,
|
|
21
|
+
question_1.BotOptionItem.id,
|
|
22
|
+
question_1.MessageExtensionItem.id,
|
|
23
|
+
]);
|
|
24
|
+
if (validateRes) {
|
|
25
|
+
return `solutionSettings.capabilities validation failed: ${validateRes}`;
|
|
26
|
+
}
|
|
27
|
+
validateRes = validateStringArray(solutionSettings.activeResourcePlugins);
|
|
28
|
+
if (validateRes) {
|
|
29
|
+
return `solutionSettings.activeResourcePlugins validation failed: ${validateRes}`;
|
|
30
|
+
}
|
|
31
|
+
return undefined;
|
|
32
|
+
}
|
|
33
|
+
exports.validateProjectSettings = validateProjectSettings;
|
|
34
|
+
function validateProjectSettingsV3(projectSettings) {
|
|
35
|
+
const res = validateProjectSettings(projectSettings);
|
|
36
|
+
if (res)
|
|
37
|
+
return res;
|
|
38
|
+
const solutionSettings = projectSettings.solutionSettings;
|
|
39
|
+
if (!solutionSettings.modules) {
|
|
40
|
+
return "solutionSettings.modules is undefined";
|
|
41
|
+
}
|
|
42
|
+
if (!Array.isArray(solutionSettings.modules)) {
|
|
43
|
+
return "solutionSettings.modules is not array";
|
|
44
|
+
}
|
|
45
|
+
return undefined;
|
|
46
|
+
}
|
|
47
|
+
exports.validateProjectSettingsV3 = validateProjectSettingsV3;
|
|
48
|
+
function validateStringArray(arr, enums) {
|
|
49
|
+
if (!arr) {
|
|
50
|
+
return "is undefined";
|
|
51
|
+
}
|
|
52
|
+
if (!Array.isArray(arr)) {
|
|
53
|
+
return "is not array";
|
|
54
|
+
}
|
|
55
|
+
for (const element of arr) {
|
|
56
|
+
if (typeof element !== "string") {
|
|
57
|
+
return "array elements is not string type";
|
|
58
|
+
}
|
|
59
|
+
if (enums && !enums.includes(element)) {
|
|
60
|
+
return `array elements is out of scope: ${enums}`;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return undefined;
|
|
64
|
+
}
|
|
65
|
+
//# sourceMappingURL=projectSettingsValidator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectSettingsValidator.js","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,uEAIkD;AAElD,SAAgB,uBAAuB,CAAC,eAAgC;IACtE,IAAI,CAAC,eAAe;QAAE,OAAO,uBAAuB,CAAC;IACrD,IAAI,CAAC,eAAe,CAAC,gBAAgB;QAAE,OAAO,wBAAwB,CAAC;IACvE,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAA8C,CAAC;IACxF,IAAI,gBAAgB,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO,iCAAiC,CAAC;IACtF,IAAI,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACvE,IAAI,WAAW,EAAE;QACf,OAAO,sDAAsD,WAAW,EAAE,CAAC;KAC5E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,YAAY,EAAE;QAC/D,wBAAa,CAAC,EAAE;QAChB,wBAAa,CAAC,EAAE;QAChB,+BAAoB,CAAC,EAAE;KACxB,CAAC,CAAC;IACH,IAAI,WAAW,EAAE;QACf,OAAO,oDAAoD,WAAW,EAAE,CAAC;KAC1E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IAC1E,IAAI,WAAW,EAAE;QACf,OAAO,6DAA6D,WAAW,EAAE,CAAC;KACnF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAtBD,0DAsBC;AAED,SAAgB,yBAAyB,CAAC,eAAgC;IACxE,MAAM,GAAG,GAAG,uBAAuB,CAAC,eAAe,CAAC,CAAC;IACrD,IAAI,GAAG;QAAE,OAAO,GAAG,CAAC;IACpB,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAA8C,CAAC;IACxF,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;QAC7B,OAAO,uCAAuC,CAAC;KAChD;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC5C,OAAO,uCAAuC,CAAC;KAChD;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAXD,8DAWC;AAED,SAAS,mBAAmB,CAAC,GAAS,EAAE,KAAgB;IACtD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,cAAc,CAAC;KACvB;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACvB,OAAO,cAAc,CAAC;KACvB;IACD,KAAK,MAAM,OAAO,IAAI,GAAY,EAAE;QAClC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,mCAAmC,CAAC;SAC5C;QACD,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACrC,OAAO,mCAAmC,KAAK,EAAE,CAAC;SACnD;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|