@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.768a76f6e.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.
Files changed (243) hide show
  1. package/build/common/constants.d.ts +1 -1
  2. package/build/common/constants.d.ts.map +1 -1
  3. package/build/common/constants.js +1 -1
  4. package/build/common/constants.js.map +1 -1
  5. package/build/common/projectSettingsHelper.d.ts.map +1 -1
  6. package/build/common/projectSettingsHelper.js +2 -2
  7. package/build/common/projectSettingsHelper.js.map +1 -1
  8. package/build/common/samples-config.json +14 -0
  9. package/build/common/samples.d.ts +1 -1
  10. package/build/common/samples.d.ts.map +1 -1
  11. package/build/common/samples.js +3 -2
  12. package/build/common/samples.js.map +1 -1
  13. package/build/common/telemetry.d.ts +9 -0
  14. package/build/common/telemetry.d.ts.map +1 -1
  15. package/build/common/telemetry.js +9 -0
  16. package/build/common/telemetry.js.map +1 -1
  17. package/build/common/templates-config.json +2 -2
  18. package/build/common/tools.d.ts +1 -1
  19. package/build/common/tools.d.ts.map +1 -1
  20. package/build/common/tools.js +9 -5
  21. package/build/common/tools.js.map +1 -1
  22. package/build/core/FxCore.d.ts +2 -2
  23. package/build/core/FxCore.d.ts.map +1 -1
  24. package/build/core/FxCore.js +49 -11
  25. package/build/core/FxCore.js.map +1 -1
  26. package/build/core/environment.d.ts +1 -1
  27. package/build/core/environment.d.ts.map +1 -1
  28. package/build/core/environment.js +6 -1
  29. package/build/core/environment.js.map +1 -1
  30. package/build/core/error.d.ts +1 -0
  31. package/build/core/error.d.ts.map +1 -1
  32. package/build/core/error.js +5 -1
  33. package/build/core/error.js.map +1 -1
  34. package/build/core/middleware/aadManifestMigration.d.ts +3 -0
  35. package/build/core/middleware/aadManifestMigration.d.ts.map +1 -0
  36. package/build/core/middleware/aadManifestMigration.js +211 -0
  37. package/build/core/middleware/aadManifestMigration.js.map +1 -0
  38. package/build/core/middleware/consolidateLocalRemote.d.ts +2 -0
  39. package/build/core/middleware/consolidateLocalRemote.d.ts.map +1 -1
  40. package/build/core/middleware/consolidateLocalRemote.js +80 -51
  41. package/build/core/middleware/consolidateLocalRemote.js.map +1 -1
  42. package/build/core/middleware/questionModel.d.ts.map +1 -1
  43. package/build/core/middleware/questionModel.js +11 -2
  44. package/build/core/middleware/questionModel.js.map +1 -1
  45. package/build/core/question.d.ts +3 -1
  46. package/build/core/question.d.ts.map +1 -1
  47. package/build/core/question.js +22 -2
  48. package/build/core/question.js.map +1 -1
  49. package/build/plugins/resource/aad/plugin.d.ts +1 -0
  50. package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
  51. package/build/plugins/resource/aad/plugin.js +54 -1
  52. package/build/plugins/resource/aad/plugin.js.map +1 -1
  53. package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
  54. package/build/plugins/resource/aad/utils/configs.js +4 -1
  55. package/build/plugins/resource/aad/utils/configs.js.map +1 -1
  56. package/build/plugins/resource/apiconnector/checker.d.ts +2 -0
  57. package/build/plugins/resource/apiconnector/checker.d.ts.map +1 -0
  58. package/build/plugins/resource/apiconnector/checker.js +22 -0
  59. package/build/plugins/resource/apiconnector/checker.js.map +1 -0
  60. package/build/plugins/resource/apiconnector/config.d.ts +20 -0
  61. package/build/plugins/resource/apiconnector/config.d.ts.map +1 -0
  62. package/build/plugins/resource/apiconnector/config.js +5 -0
  63. package/build/plugins/resource/apiconnector/config.js.map +1 -0
  64. package/build/plugins/resource/apiconnector/constants.d.ts +18 -0
  65. package/build/plugins/resource/apiconnector/constants.d.ts.map +1 -1
  66. package/build/plugins/resource/apiconnector/constants.js +20 -1
  67. package/build/plugins/resource/apiconnector/constants.js.map +1 -1
  68. package/build/plugins/resource/apiconnector/depsHandler.d.ts +12 -0
  69. package/build/plugins/resource/apiconnector/depsHandler.d.ts.map +1 -0
  70. package/build/plugins/resource/apiconnector/depsHandler.js +66 -0
  71. package/build/plugins/resource/apiconnector/depsHandler.js.map +1 -0
  72. package/build/plugins/resource/apiconnector/envHandler.d.ts +3 -2
  73. package/build/plugins/resource/apiconnector/envHandler.d.ts.map +1 -1
  74. package/build/plugins/resource/apiconnector/envHandler.js +35 -25
  75. package/build/plugins/resource/apiconnector/envHandler.js.map +1 -1
  76. package/build/plugins/resource/apiconnector/errors.d.ts +13 -1
  77. package/build/plugins/resource/apiconnector/errors.d.ts.map +1 -1
  78. package/build/plugins/resource/apiconnector/errors.js +19 -7
  79. package/build/plugins/resource/apiconnector/errors.js.map +1 -1
  80. package/build/plugins/resource/apiconnector/index.d.ts.map +1 -1
  81. package/build/plugins/resource/apiconnector/index.js +1 -8
  82. package/build/plugins/resource/apiconnector/index.js.map +1 -1
  83. package/build/plugins/resource/apiconnector/plugin.d.ts +11 -2
  84. package/build/plugins/resource/apiconnector/plugin.d.ts.map +1 -1
  85. package/build/plugins/resource/apiconnector/plugin.js +179 -17
  86. package/build/plugins/resource/apiconnector/plugin.js.map +1 -1
  87. package/build/plugins/resource/apiconnector/questions.d.ts +23 -3
  88. package/build/plugins/resource/apiconnector/questions.d.ts.map +1 -1
  89. package/build/plugins/resource/apiconnector/questions.js +69 -22
  90. package/build/plugins/resource/apiconnector/questions.js.map +1 -1
  91. package/build/plugins/resource/apiconnector/result.d.ts +2 -1
  92. package/build/plugins/resource/apiconnector/result.d.ts.map +1 -1
  93. package/build/plugins/resource/apiconnector/result.js.map +1 -1
  94. package/build/plugins/resource/apiconnector/sampleHandler.d.ts +1 -1
  95. package/build/plugins/resource/apiconnector/sampleHandler.d.ts.map +1 -1
  96. package/build/plugins/resource/apiconnector/sampleHandler.js +7 -3
  97. package/build/plugins/resource/apiconnector/sampleHandler.js.map +1 -1
  98. package/build/plugins/resource/apiconnector/utils.d.ts +16 -20
  99. package/build/plugins/resource/apiconnector/utils.d.ts.map +1 -1
  100. package/build/plugins/resource/apiconnector/utils.js +72 -16
  101. package/build/plugins/resource/apiconnector/utils.js.map +1 -1
  102. package/build/plugins/resource/appstudio/appStudio.d.ts.map +1 -1
  103. package/build/plugins/resource/appstudio/appStudio.js +6 -5
  104. package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
  105. package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -1
  106. package/build/plugins/resource/appstudio/manifestTemplate.js +3 -3
  107. package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
  108. package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
  109. package/build/plugins/resource/appstudio/plugin.js.map +1 -1
  110. package/build/plugins/resource/appstudio/v3/plugin.d.ts.map +1 -1
  111. package/build/plugins/resource/appstudio/v3/plugin.js +5 -0
  112. package/build/plugins/resource/appstudio/v3/plugin.js.map +1 -1
  113. package/build/plugins/resource/bot/azureOps.d.ts +0 -1
  114. package/build/plugins/resource/bot/azureOps.d.ts.map +1 -1
  115. package/build/plugins/resource/bot/azureOps.js +0 -28
  116. package/build/plugins/resource/bot/azureOps.js.map +1 -1
  117. package/build/plugins/resource/bot/clientFactory.d.ts +0 -5
  118. package/build/plugins/resource/bot/clientFactory.d.ts.map +1 -1
  119. package/build/plugins/resource/bot/clientFactory.js +1 -29
  120. package/build/plugins/resource/bot/clientFactory.js.map +1 -1
  121. package/build/plugins/resource/bot/constants.d.ts +0 -8
  122. package/build/plugins/resource/bot/constants.d.ts.map +1 -1
  123. package/build/plugins/resource/bot/constants.js +0 -8
  124. package/build/plugins/resource/bot/constants.js.map +1 -1
  125. package/build/plugins/resource/bot/errors.d.ts +0 -18
  126. package/build/plugins/resource/bot/errors.d.ts.map +1 -1
  127. package/build/plugins/resource/bot/errors.js +1 -38
  128. package/build/plugins/resource/bot/errors.js.map +1 -1
  129. package/build/plugins/resource/bot/functionsHostedBot/deployMgr.d.ts +1 -1
  130. package/build/plugins/resource/bot/functionsHostedBot/deployMgr.d.ts.map +1 -1
  131. package/build/plugins/resource/bot/functionsHostedBot/deployMgr.js +10 -4
  132. package/build/plugins/resource/bot/functionsHostedBot/deployMgr.js.map +1 -1
  133. package/build/plugins/resource/bot/functionsHostedBot/plugin.d.ts.map +1 -1
  134. package/build/plugins/resource/bot/functionsHostedBot/plugin.js +2 -6
  135. package/build/plugins/resource/bot/functionsHostedBot/plugin.js.map +1 -1
  136. package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
  137. package/build/plugins/resource/bot/plugin.js +4 -1
  138. package/build/plugins/resource/bot/plugin.js.map +1 -1
  139. package/build/plugins/resource/bot/question.d.ts +1 -0
  140. package/build/plugins/resource/bot/question.d.ts.map +1 -1
  141. package/build/plugins/resource/bot/question.js +2 -0
  142. package/build/plugins/resource/bot/question.js.map +1 -1
  143. package/build/plugins/resource/frontend/resources/templateInfo.js +1 -1
  144. package/build/plugins/resource/frontend/resources/templateInfo.js.map +1 -1
  145. package/build/plugins/resource/sql/errors.d.ts.map +1 -1
  146. package/build/plugins/resource/sql/errors.js +29 -29
  147. package/build/plugins/resource/sql/errors.js.map +1 -1
  148. package/build/plugins/resource/sql/sqlClient.d.ts.map +1 -1
  149. package/build/plugins/resource/sql/sqlClient.js +2 -8
  150. package/build/plugins/resource/sql/sqlClient.js.map +1 -1
  151. package/build/plugins/solution/fx-solution/constants.d.ts +16 -2
  152. package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
  153. package/build/plugins/solution/fx-solution/constants.js +19 -1
  154. package/build/plugins/solution/fx-solution/constants.js.map +1 -1
  155. package/build/plugins/solution/fx-solution/debug/util/launchNext.d.ts.map +1 -1
  156. package/build/plugins/solution/fx-solution/debug/util/launchNext.js +0 -26
  157. package/build/plugins/solution/fx-solution/debug/util/launchNext.js.map +1 -1
  158. package/build/plugins/solution/fx-solution/question.d.ts +3 -1
  159. package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
  160. package/build/plugins/solution/fx-solution/question.js +21 -7
  161. package/build/plugins/solution/fx-solution/question.js.map +1 -1
  162. package/build/plugins/solution/fx-solution/v2/deploy.d.ts.map +1 -1
  163. package/build/plugins/solution/fx-solution/v2/deploy.js +14 -5
  164. package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
  165. package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts +2 -1
  166. package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
  167. package/build/plugins/solution/fx-solution/v2/executeUserTask.js +139 -94
  168. package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
  169. package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
  170. package/build/plugins/solution/fx-solution/v2/getQuestions.js +50 -23
  171. package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
  172. package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
  173. package/build/plugins/solution/fx-solution/v2/provision.js +17 -6
  174. package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
  175. package/build/plugins/solution/fx-solution/v2/utils.js +1 -1
  176. package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
  177. package/package.json +5 -4
  178. package/resource/package.nls.json +91 -39
  179. package/resource/unify-config-change-logs.md +19 -0
  180. package/templates/core/README.md +1 -0
  181. package/templates/fallback/blazor-base.csharp.default.zip +0 -0
  182. package/templates/fallback/bot.csharp.default.zip +0 -0
  183. package/templates/fallback/bot.js.command-and-response.zip +0 -0
  184. package/templates/fallback/bot.js.default.zip +0 -0
  185. package/templates/fallback/bot.js.notification-function-base.zip +0 -0
  186. package/templates/fallback/bot.js.notification-restify.zip +0 -0
  187. package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
  188. package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
  189. package/templates/fallback/bot.ts.command-and-response.zip +0 -0
  190. package/templates/fallback/bot.ts.default.zip +0 -0
  191. package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
  192. package/templates/fallback/bot.ts.notification-restify.zip +0 -0
  193. package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
  194. package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
  195. package/templates/fallback/bot.ts.notification.zip +0 -0
  196. package/templates/fallback/function-base.js.default.zip +0 -0
  197. package/templates/fallback/function-base.ts.default.zip +0 -0
  198. package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
  199. package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
  200. package/templates/fallback/tab.csharp.default.zip +0 -0
  201. package/templates/fallback/tab.js.default.zip +0 -0
  202. package/templates/fallback/tab.js.m365.zip +0 -0
  203. package/templates/fallback/tab.js.non-sso.zip +0 -0
  204. package/templates/fallback/tab.ts.default.zip +0 -0
  205. package/templates/fallback/tab.ts.m365.zip +0 -0
  206. package/templates/fallback/tab.ts.non-sso.zip +0 -0
  207. package/templates/plugins/resource/aad/auth/bot/README.md +63 -0
  208. package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +65 -0
  209. package/templates/plugins/resource/aad/auth/bot/js/public/auth-start.html +177 -0
  210. package/templates/plugins/resource/aad/auth/bot/js/sso/showUserInfo.js +19 -0
  211. package/templates/plugins/resource/aad/auth/bot/js/sso/ssoDialog.js +173 -0
  212. package/templates/plugins/resource/aad/auth/bot/js/sso/teamsSsoBot.js +55 -0
  213. package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +65 -0
  214. package/templates/plugins/resource/aad/auth/bot/ts/public/auth-start.html +177 -0
  215. package/templates/plugins/resource/aad/auth/bot/ts/sso/showUserInfo.ts +24 -0
  216. package/templates/plugins/resource/aad/auth/bot/ts/sso/ssoDialog.ts +182 -0
  217. package/templates/plugins/resource/aad/auth/bot/ts/sso/teamsSsoBot.ts +69 -0
  218. package/templates/plugins/resource/aad/auth/tab/README.md +49 -0
  219. package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +58 -0
  220. package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +57 -0
  221. package/templates/plugins/resource/aad/auth/tab/js/sso/GetUserProfile.jsx +34 -0
  222. package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +58 -0
  223. package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +57 -0
  224. package/templates/plugins/resource/aad/auth/tab/ts/sso/GetUserProfile.tsx +34 -0
  225. package/templates/plugins/resource/aad/manifest/aad.template.json +1 -14
  226. package/templates/plugins/resource/apiconnector/package.json +6 -0
  227. package/templates/plugins/resource/apiconnector/sample/{ts/api-connector.template → comment.template} +2 -11
  228. package/templates/plugins/resource/apiconnector/sample/js/aad.template +12 -0
  229. package/templates/plugins/resource/apiconnector/sample/js/basic.template +11 -0
  230. package/templates/plugins/resource/apiconnector/sample/ts/aad.template +17 -0
  231. package/templates/plugins/resource/apiconnector/sample/ts/basic.template +11 -0
  232. package/templates/plugins/resource/bot/bicep/botProvision.template.bicep +9 -0
  233. package/templates/plugins/resource/bot/bicep/funcHostedBotProvision.template.bicep +2 -0
  234. package/templates/plugins/resource/function/bicep/functionProvision.template.bicep +2 -0
  235. package/templates/plugins/resource/simpleauth/bicep/simpleAuthProvision.template.bicep +4 -0
  236. package/templates/plugins/resource/webapp/bicep/webappProvision.template.bicep +2 -0
  237. package/templates/core/README-auto-generated.md +0 -31
  238. package/templates/fallback/bot-msgext.csharp.default.zip +0 -0
  239. package/templates/fallback/bot-msgext.js.default.zip +0 -0
  240. package/templates/fallback/bot-msgext.ts.default.zip +0 -0
  241. package/templates/fallback/msgext.js.default.zip +0 -0
  242. package/templates/fallback/msgext.ts.default.zip +0 -0
  243. package/templates/plugins/resource/apiconnector/sample/js/api-connector.template +0 -30
@@ -1 +1 @@
1
- {"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/core/error.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/core/error.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import { Middleware } from "@feathersjs/hooks/lib";
2
+ export declare const AadManifestMigrationMW: Middleware;
3
+ //# sourceMappingURL=aadManifestMigration.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"aadManifestMigration.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/aadManifestMigration.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAoCjE,eAAO,MAAM,sBAAsB,EAAE,UAwCpC,CAAC"}
@@ -0,0 +1,211 @@
1
+ "use strict";
2
+ // Copyright (c) Microsoft Corporation.
3
+ // Licensed under the MIT license.
4
+ Object.defineProperty(exports, "__esModule", { value: true });
5
+ exports.AadManifestMigrationMW = void 0;
6
+ const tslib_1 = require("tslib");
7
+ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
8
+ const tools_1 = require("../../common/tools");
9
+ const error_1 = require("../error");
10
+ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
11
+ const path_1 = tslib_1.__importDefault(require("path"));
12
+ const telemetry_1 = require("../../common/telemetry");
13
+ const globalVars_1 = require("../globalVars");
14
+ const localizeUtils_1 = require("../../common/localizeUtils");
15
+ const folder_1 = require("../../folder");
16
+ const projectSettingsLoader_1 = require("./projectSettingsLoader");
17
+ const projectMigrator_1 = require("./projectMigrator");
18
+ const consolidateLocalRemote_1 = require("./consolidateLocalRemote");
19
+ const constants_1 = require("../../plugins/resource/aad/constants");
20
+ const constants_2 = require("../../plugins/solution/fx-solution/constants");
21
+ const os = tslib_1.__importStar(require("os"));
22
+ const upgradeButton = "Upgrade";
23
+ let userCancelFlag = false;
24
+ const backupFolder = ".backup";
25
+ const AadManifestMigrationMW = async (ctx, next) => {
26
+ if (await projectMigrator_1.needMigrateToArmAndMultiEnv(ctx)) {
27
+ await next();
28
+ }
29
+ else if (await consolidateLocalRemote_1.needConsolidateLocalRemote(ctx)) {
30
+ await next();
31
+ }
32
+ else if ((await needMigrateToAadManifest(ctx)) && checkMethod(ctx)) {
33
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart);
34
+ const res = await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("warn", localizeUtils_1.getLocalizedString("core.aadManifestMigration.Message"), true, upgradeButton));
35
+ const answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
36
+ if (!answer || answer != upgradeButton) {
37
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationNotification, {
38
+ [telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.Cancel,
39
+ });
40
+ ctx.result = teamsfx_api_1.err(error_1.AadManifestMigrationCanceledError());
41
+ outputCancelMessage(ctx);
42
+ return;
43
+ }
44
+ try {
45
+ await migrate(ctx);
46
+ await next();
47
+ }
48
+ catch (error) {
49
+ telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationError, teamsfx_api_1.assembleError(error, error_1.CoreSource));
50
+ throw error;
51
+ }
52
+ }
53
+ else {
54
+ await next();
55
+ }
56
+ };
57
+ exports.AadManifestMigrationMW = AadManifestMigrationMW;
58
+ async function needMigrateToAadManifest(ctx) {
59
+ try {
60
+ if (!tools_1.isConfigUnifyEnabled() || !tools_1.isAadManifestEnabled()) {
61
+ return false;
62
+ }
63
+ const inputs = ctx.arguments[ctx.arguments.length - 1];
64
+ if (!inputs.projectPath) {
65
+ return false;
66
+ }
67
+ const fxExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, ".fx"));
68
+ if (!fxExist) {
69
+ return false;
70
+ }
71
+ const aadManifestTemplateExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, "templates", "appPackage", "aad.template.json"));
72
+ if (aadManifestTemplateExist) {
73
+ return false;
74
+ }
75
+ const permissionFileExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, "permissions.json"));
76
+ const projectSettingsJson = await fs_extra_1.default.readJson(path_1.default.join(inputs.projectPath, ".fx", "configs", "projectSettings.json"));
77
+ const aadPluginIsActive = projectSettingsJson.solutionSettings.activeResourcePlugins.includes(constants_2.PluginNames.AAD);
78
+ if (!aadPluginIsActive || !permissionFileExist) {
79
+ return false;
80
+ }
81
+ return true;
82
+ }
83
+ catch (err) {
84
+ return false;
85
+ }
86
+ }
87
+ function outputCancelMessage(ctx) {
88
+ globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(localizeUtils_1.getLocalizedString("core.aadManifestMigration.Canceled"));
89
+ const inputs = ctx.arguments[ctx.arguments.length - 1];
90
+ if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
91
+ globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(localizeUtils_1.getLocalizedString("core.aadManifestMigration.VSCodeCanceledNotice"));
92
+ }
93
+ else {
94
+ globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(localizeUtils_1.getLocalizedString("core.aadManifestMigration.CLICanceledNotice"));
95
+ globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(localizeUtils_1.getLocalizedString("core.aadManifestMigration.CLINotReadyInstallLatestVersionNotice"));
96
+ }
97
+ }
98
+ function permissionsToRequiredResourceAccess(permissions) {
99
+ const result = [];
100
+ permissions.forEach((permission) => {
101
+ const res = {
102
+ resourceAppId: permission.resource,
103
+ resourceAccess: permission.application
104
+ .map((item) => {
105
+ return { id: item, type: "Role" };
106
+ })
107
+ .concat(permission.delegated.map((item) => {
108
+ return { id: item, type: "Scope" };
109
+ })),
110
+ };
111
+ result.push(res);
112
+ });
113
+ return result;
114
+ }
115
+ async function migrate(ctx) {
116
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationStart);
117
+ const inputs = ctx.arguments[ctx.arguments.length - 1];
118
+ const fileList = [];
119
+ const loadRes = await projectSettingsLoader_1.loadProjectSettings(inputs, true);
120
+ if (loadRes.isErr()) {
121
+ ctx.result = teamsfx_api_1.err(loadRes.error);
122
+ return false;
123
+ }
124
+ const projectSettings = loadRes.value;
125
+ const projectSettingsPath = path_1.default.join(inputs.projectPath, ".fx", "configs", "projectSettings.json");
126
+ const permissionFilePath = path_1.default.join(inputs.projectPath, "permissions.json");
127
+ try {
128
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationAddAADTemplateStart);
129
+ // add aad.template.file
130
+ const permissions = (await fs_extra_1.default.readJson(permissionFilePath));
131
+ const requiredResourceAccess = permissionsToRequiredResourceAccess(permissions);
132
+ const templatesFolder = folder_1.getTemplatesFolder();
133
+ const aadManifestTemplatePath = `${templatesFolder}/${constants_1.Constants.aadManifestTemplateFolder}/${constants_1.Constants.aadManifestTemplateName}`;
134
+ const aadManifestJson = await fs_extra_1.default.readJson(aadManifestTemplatePath);
135
+ aadManifestJson.requiredResourceAccess = requiredResourceAccess;
136
+ const aadManifestPath = path_1.default.join(inputs.projectPath, "templates", "appPackage", "aad.template.json");
137
+ const projectSettingsJson = await fs_extra_1.default.readJson(projectSettingsPath);
138
+ if (projectSettingsJson.solutionSettings.capabilities.includes("Tab")) {
139
+ aadManifestJson.replyUrlsWithType.push({
140
+ url: "{{state.fx-resource-frontend-hosting.endpoint}}/auth-end.html",
141
+ type: "Web",
142
+ });
143
+ aadManifestJson.replyUrlsWithType.push({
144
+ url: "{{state.fx-resource-frontend-hosting.endpoint}}/auth-end.html?clientId={{state.fx-resource-aad-app-for-teams.clientId}}",
145
+ type: "Spa",
146
+ });
147
+ aadManifestJson.replyUrlsWithType.push({
148
+ url: "{{state.fx-resource-frontend-hosting.endpoint}}/blank-auth-end.html",
149
+ type: "Spa",
150
+ });
151
+ }
152
+ if (projectSettingsJson.solutionSettings.capabilities.includes("Bot")) {
153
+ aadManifestJson.replyUrlsWithType.push({
154
+ url: "{{state.fx-resource-bot.siteEndpoint}}/auth-end.html",
155
+ type: "Web",
156
+ });
157
+ }
158
+ await fs_extra_1.default.writeJSON(aadManifestPath, aadManifestJson, { spaces: 4, EOL: os.EOL });
159
+ fileList.push(aadManifestPath);
160
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationAddAADTemplate);
161
+ // add SSO
162
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationAddSSOCapabilityStart);
163
+ if (projectSettingsJson.solutionSettings.capabilities.includes("Tab") &&
164
+ !projectSettingsJson.solutionSettings.capabilities.includes("TabSSO")) {
165
+ projectSettingsJson.solutionSettings.capabilities.push("TabSSO");
166
+ }
167
+ if (projectSettingsJson.solutionSettings.capabilities.includes("Bot") &&
168
+ !projectSettingsJson.solutionSettings.capabilities.includes("BotSSO")) {
169
+ projectSettingsJson.solutionSettings.capabilities.push("BotSSO");
170
+ }
171
+ await fs_extra_1.default.writeJSON(projectSettingsPath, projectSettingsJson, { spaces: 4, EOL: os.EOL });
172
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationAddSSOCapability);
173
+ // backup
174
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationBackupStart);
175
+ const backupPath = path_1.default.join(inputs.projectPath, backupFolder);
176
+ await fs_extra_1.default.ensureDir(path_1.default.join(backupPath, ".fx", "configs"));
177
+ await fs_extra_1.default.move(permissionFilePath, path_1.default.join(backupPath, "permissions.json"), {
178
+ overwrite: true,
179
+ });
180
+ fileList.push(path_1.default.join(backupPath, "permissions.json"));
181
+ await fs_extra_1.default.writeJSON(path_1.default.join(backupPath, ".fx", "configs", "projectSettings.json"), projectSettings, { spaces: 4, EOL: os.EOL });
182
+ fileList.push(path_1.default.join(backupPath, ".fx", "configs", "projectSettings.json"));
183
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationBackup);
184
+ }
185
+ catch (e) {
186
+ for (const item of fileList) {
187
+ await fs_extra_1.default.remove(item);
188
+ }
189
+ await fs_extra_1.default.writeJSON(projectSettingsPath, projectSettings, { spaces: 4, EOL: os.EOL });
190
+ throw e;
191
+ }
192
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationAddAADTemplate);
193
+ postMigration(inputs);
194
+ return true;
195
+ }
196
+ function checkMethod(ctx) {
197
+ const methods = new Set(["getProjectConfig", "checkPermission"]);
198
+ if (ctx.method && methods.has(ctx.method) && userCancelFlag)
199
+ return false;
200
+ userCancelFlag = ctx.method != undefined && methods.has(ctx.method);
201
+ return true;
202
+ }
203
+ async function postMigration(inputs) {
204
+ if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
205
+ await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("info", localizeUtils_1.getLocalizedString("core.aadManifestMigration.outputMsg"), false, "OK"));
206
+ }
207
+ else {
208
+ globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.info(localizeUtils_1.getLocalizedString("core.aadManifestMigration.SuccessMessage"));
209
+ }
210
+ }
211
+ //# sourceMappingURL=aadManifestMigration.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"aadManifestMigration.js","sourceRoot":"","sources":["../../../src/core/middleware/aadManifestMigration.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,5 @@
1
1
  import { Middleware } from "@feathersjs/hooks/lib";
2
+ import { CoreHookContext } from "../types";
2
3
  export declare const ProjectConsolidateMW: Middleware;
4
+ export declare function needConsolidateLocalRemote(ctx: CoreHookContext): Promise<boolean>;
3
5
  //# sourceMappingURL=consolidateLocalRemote.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"consolidateLocalRemote.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAmCjE,eAAO,MAAM,oBAAoB,EAAE,UAyClC,CAAC"}
1
+ {"version":3,"file":"consolidateLocalRemote.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAYjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAgB3C,eAAO,MAAM,oBAAoB,EAAE,UAoBlC,CAAC;AAoCF,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAuBvF"}
@@ -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.ProjectConsolidateMW = void 0;
5
+ exports.needConsolidateLocalRemote = exports.ProjectConsolidateMW = void 0;
6
6
  const tslib_1 = require("tslib");
7
7
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
8
8
  const tools_1 = require("../../common/tools");
@@ -10,7 +10,6 @@ const environment_1 = require("../environment");
10
10
  const error_1 = require("../error");
11
11
  const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
12
12
  const path_1 = tslib_1.__importDefault(require("path"));
13
- const constants_1 = require("../../plugins/resource/appstudio/constants");
14
13
  const utils_1 = require("../../plugins/resource/appstudio/utils/utils");
15
14
  const telemetry_1 = require("../../common/telemetry");
16
15
  const globalVars_1 = require("../globalVars");
@@ -20,36 +19,27 @@ const folder_1 = require("../../folder");
20
19
  const projectSettingsLoader_1 = require("./projectSettingsLoader");
21
20
  const projectMigrator_1 = require("./projectMigrator");
22
21
  const util = tslib_1.__importStar(require("util"));
23
- const constants_2 = require("../../plugins/resource/spfx/utils/constants");
22
+ const constants_1 = require("../../plugins/resource/spfx/utils/constants");
24
23
  const upgradeButton = "Upgrade";
25
24
  let userCancelFlag = false;
26
25
  const backupFolder = ".backup";
26
+ const methods = new Set(["getProjectConfig", "checkPermission"]);
27
+ const upgradeReportName = "unify-config-change-logs.md";
27
28
  const ProjectConsolidateMW = async (ctx, next) => {
28
29
  if (await projectMigrator_1.needMigrateToArmAndMultiEnv(ctx)) {
29
30
  next();
30
31
  }
31
32
  else if ((await needConsolidateLocalRemote(ctx)) && checkMethod(ctx)) {
32
33
  telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart);
33
- const res = await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("warn", localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.Message"), true, upgradeButton));
34
- const answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
35
- if (!answer || answer != upgradeButton) {
36
- telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
37
- [telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.Cancel,
38
- });
39
- ctx.result = teamsfx_api_1.err(error_1.ConsolidateCanceledError());
40
- outputCancelMessage(ctx);
41
- return;
34
+ let showModal = true;
35
+ if (ctx.method && methods.has(ctx.method)) {
36
+ showModal = false;
42
37
  }
43
- telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
44
- [telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.OK,
45
- });
46
- try {
47
- await consolidateLocalRemote(ctx);
48
- await next();
38
+ if (showModal) {
39
+ await upgrade(ctx, next, true);
49
40
  }
50
- catch (error) {
51
- telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateError, teamsfx_api_1.assembleError(error, error_1.CoreSource));
52
- throw error;
41
+ else {
42
+ upgrade(ctx, next, false);
53
43
  }
54
44
  }
55
45
  else {
@@ -57,6 +47,29 @@ const ProjectConsolidateMW = async (ctx, next) => {
57
47
  }
58
48
  };
59
49
  exports.ProjectConsolidateMW = ProjectConsolidateMW;
50
+ async function upgrade(ctx, next, showModal) {
51
+ const res = await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("warn", localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.Message"), showModal, upgradeButton));
52
+ const answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
53
+ if (!answer || answer != upgradeButton) {
54
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
55
+ [telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.Cancel,
56
+ });
57
+ ctx.result = teamsfx_api_1.err(error_1.ConsolidateCanceledError());
58
+ outputCancelMessage(ctx);
59
+ return;
60
+ }
61
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
62
+ [telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.OK,
63
+ });
64
+ try {
65
+ await consolidateLocalRemote(ctx);
66
+ await next();
67
+ }
68
+ catch (error) {
69
+ telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateError, teamsfx_api_1.assembleError(error, error_1.CoreSource));
70
+ throw error;
71
+ }
72
+ }
60
73
  // check if config.local.json and manifest.template.json exist
61
74
  async function needConsolidateLocalRemote(ctx) {
62
75
  if (!tools_1.isConfigUnifyEnabled()) {
@@ -77,6 +90,7 @@ async function needConsolidateLocalRemote(ctx) {
77
90
  }
78
91
  return false;
79
92
  }
93
+ exports.needConsolidateLocalRemote = needConsolidateLocalRemote;
80
94
  function outputCancelMessage(ctx) {
81
95
  globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Upgrade cancelled.`);
82
96
  const inputs = ctx.arguments[ctx.arguments.length - 1];
@@ -92,6 +106,7 @@ async function consolidateLocalRemote(ctx) {
92
106
  telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateUpgradeStart);
93
107
  const inputs = ctx.arguments[ctx.arguments.length - 1];
94
108
  const fileList = [];
109
+ const removeMap = new Map();
95
110
  const loadRes = await projectSettingsLoader_1.loadProjectSettings(inputs, true);
96
111
  if (loadRes.isErr()) {
97
112
  ctx.result = teamsfx_api_1.err(loadRes.error);
@@ -111,8 +126,6 @@ async function consolidateLocalRemote(ctx) {
111
126
  telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateAddLocalEnv);
112
127
  // add consolidate manifest
113
128
  let manifest;
114
- const templatesFolder = folder_1.getTemplatesFolder();
115
- const appDir = `${ctx.root}/${constants_1.APP_PACKAGE_FOLDER_FOR_MULTI_ENV}`;
116
129
  const remoteManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.remote.template.json");
117
130
  const remoteManifestExist = await fs_extra_1.default.pathExists(remoteManifestFile);
118
131
  if (remoteManifestExist) {
@@ -125,13 +138,13 @@ async function consolidateLocalRemote(ctx) {
125
138
  if ((manifest === null || manifest === void 0 ? void 0 : manifest.staticTabs) && manifest.staticTabs.length > 0) {
126
139
  manifest.staticTabs.forEach((item) => {
127
140
  componentId = item.entityId;
128
- const contentUrl = util.format(constants_2.ManifestTemplate.REMOTE_CONTENT_URL, componentId, componentId);
141
+ const contentUrl = util.format(constants_1.ManifestTemplate.REMOTE_CONTENT_URL, componentId, componentId);
129
142
  item.contentUrl = contentUrl;
130
143
  });
131
144
  }
132
145
  if ((manifest === null || manifest === void 0 ? void 0 : manifest.configurableTabs) && manifest.configurableTabs.length > 0) {
133
146
  manifest.configurableTabs.forEach((item) => {
134
- const configurationUrl = util.format(constants_2.ManifestTemplate.REMOTE_CONFIGURATION_URL, componentId, componentId);
147
+ const configurationUrl = util.format(constants_1.ManifestTemplate.REMOTE_CONFIGURATION_URL, componentId, componentId);
135
148
  item.configurationUrl = configurationUrl;
136
149
  });
137
150
  }
@@ -146,35 +159,44 @@ async function consolidateLocalRemote(ctx) {
146
159
  }
147
160
  }
148
161
  fileList.push(path_1.default.join(inputs.projectPath, "templates", "appPackage", "template.manifest.json"));
162
+ // copy and remove old configs
163
+ const backupPath = path_1.default.join(inputs.projectPath, backupFolder);
164
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfigStart);
165
+ const localSettingsFile = path_1.default.join(inputs.projectPath, ".fx", "configs", "localSettings.json");
166
+ if (await fs_extra_1.default.pathExists(localSettingsFile)) {
167
+ await fs_extra_1.default.copy(localSettingsFile, path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), { overwrite: true });
168
+ await fs_extra_1.default.remove(localSettingsFile);
169
+ removeMap.set(path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), localSettingsFile);
170
+ }
171
+ const localManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.local.template.json");
172
+ if (await fs_extra_1.default.pathExists(localManifestFile)) {
173
+ await fs_extra_1.default.copy(localManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), { overwrite: true });
174
+ await fs_extra_1.default.remove(localManifestFile);
175
+ removeMap.set(path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), localManifestFile);
176
+ }
177
+ if (await fs_extra_1.default.pathExists(remoteManifestFile)) {
178
+ await fs_extra_1.default.copy(remoteManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.remote.template.json"), { overwrite: true });
179
+ await fs_extra_1.default.remove(remoteManifestFile);
180
+ removeMap.set(path_1.default.join(backupPath, "templates", "appPackage", "manifest.remote.template.json"), remoteManifestFile);
181
+ }
182
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfig);
183
+ telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateUpgrade);
184
+ postConsolidate(inputs.projectPath, ctx, inputs, backupFolder);
149
185
  }
150
186
  catch (e) {
187
+ for (const item of removeMap.entries()) {
188
+ await fs_extra_1.default.copy(item[0], item[1]);
189
+ }
151
190
  for (const item of fileList) {
152
191
  await fs_extra_1.default.remove(item);
153
192
  }
193
+ await fs_extra_1.default.remove(path_1.default.join(inputs.projectPath, backupFolder));
154
194
  throw e;
155
195
  }
156
- // move old configs
157
- const backupPath = path_1.default.join(inputs.projectPath, backupFolder);
158
- telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfigStart);
159
- const localSettingsFile = path_1.default.join(inputs.projectPath, ".fx", "configs", "localSettings.json");
160
- if (await fs_extra_1.default.pathExists(localSettingsFile)) {
161
- await fs_extra_1.default.move(localSettingsFile, path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), { overwrite: true });
162
- }
163
- const localManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.local.template.json");
164
- if (await fs_extra_1.default.pathExists(localManifestFile)) {
165
- await fs_extra_1.default.move(localManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), { overwrite: true });
166
- }
167
- const remoteManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.remote.template.json");
168
- if (await fs_extra_1.default.pathExists(remoteManifestFile)) {
169
- await fs_extra_1.default.move(remoteManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.remote.template.json"), { overwrite: true });
170
- }
171
- telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfig);
172
- telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateUpgrade);
173
- postConsolidate(inputs.projectPath, ctx, inputs, backupFolder);
196
+ generateUpgradeReport(path_1.default.join(inputs.projectPath, backupFolder));
174
197
  return true;
175
198
  }
176
199
  function checkMethod(ctx) {
177
- const methods = new Set(["getProjectConfig", "checkPermission"]);
178
200
  if (ctx.method && methods.has(ctx.method) && userCancelFlag)
179
201
  return false;
180
202
  userCancelFlag = ctx.method != undefined && methods.has(ctx.method);
@@ -184,20 +206,27 @@ async function postConsolidate(projectPath, ctx, inputs, backupFolder) {
184
206
  telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateGuideStart);
185
207
  await updateGitIgnore(projectPath, globalVars_1.TOOLS.logProvider, backupFolder);
186
208
  globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Upgrade success! Old localSettings.json, manifest.local.template.json and manifest.remote.template.json have been backed up to the .backup folder and you can delete it.`);
187
- if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
188
- await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("info", localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.outputMsg"), false, "OK"));
189
- }
190
- else {
209
+ if (inputs.platform !== teamsfx_api_1.Platform.VSCode) {
191
210
  globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.info(localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.SuccessMessage"));
192
211
  }
193
212
  }
194
213
  async function updateGitIgnore(projectPath, log, backupFolder) {
195
214
  // add config.local.json to .gitignore
196
- await projectMigrator_1.addPathToGitignore(projectPath, `.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/config.local.json`, log);
215
+ await projectMigrator_1.addPathToGitignore(projectPath, `${projectPath}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/config.local.json`, log);
197
216
  // add state.local.json to .gitignore
198
- await projectMigrator_1.addPathToGitignore(projectPath, `.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.StatesFolderName}/state.local.json`, log);
217
+ await projectMigrator_1.addPathToGitignore(projectPath, `${projectPath}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.StatesFolderName}/state.local.json`, log);
199
218
  if (backupFolder) {
200
- await projectMigrator_1.addPathToGitignore(projectPath, backupFolder, log);
219
+ await projectMigrator_1.addPathToGitignore(projectPath, `${projectPath}/${backupFolder}`, log);
220
+ }
221
+ }
222
+ async function generateUpgradeReport(backupFolder) {
223
+ try {
224
+ const target = path_1.default.join(backupFolder, upgradeReportName);
225
+ const source = path_1.default.resolve(path_1.default.join(folder_1.getResourceFolder(), upgradeReportName));
226
+ await fs_extra_1.default.copyFile(source, target);
227
+ }
228
+ catch (error) {
229
+ // do nothing
201
230
  }
202
231
  }
203
232
  //# sourceMappingURL=consolidateLocalRemote.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"consolidateLocalRemote.js","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"consolidateLocalRemote.js","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"questionModel.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"questionModel.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"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"}
@@ -326,9 +326,18 @@ async function getQuestionsForCreateProjectV2(inputs) {
326
326
  }
327
327
  // Language
328
328
  const programmingLanguage = new teamsfx_api_1.QTreeNode(question_2.ProgrammingLanguageQuestion);
329
- programmingLanguage.condition = { minItems: 1 };
330
- createNew.addChild(programmingLanguage);
329
+ programmingLanguage.condition = {
330
+ minItems: 1,
331
+ excludes: question_1.ExistingTabOptionItem.id,
332
+ };
333
+ capNode.addChild(programmingLanguage);
331
334
  createNewM365.addChild(programmingLanguage);
335
+ // existing tab endpoint
336
+ const existingTabEndpoint = new teamsfx_api_1.QTreeNode(question_2.ExistingTabEndpointQuestion);
337
+ existingTabEndpoint.condition = {
338
+ contains: question_1.ExistingTabOptionItem.id,
339
+ };
340
+ capNode.addChild(existingTabEndpoint);
332
341
  // only CLI need folder input
333
342
  if (teamsfx_api_1.CLIPlatforms.includes(inputs.platform)) {
334
343
  createNew.addChild(new teamsfx_api_1.QTreeNode(question_2.QuestionRootFolder));