@microsoft/teamsfx-core 1.22.1-alpha.d2fbcaf19.0 → 1.22.1-alpha.ecf7bf89a.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 (381) hide show
  1. package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
  2. package/build/common/deps-checker/checkerFactory.js +2 -0
  3. package/build/common/deps-checker/checkerFactory.js.map +1 -1
  4. package/build/common/deps-checker/constant/helpLink.d.ts +1 -0
  5. package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -1
  6. package/build/common/deps-checker/constant/helpLink.js +2 -1
  7. package/build/common/deps-checker/constant/helpLink.js.map +1 -1
  8. package/build/common/deps-checker/constant/message.d.ts +2 -1
  9. package/build/common/deps-checker/constant/message.d.ts.map +1 -1
  10. package/build/common/deps-checker/constant/message.js +4 -1
  11. package/build/common/deps-checker/constant/message.js.map +1 -1
  12. package/build/common/deps-checker/constant/telemetry.d.ts +1 -0
  13. package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
  14. package/build/common/deps-checker/constant/telemetry.js +1 -0
  15. package/build/common/deps-checker/constant/telemetry.js.map +1 -1
  16. package/build/common/deps-checker/depsChecker.d.ts +5 -1
  17. package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
  18. package/build/common/deps-checker/depsChecker.js +1 -0
  19. package/build/common/deps-checker/depsChecker.js.map +1 -1
  20. package/build/common/deps-checker/depsError.d.ts +4 -1
  21. package/build/common/deps-checker/depsError.d.ts.map +1 -1
  22. package/build/common/deps-checker/depsError.js +11 -4
  23. package/build/common/deps-checker/depsError.js.map +1 -1
  24. package/build/common/deps-checker/internal/funcToolChecker.d.ts +13 -7
  25. package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
  26. package/build/common/deps-checker/internal/funcToolChecker.js +75 -44
  27. package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
  28. package/build/common/deps-checker/internal/nodeChecker.d.ts +17 -6
  29. package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
  30. package/build/common/deps-checker/internal/nodeChecker.js +44 -22
  31. package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
  32. package/build/common/deps-checker/internal/vxTestAppChecker.d.ts +3 -3
  33. package/build/common/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -1
  34. package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
  35. package/build/common/m365/packageService.d.ts +1 -1
  36. package/build/common/m365/packageService.d.ts.map +1 -1
  37. package/build/common/m365/packageService.js +7 -4
  38. package/build/common/m365/packageService.js.map +1 -1
  39. package/build/common/m365/serviceConstant.d.ts +2 -2
  40. package/build/common/m365/serviceConstant.d.ts.map +1 -1
  41. package/build/common/m365/serviceConstant.js +2 -2
  42. package/build/common/m365/serviceConstant.js.map +1 -1
  43. package/build/common/projectSettingsHelper.d.ts.map +1 -1
  44. package/build/common/projectSettingsHelper.js +4 -2
  45. package/build/common/projectSettingsHelper.js.map +1 -1
  46. package/build/common/samples-config-v3.json +12 -22
  47. package/build/common/samples-config.json +1 -1
  48. package/build/common/tools.d.ts.map +1 -1
  49. package/build/common/tools.js +7 -4
  50. package/build/common/tools.js.map +1 -1
  51. package/build/common/versionMetadata.d.ts +23 -0
  52. package/build/common/versionMetadata.d.ts.map +1 -1
  53. package/build/common/versionMetadata.js +22 -2
  54. package/build/common/versionMetadata.js.map +1 -1
  55. package/build/component/configManager/error.d.ts +3 -0
  56. package/build/component/configManager/error.d.ts.map +1 -1
  57. package/build/component/configManager/error.js +15 -1
  58. package/build/component/configManager/error.js.map +1 -1
  59. package/build/component/configManager/interface.d.ts +2 -0
  60. package/build/component/configManager/interface.d.ts.map +1 -1
  61. package/build/component/configManager/interface.js.map +1 -1
  62. package/build/component/configManager/parser.d.ts +1 -0
  63. package/build/component/configManager/parser.d.ts.map +1 -1
  64. package/build/component/configManager/parser.js +14 -3
  65. package/build/component/configManager/parser.js.map +1 -1
  66. package/build/component/constant/commonConstant.d.ts +9 -1
  67. package/build/component/constant/commonConstant.d.ts.map +1 -1
  68. package/build/component/constant/commonConstant.js +8 -0
  69. package/build/component/constant/commonConstant.js.map +1 -1
  70. package/build/component/constant/deployConstant.d.ts +5 -0
  71. package/build/component/constant/deployConstant.d.ts.map +1 -1
  72. package/build/component/constant/deployConstant.js +19 -1
  73. package/build/component/constant/deployConstant.js.map +1 -1
  74. package/build/component/constants.d.ts +8 -0
  75. package/build/component/constants.d.ts.map +1 -1
  76. package/build/component/constants.js +12 -4
  77. package/build/component/constants.js.map +1 -1
  78. package/build/component/coordinator/index.d.ts +0 -1
  79. package/build/component/coordinator/index.d.ts.map +1 -1
  80. package/build/component/coordinator/index.js +78 -62
  81. package/build/component/coordinator/index.js.map +1 -1
  82. package/build/component/coordinator/summary.d.ts +13 -2
  83. package/build/component/coordinator/summary.d.ts.map +1 -1
  84. package/build/component/coordinator/summary.js +2 -2
  85. package/build/component/coordinator/summary.js.map +1 -1
  86. package/build/component/debugHandler/bot.d.ts.map +1 -1
  87. package/build/component/debugHandler/bot.js +5 -1
  88. package/build/component/debugHandler/bot.js.map +1 -1
  89. package/build/component/developerPortalScaffoldUtils.d.ts +1 -0
  90. package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
  91. package/build/component/developerPortalScaffoldUtils.js +5 -7
  92. package/build/component/developerPortalScaffoldUtils.js.map +1 -1
  93. package/build/component/driver/aad/error/missingEnvError.d.ts.map +1 -1
  94. package/build/component/driver/aad/error/missingEnvError.js +2 -2
  95. package/build/component/driver/aad/error/missingEnvError.js.map +1 -1
  96. package/build/component/driver/aad/error/missingEnvInFileError.d.ts +5 -0
  97. package/build/component/driver/aad/error/missingEnvInFileError.d.ts.map +1 -0
  98. package/build/component/driver/aad/error/missingEnvInFileError.js +33 -0
  99. package/build/component/driver/aad/error/missingEnvInFileError.js.map +1 -0
  100. package/build/component/driver/aad/interface/updateAadAppArgs.d.ts +1 -1
  101. package/build/component/driver/aad/interface/updateAadAppArgs.d.ts.map +1 -1
  102. package/build/component/driver/aad/update.js +4 -4
  103. package/build/component/driver/aad/update.js.map +1 -1
  104. package/build/component/driver/aad/utility/buildAadManifest.d.ts +1 -1
  105. package/build/component/driver/aad/utility/buildAadManifest.d.ts.map +1 -1
  106. package/build/component/driver/aad/utility/buildAadManifest.js +7 -10
  107. package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
  108. package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts +5 -11
  109. package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts.map +1 -1
  110. package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js +22 -47
  111. package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map +1 -1
  112. package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts +5 -14
  113. package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts.map +1 -1
  114. package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js +23 -45
  115. package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
  116. package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts +6 -2
  117. package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts.map +1 -1
  118. package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +21 -13
  119. package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
  120. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts +45 -0
  121. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -0
  122. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +150 -0
  123. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -0
  124. package/build/component/driver/deploy/azure/{azureDeployDriver.d.ts → impl/azureDeployImpl.d.ts} +7 -31
  125. package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -0
  126. package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +146 -0
  127. package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -0
  128. package/build/component/driver/deploy/azure/impl/baseDeployImpl.d.ts +42 -0
  129. package/build/component/driver/deploy/azure/impl/baseDeployImpl.d.ts.map +1 -0
  130. package/build/component/driver/deploy/azure/{baseDeployDriver.js → impl/baseDeployImpl.js} +47 -33
  131. package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -0
  132. package/build/component/driver/deploy/azure/impl/progressBarHelper.d.ts +3 -0
  133. package/build/component/driver/deploy/azure/impl/progressBarHelper.d.ts.map +1 -0
  134. package/build/component/driver/deploy/azure/impl/progressBarHelper.js +15 -0
  135. package/build/component/driver/deploy/azure/impl/progressBarHelper.js.map +1 -0
  136. package/build/component/driver/file/updateEnv.js +1 -1
  137. package/build/component/driver/file/updateEnv.js.map +1 -1
  138. package/build/component/driver/file/{appsettingsGenerate.d.ts → updateJson.d.ts} +2 -2
  139. package/build/component/driver/file/updateJson.d.ts.map +1 -0
  140. package/build/component/driver/file/{appsettingsGenerate.js → updateJson.js} +12 -14
  141. package/build/component/driver/file/updateJson.js.map +1 -0
  142. package/build/component/driver/index.d.ts +2 -1
  143. package/build/component/driver/index.d.ts.map +1 -1
  144. package/build/component/driver/index.js +2 -1
  145. package/build/component/driver/index.js.map +1 -1
  146. package/build/component/driver/m365/acquire.d.ts +15 -0
  147. package/build/component/driver/m365/acquire.d.ts.map +1 -0
  148. package/build/component/driver/m365/acquire.js +104 -0
  149. package/build/component/driver/m365/acquire.js.map +1 -0
  150. package/build/component/driver/m365/error/FileNotFoundUserError.d.ts +5 -0
  151. package/build/component/driver/m365/error/FileNotFoundUserError.d.ts.map +1 -0
  152. package/build/component/driver/m365/error/FileNotFoundUserError.js +22 -0
  153. package/build/component/driver/m365/error/FileNotFoundUserError.js.map +1 -0
  154. package/build/component/driver/m365/error/invalidParameterUserError.d.ts +5 -0
  155. package/build/component/driver/m365/error/invalidParameterUserError.d.ts.map +1 -0
  156. package/build/component/driver/m365/error/invalidParameterUserError.js +29 -0
  157. package/build/component/driver/m365/error/invalidParameterUserError.js.map +1 -0
  158. package/build/component/driver/m365/error/unhandledError.d.ts +5 -0
  159. package/build/component/driver/m365/error/unhandledError.d.ts.map +1 -0
  160. package/build/component/driver/m365/error/unhandledError.js +25 -0
  161. package/build/component/driver/m365/error/unhandledError.js.map +1 -0
  162. package/build/component/generator/generator.js +2 -2
  163. package/build/component/generator/generator.js.map +1 -1
  164. package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
  165. package/build/component/generator/officeAddin/generator.js +12 -4
  166. package/build/component/generator/officeAddin/generator.js.map +1 -1
  167. package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
  168. package/build/component/generator/officeAddin/helperMethods.js +3 -7
  169. package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
  170. package/build/component/generator/officeAddin/question.d.ts +1 -2
  171. package/build/component/generator/officeAddin/question.d.ts.map +1 -1
  172. package/build/component/generator/officeAddin/question.js +1 -10
  173. package/build/component/generator/officeAddin/question.js.map +1 -1
  174. package/build/component/generator/spfxGenerator.d.ts.map +1 -1
  175. package/build/component/generator/spfxGenerator.js +5 -4
  176. package/build/component/generator/spfxGenerator.js.map +1 -1
  177. package/build/component/messages.d.ts +11 -11
  178. package/build/component/messages.d.ts.map +1 -1
  179. package/build/component/messages.js +11 -11
  180. package/build/component/messages.js.map +1 -1
  181. package/build/component/middleware/envMW.d.ts.map +1 -1
  182. package/build/component/middleware/envMW.js +15 -19
  183. package/build/component/middleware/envMW.js.map +1 -1
  184. package/build/component/question.d.ts.map +1 -1
  185. package/build/component/question.js +7 -16
  186. package/build/component/question.js.map +1 -1
  187. package/build/component/resource/appManifest/appStudioClient.d.ts +1 -0
  188. package/build/component/resource/appManifest/appStudioClient.d.ts.map +1 -1
  189. package/build/component/resource/appManifest/appStudioClient.js +17 -7
  190. package/build/component/resource/appManifest/appStudioClient.js.map +1 -1
  191. package/build/component/resource/appManifest/constants.d.ts +6 -0
  192. package/build/component/resource/appManifest/constants.d.ts.map +1 -1
  193. package/build/component/resource/appManifest/constants.js +3 -0
  194. package/build/component/resource/appManifest/constants.js.map +1 -1
  195. package/build/component/resource/appManifest/utils/ManifestUtils.d.ts.map +1 -1
  196. package/build/component/resource/appManifest/utils/ManifestUtils.js +6 -2
  197. package/build/component/resource/appManifest/utils/ManifestUtils.js.map +1 -1
  198. package/build/component/resource/appManifest/utils/utils.d.ts.map +1 -1
  199. package/build/component/resource/appManifest/utils/utils.js +15 -8
  200. package/build/component/resource/appManifest/utils/utils.js.map +1 -1
  201. package/build/component/resource/azureAppService/azureAppService.js +1 -1
  202. package/build/component/resource/azureAppService/azureAppService.js.map +1 -1
  203. package/build/component/resource/botService/appStudio/appStudioClient.d.ts +5 -1
  204. package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
  205. package/build/component/resource/botService/appStudio/appStudioClient.js +69 -46
  206. package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
  207. package/build/component/resource/botService/botService.d.ts +3 -0
  208. package/build/component/resource/botService/botService.d.ts.map +1 -1
  209. package/build/component/resource/botService/botService.js +7 -4
  210. package/build/component/resource/botService/botService.js.map +1 -1
  211. package/build/component/resource/botService/common.d.ts +2 -0
  212. package/build/component/resource/botService/common.d.ts.map +1 -1
  213. package/build/component/resource/botService/common.js +8 -1
  214. package/build/component/resource/botService/common.js.map +1 -1
  215. package/build/component/resource/botService/constants.d.ts +7 -1
  216. package/build/component/resource/botService/constants.d.ts.map +1 -1
  217. package/build/component/resource/botService/constants.js +7 -1
  218. package/build/component/resource/botService/constants.js.map +1 -1
  219. package/build/component/resource/botService/errors.d.ts +9 -0
  220. package/build/component/resource/botService/errors.d.ts.map +1 -1
  221. package/build/component/resource/botService/errors.js +22 -1
  222. package/build/component/resource/botService/errors.js.map +1 -1
  223. package/build/component/resource/botService/messages.d.ts +5 -1
  224. package/build/component/resource/botService/messages.d.ts.map +1 -1
  225. package/build/component/resource/botService/messages.js +17 -25
  226. package/build/component/resource/botService/messages.js.map +1 -1
  227. package/build/component/resource/botService/retryHandler.d.ts.map +1 -1
  228. package/build/component/resource/botService/retryHandler.js +6 -1
  229. package/build/component/resource/botService/retryHandler.js.map +1 -1
  230. package/build/component/utils/envUtil.d.ts +19 -0
  231. package/build/component/utils/envUtil.d.ts.map +1 -1
  232. package/build/component/utils/envUtil.js +54 -11
  233. package/build/component/utils/envUtil.js.map +1 -1
  234. package/build/component/utils/pathUtils.d.ts +10 -0
  235. package/build/component/utils/pathUtils.d.ts.map +1 -0
  236. package/build/component/utils/pathUtils.js +52 -0
  237. package/build/component/utils/pathUtils.js.map +1 -0
  238. package/build/component/utils/settingsUtil.d.ts.map +1 -1
  239. package/build/component/utils/settingsUtil.js +31 -13
  240. package/build/component/utils/settingsUtil.js.map +1 -1
  241. package/build/core/FxCoreImplementV3.d.ts.map +1 -1
  242. package/build/core/FxCoreImplementV3.js +31 -11
  243. package/build/core/FxCoreImplementV3.js.map +1 -1
  244. package/build/core/environment.d.ts +1 -1
  245. package/build/core/environment.d.ts.map +1 -1
  246. package/build/core/environment.js +20 -6
  247. package/build/core/environment.js.map +1 -1
  248. package/build/core/error.d.ts +2 -1
  249. package/build/core/error.d.ts.map +1 -1
  250. package/build/core/error.js +7 -3
  251. package/build/core/error.js.map +1 -1
  252. package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
  253. package/build/core/middleware/concurrentLocker.js +1 -1
  254. package/build/core/middleware/concurrentLocker.js.map +1 -1
  255. package/build/core/middleware/envInfoLoaderV3.js +2 -2
  256. package/build/core/middleware/envInfoLoaderV3.js.map +1 -1
  257. package/build/core/middleware/projectMigratorV3.d.ts +12 -1
  258. package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
  259. package/build/core/middleware/projectMigratorV3.js +59 -82
  260. package/build/core/middleware/projectMigratorV3.js.map +1 -1
  261. package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
  262. package/build/core/middleware/projectSettingsLoader.js +13 -13
  263. package/build/core/middleware/projectSettingsLoader.js.map +1 -1
  264. package/build/core/middleware/projectSettingsWriter.d.ts.map +1 -1
  265. package/build/core/middleware/projectSettingsWriter.js +1 -10
  266. package/build/core/middleware/projectSettingsWriter.js.map +1 -1
  267. package/build/core/middleware/projectVersionChecker.d.ts.map +1 -1
  268. package/build/core/middleware/projectVersionChecker.js +23 -10
  269. package/build/core/middleware/projectVersionChecker.js.map +1 -1
  270. package/build/core/middleware/types.d.ts +2 -1
  271. package/build/core/middleware/types.d.ts.map +1 -1
  272. package/build/core/middleware/utils/appYmlGenerator.d.ts +2 -0
  273. package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
  274. package/build/core/middleware/utils/appYmlGenerator.js +12 -4
  275. package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
  276. package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts +13 -0
  277. package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts.map +1 -1
  278. package/build/core/middleware/utils/debug/appLocalYmlGenerator.js.map +1 -1
  279. package/build/core/middleware/utils/debug/debugV3MigrationUtils.d.ts +2 -3
  280. package/build/core/middleware/utils/debug/debugV3MigrationUtils.d.ts.map +1 -1
  281. package/build/core/middleware/utils/debug/debugV3MigrationUtils.js +17 -20
  282. package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
  283. package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
  284. package/build/core/middleware/utils/debug/taskMigrator.js +28 -224
  285. package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
  286. package/build/core/middleware/utils/migrationContext.d.ts +2 -2
  287. package/build/core/middleware/utils/migrationContext.d.ts.map +1 -1
  288. package/build/core/middleware/utils/migrationContext.js +9 -10
  289. package/build/core/middleware/utils/migrationContext.js.map +1 -1
  290. package/build/core/middleware/utils/v3MigrationUtils.d.ts +4 -4
  291. package/build/core/middleware/utils/v3MigrationUtils.d.ts.map +1 -1
  292. package/build/core/middleware/utils/v3MigrationUtils.js +33 -11
  293. package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
  294. package/build/core/question.d.ts +4 -1
  295. package/build/core/question.d.ts.map +1 -1
  296. package/build/core/question.js +13 -15
  297. package/build/core/question.js.map +1 -1
  298. package/build/core/types.d.ts +1 -0
  299. package/build/core/types.d.ts.map +1 -1
  300. package/package.json +13 -6
  301. package/resource/package.nls.cs.json +63 -44
  302. package/resource/package.nls.de.json +63 -44
  303. package/resource/package.nls.es.json +63 -44
  304. package/resource/package.nls.fr.json +63 -44
  305. package/resource/package.nls.it.json +63 -44
  306. package/resource/package.nls.ja.json +63 -44
  307. package/resource/package.nls.json +58 -38
  308. package/resource/package.nls.ko.json +63 -44
  309. package/resource/package.nls.pl.json +63 -44
  310. package/resource/package.nls.pt-BR.json +63 -44
  311. package/resource/package.nls.ru.json +63 -44
  312. package/resource/package.nls.tr.json +63 -44
  313. package/resource/package.nls.zh-Hans.json +63 -44
  314. package/resource/package.nls.zh-Hant.json +63 -44
  315. package/templates/bicep/azureWebApp.provision.module.bicep +1 -1
  316. package/templates/core/v3Migration/csharp.app.local.yml +6 -6
  317. package/templates/core/v3Migration/csharp.app.yml +11 -7
  318. package/templates/core/v3Migration/js.ts.app.local.yml +120 -24
  319. package/templates/core/v3Migration/js.ts.app.yml +10 -6
  320. package/templates/core/v3Migration/spfx.app.yml +7 -5
  321. package/templates/core/v3Migration/upgradeReport.md +36 -0
  322. package/templates/fallback/bot.csharp.command-and-response.zip +0 -0
  323. package/templates/fallback/bot.csharp.default.zip +0 -0
  324. package/templates/fallback/bot.csharp.notification-function-base.zip +0 -0
  325. package/templates/fallback/bot.csharp.notification-trigger-http.zip +0 -0
  326. package/templates/fallback/bot.csharp.notification-trigger-timer.zip +0 -0
  327. package/templates/fallback/bot.csharp.notification-webapi.zip +0 -0
  328. package/templates/fallback/bot.csharp.workflow.zip +0 -0
  329. package/templates/fallback/bot.js.command-and-response.zip +0 -0
  330. package/templates/fallback/bot.js.default.zip +0 -0
  331. package/templates/fallback/bot.js.m365.zip +0 -0
  332. package/templates/fallback/bot.js.notification-function-base.zip +0 -0
  333. package/templates/fallback/bot.js.notification-restify.zip +0 -0
  334. package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
  335. package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
  336. package/templates/fallback/bot.js.workflow.zip +0 -0
  337. package/templates/fallback/bot.ts.command-and-response.zip +0 -0
  338. package/templates/fallback/bot.ts.default.zip +0 -0
  339. package/templates/fallback/bot.ts.m365.zip +0 -0
  340. package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
  341. package/templates/fallback/bot.ts.notification-restify.zip +0 -0
  342. package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
  343. package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
  344. package/templates/fallback/bot.ts.workflow.zip +0 -0
  345. package/templates/fallback/common.zip +0 -0
  346. package/templates/fallback/csharp.zip +0 -0
  347. package/templates/fallback/function-base.js.default.zip +0 -0
  348. package/templates/fallback/function-base.ts.default.zip +0 -0
  349. package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
  350. package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
  351. package/templates/fallback/js.zip +0 -0
  352. package/templates/fallback/tab.csharp.default.zip +0 -0
  353. package/templates/fallback/tab.csharp.non-sso.zip +0 -0
  354. package/templates/fallback/tab.js.dashboard.zip +0 -0
  355. package/templates/fallback/tab.js.default.zip +0 -0
  356. package/templates/fallback/tab.js.m365.zip +0 -0
  357. package/templates/fallback/tab.js.non-sso.zip +0 -0
  358. package/templates/fallback/tab.ts.dashboard.zip +0 -0
  359. package/templates/fallback/tab.ts.default.zip +0 -0
  360. package/templates/fallback/tab.ts.m365.zip +0 -0
  361. package/templates/fallback/tab.ts.non-sso.zip +0 -0
  362. package/templates/fallback/ts.zip +0 -0
  363. package/templates/plugins/resource/aad/auth/bot/README.md +6 -6
  364. package/templates/plugins/resource/aad/auth/bot/README.txt +36 -3
  365. package/templates/plugins/resource/apim/README.md +1 -1
  366. package/templates/plugins/resource/bot/bicep/botProvision.template.bicep +1 -1
  367. package/templates/plugins/resource/hosting/bicep/webapp/webappProvision.template.bicep +1 -1
  368. package/templates/plugins/resource/spfx/solution/README.md +1 -1
  369. package/build/component/driver/deploy/azure/azureDeployDriver.d.ts.map +0 -1
  370. package/build/component/driver/deploy/azure/azureDeployDriver.js +0 -237
  371. package/build/component/driver/deploy/azure/azureDeployDriver.js.map +0 -1
  372. package/build/component/driver/deploy/azure/baseDeployDriver.d.ts +0 -25
  373. package/build/component/driver/deploy/azure/baseDeployDriver.d.ts.map +0 -1
  374. package/build/component/driver/deploy/azure/baseDeployDriver.js.map +0 -1
  375. package/build/component/driver/file/appsettingsGenerate.d.ts.map +0 -1
  376. package/build/component/driver/file/appsettingsGenerate.js.map +0 -1
  377. package/build/component/driver/interface/baseDeployStepDriver.d.ts +0 -19
  378. package/build/component/driver/interface/baseDeployStepDriver.d.ts.map +0 -1
  379. package/build/component/driver/interface/baseDeployStepDriver.js +0 -30
  380. package/build/component/driver/interface/baseDeployStepDriver.js.map +0 -1
  381. package/templates/core/v3Migration/migrationReport.md +0 -37
@@ -1,8 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isHttpCodeOkOrCreated = exports.genUUID = void 0;
3
+ exports.isHappyResponse = exports.isHttpCodeOkOrCreated = exports.genUUID = void 0;
4
4
  // Copyright (c) Microsoft Corporation.
5
5
  // Licensed under the MIT license.
6
+ /**
7
+ * @author zhijie <zhihuan@microsoft.com>
8
+ */
6
9
  const node_ts_uuid_1 = require("node-ts-uuid");
7
10
  function genUUID() {
8
11
  return node_ts_uuid_1.Uuid.generate();
@@ -12,4 +15,8 @@ function isHttpCodeOkOrCreated(code) {
12
15
  return [200, 201].includes(code);
13
16
  }
14
17
  exports.isHttpCodeOkOrCreated = isHttpCodeOkOrCreated;
18
+ function isHappyResponse(response) {
19
+ return response && response.data && isHttpCodeOkOrCreated(response.status);
20
+ }
21
+ exports.isHappyResponse = isHappyResponse;
15
22
  //# sourceMappingURL=common.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/common.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,+CAAoC;AAEpC,SAAgB,OAAO;IACrB,OAAO,mBAAI,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC;AAFD,0BAEC;AAED,SAAgB,qBAAqB,CAAC,IAAY;IAChD,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAFD,sDAEC"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/common.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;AACH,+CAAoC;AAGpC,SAAgB,OAAO;IACrB,OAAO,mBAAI,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC;AAFD,0BAEC;AAED,SAAgB,qBAAqB,CAAC,IAAY;IAChD,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAFD,sDAEC;AAED,SAAgB,eAAe,CAAC,QAAwC;IACtE,OAAO,QAAQ,IAAI,QAAQ,CAAC,IAAI,IAAI,qBAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC7E,CAAC;AAFD,0CAEC"}
@@ -1,3 +1,6 @@
1
+ /**
2
+ * @author zhijie <zhihuan@microsoft.com>
3
+ */
1
4
  export declare class RegularExprs {
2
5
  static readonly CHARS_TO_BE_SKIPPED: RegExp;
3
6
  }
@@ -6,7 +9,7 @@ export declare class AADRegistrationConstants {
6
9
  static readonly AZURE_AD_MULTIPLE_ORGS: string;
7
10
  }
8
11
  export declare class Retry {
9
- static readonly RETRY_TIMES = 10;
12
+ static readonly RETRY_TIMES = 6;
10
13
  static readonly BACKOFF_TIME_MS = 5000;
11
14
  }
12
15
  export declare class ErrorNames {
@@ -20,6 +23,9 @@ export declare class ErrorNames {
20
23
  static readonly CALL_APPSTUDIO_API_ERROR = "CallAppStudioAPIError";
21
24
  static readonly CREATE_BOT_REGISTRATION_API_ERROR = "CreateBotRegistrationApiError";
22
25
  static readonly PACK_DIR_EXISTENCE_ERROR = "PackDirectoryExistenceError";
26
+ static readonly ACQUIRE_BOT_FRAMEWORK_TOKEN_ERROR = "AcquireBotFrameworkTokenError";
27
+ static readonly FORBIDDEN_RESULT_BOT_FRAMEWORK_ERROR = "ForbiddenResultBotFrameworkError";
28
+ static readonly CONFLICT_RESULT_BOT_FRAMEWORK_ERROR = "ConflictResultBotFrameworkError";
23
29
  }
24
30
  export declare class Links {
25
31
  static readonly ISSUE_LINK = "https://github.com/OfficeDev/TeamsFx/issues/new";
@@ -1 +1 @@
1
- {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/botService/constants.ts"],"names":[],"mappings":"AAGA,qBAAa,YAAY;IACvB,gBAAuB,mBAAmB,EAAE,MAAM,CAAkB;CACrE;AAED,qBAAa,wBAAwB;IACnC,gBAAuB,mBAAmB,EAAE,MAAM,CAAsC;IACxF,gBAAuB,sBAAsB,EAAE,MAAM,CAAyB;CAC/E;AAED,qBAAa,KAAK;IAChB,gBAAuB,WAAW,MAAM;IACxC,gBAAuB,eAAe,QAAQ;CAC/C;AAED,qBAAa,UAAU;IAErB,gBAAuB,kBAAkB,uBAAuB;IAChE,gBAAuB,eAAe,oBAAoB;IAC1D,gBAAuB,qBAAqB,yBAAyB;IACrE,gBAAuB,uBAAuB,2BAA2B;IACzE,gBAAuB,+BAA+B,kCAAkC;IACxF,gBAAuB,2BAA2B,kCAAkC;IACpF,gBAAuB,uBAAuB,2BAA2B;IACzE,gBAAuB,wBAAwB,2BAA2B;IAC1E,gBAAuB,iCAAiC,mCAAmC;IAG3F,gBAAuB,wBAAwB,iCAAiC;CACjF;AAED,qBAAa,KAAK;IAChB,gBAAuB,UAAU,qDAAqD;IACtF,gBAAuB,SAAS,qCAAqC;CACtE;AAED,qBAAa,KAAK;IAChB,gBAAuB,gBAAgB,QAAQ;IAC/C,gBAAuB,YAAY,SAAS;CAC7C;AAED,qBAAa,UAAU;IACrB,gBAAuB,gBAAgB,OAAO;CAC/C;AAED,qBAAa,aAAa;IACxB,gBAAuB,SAAS,eAAe;IAC/C,gBAAuB,OAAO,aAAa;IAC3C,gBAAuB,SAAS,gBAAgB;IAChD,gBAAuB,YAAY,mBAAmB;IACtD,gBAAuB,SAAS,gBAAgB;IAChD,gBAAuB,KAAK,WAAW;IACvC,gBAAuB,QAAQ,mBAAmB;IAClD,gBAAuB,eAAe,sBAAsB;IAC5D,gBAAuB,UAAU,iBAAiB;IAClD,gBAAuB,GAAG,SAAS;IACnC,gBAAuB,MAAM,YAAY;CAC1C"}
1
+ {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/botService/constants.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,qBAAa,YAAY;IACvB,gBAAuB,mBAAmB,EAAE,MAAM,CAAkB;CACrE;AAED,qBAAa,wBAAwB;IACnC,gBAAuB,mBAAmB,EAAE,MAAM,CAAsC;IACxF,gBAAuB,sBAAsB,EAAE,MAAM,CAAyB;CAC/E;AAED,qBAAa,KAAK;IAChB,gBAAuB,WAAW,KAAK;IACvC,gBAAuB,eAAe,QAAQ;CAC/C;AAED,qBAAa,UAAU;IAErB,gBAAuB,kBAAkB,uBAAuB;IAChE,gBAAuB,eAAe,oBAAoB;IAC1D,gBAAuB,qBAAqB,yBAAyB;IACrE,gBAAuB,uBAAuB,2BAA2B;IACzE,gBAAuB,+BAA+B,kCAAkC;IACxF,gBAAuB,2BAA2B,kCAAkC;IACpF,gBAAuB,uBAAuB,2BAA2B;IACzE,gBAAuB,wBAAwB,2BAA2B;IAC1E,gBAAuB,iCAAiC,mCAAmC;IAG3F,gBAAuB,wBAAwB,iCAAiC;IAChF,gBAAuB,iCAAiC,mCAAmC;IAC3F,gBAAuB,oCAAoC,sCAAsC;IACjG,gBAAuB,mCAAmC,qCAAqC;CAChG;AAED,qBAAa,KAAK;IAChB,gBAAuB,UAAU,qDAAqD;IACtF,gBAAuB,SAAS,qCAAqC;CACtE;AAED,qBAAa,KAAK;IAChB,gBAAuB,gBAAgB,QAAQ;IAC/C,gBAAuB,YAAY,SAAS;CAC7C;AAED,qBAAa,UAAU;IACrB,gBAAuB,gBAAgB,OAAO;CAC/C;AAED,qBAAa,aAAa;IACxB,gBAAuB,SAAS,eAAe;IAC/C,gBAAuB,OAAO,aAAa;IAC3C,gBAAuB,SAAS,gBAAgB;IAChD,gBAAuB,YAAY,mBAAmB;IACtD,gBAAuB,SAAS,gBAAgB;IAChD,gBAAuB,KAAK,WAAW;IACvC,gBAAuB,QAAQ,mBAAmB;IAClD,gBAAuB,eAAe,sBAAsB;IAC5D,gBAAuB,UAAU,iBAAiB;IAClD,gBAAuB,GAAG,SAAS;IACnC,gBAAuB,MAAM,YAAY;CAC1C"}
@@ -3,6 +3,9 @@
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
5
  exports.TelemetryKeys = exports.MaxLengths = exports.Alias = exports.Links = exports.ErrorNames = exports.Retry = exports.AADRegistrationConstants = exports.RegularExprs = void 0;
6
+ /**
7
+ * @author zhijie <zhihuan@microsoft.com>
8
+ */
6
9
  class RegularExprs {
7
10
  }
8
11
  exports.RegularExprs = RegularExprs;
@@ -15,7 +18,7 @@ AADRegistrationConstants.AZURE_AD_MULTIPLE_ORGS = "AzureADMultipleOrgs";
15
18
  class Retry {
16
19
  }
17
20
  exports.Retry = Retry;
18
- Retry.RETRY_TIMES = 10;
21
+ Retry.RETRY_TIMES = 6;
19
22
  Retry.BACKOFF_TIME_MS = 5000;
20
23
  class ErrorNames {
21
24
  }
@@ -32,6 +35,9 @@ ErrorNames.CALL_APPSTUDIO_API_ERROR = "CallAppStudioAPIError";
32
35
  ErrorNames.CREATE_BOT_REGISTRATION_API_ERROR = "CreateBotRegistrationApiError";
33
36
  // User Exceptions
34
37
  ErrorNames.PACK_DIR_EXISTENCE_ERROR = "PackDirectoryExistenceError";
38
+ ErrorNames.ACQUIRE_BOT_FRAMEWORK_TOKEN_ERROR = "AcquireBotFrameworkTokenError";
39
+ ErrorNames.FORBIDDEN_RESULT_BOT_FRAMEWORK_ERROR = "ForbiddenResultBotFrameworkError";
40
+ ErrorNames.CONFLICT_RESULT_BOT_FRAMEWORK_ERROR = "ConflictResultBotFrameworkError";
35
41
  class Links {
36
42
  }
37
43
  exports.Links = Links;
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,YAAY;;AAAzB,oCAEC;AADwB,gCAAmB,GAAW,cAAc,CAAC;AAGtE,MAAa,wBAAwB;;AAArC,4DAGC;AAFwB,4CAAmB,GAAW,kCAAkC,CAAC;AACjE,+CAAsB,GAAW,qBAAqB,CAAC;AAGhF,MAAa,KAAK;;AAAlB,sBAGC;AAFwB,iBAAW,GAAG,EAAE,CAAC;AACjB,qBAAe,GAAG,IAAI,CAAC;AAGhD,MAAa,UAAU;;AAAvB,gCAcC;AAbC,oBAAoB;AACG,6BAAkB,GAAG,mBAAmB,CAAC;AACzC,0BAAe,GAAG,gBAAgB,CAAC;AACnC,gCAAqB,GAAG,qBAAqB,CAAC;AAC9C,kCAAuB,GAAG,uBAAuB,CAAC;AAClD,0CAA+B,GAAG,8BAA8B,CAAC;AACjE,sCAA2B,GAAG,8BAA8B,CAAC;AAC7D,kCAAuB,GAAG,uBAAuB,CAAC;AAClD,mCAAwB,GAAG,uBAAuB,CAAC;AACnD,4CAAiC,GAAG,+BAA+B,CAAC;AAE3F,kBAAkB;AACK,mCAAwB,GAAG,6BAA6B,CAAC;AAGlF,MAAa,KAAK;;AAAlB,sBAGC;AAFwB,gBAAU,GAAG,iDAAiD,CAAC;AAC/D,eAAS,GAAG,iCAAiC,CAAC;AAGvE,MAAa,KAAK;;AAAlB,sBAGC;AAFwB,sBAAgB,GAAG,IAAI,CAAC;AACxB,kBAAY,GAAG,KAAK,CAAC;AAG9C,MAAa,UAAU;;AAAvB,gCAEC;AADwB,2BAAgB,GAAG,GAAG,CAAC;AAGhD,MAAa,aAAa;;AAA1B,sCAYC;AAXwB,uBAAS,GAAG,WAAW,CAAC;AACxB,qBAAO,GAAG,SAAS,CAAC;AACpB,uBAAS,GAAG,YAAY,CAAC;AACzB,0BAAY,GAAG,eAAe,CAAC;AAC/B,uBAAS,GAAG,YAAY,CAAC;AACzB,mBAAK,GAAG,OAAO,CAAC;AAChB,sBAAQ,GAAG,eAAe,CAAC;AAC3B,6BAAe,GAAG,kBAAkB,CAAC;AACrC,wBAAU,GAAG,aAAa,CAAC;AAC3B,iBAAG,GAAG,KAAK,CAAC;AACZ,oBAAM,GAAG,QAAQ,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AACH,MAAa,YAAY;;AAAzB,oCAEC;AADwB,gCAAmB,GAAW,cAAc,CAAC;AAGtE,MAAa,wBAAwB;;AAArC,4DAGC;AAFwB,4CAAmB,GAAW,kCAAkC,CAAC;AACjE,+CAAsB,GAAW,qBAAqB,CAAC;AAGhF,MAAa,KAAK;;AAAlB,sBAGC;AAFwB,iBAAW,GAAG,CAAC,CAAC;AAChB,qBAAe,GAAG,IAAI,CAAC;AAGhD,MAAa,UAAU;;AAAvB,gCAiBC;AAhBC,oBAAoB;AACG,6BAAkB,GAAG,mBAAmB,CAAC;AACzC,0BAAe,GAAG,gBAAgB,CAAC;AACnC,gCAAqB,GAAG,qBAAqB,CAAC;AAC9C,kCAAuB,GAAG,uBAAuB,CAAC;AAClD,0CAA+B,GAAG,8BAA8B,CAAC;AACjE,sCAA2B,GAAG,8BAA8B,CAAC;AAC7D,kCAAuB,GAAG,uBAAuB,CAAC;AAClD,mCAAwB,GAAG,uBAAuB,CAAC;AACnD,4CAAiC,GAAG,+BAA+B,CAAC;AAE3F,kBAAkB;AACK,mCAAwB,GAAG,6BAA6B,CAAC;AACzD,4CAAiC,GAAG,+BAA+B,CAAC;AACpE,+CAAoC,GAAG,kCAAkC,CAAC;AAC1E,8CAAmC,GAAG,iCAAiC,CAAC;AAGjG,MAAa,KAAK;;AAAlB,sBAGC;AAFwB,gBAAU,GAAG,iDAAiD,CAAC;AAC/D,eAAS,GAAG,iCAAiC,CAAC;AAGvE,MAAa,KAAK;;AAAlB,sBAGC;AAFwB,sBAAgB,GAAG,IAAI,CAAC;AACxB,kBAAY,GAAG,KAAK,CAAC;AAG9C,MAAa,UAAU;;AAAvB,gCAEC;AADwB,2BAAgB,GAAG,GAAG,CAAC;AAGhD,MAAa,aAAa;;AAA1B,sCAYC;AAXwB,uBAAS,GAAG,WAAW,CAAC;AACxB,qBAAO,GAAG,SAAS,CAAC;AACpB,uBAAS,GAAG,YAAY,CAAC;AACzB,0BAAY,GAAG,eAAe,CAAC;AAC/B,uBAAS,GAAG,YAAY,CAAC;AACzB,mBAAK,GAAG,OAAO,CAAC;AAChB,sBAAQ,GAAG,eAAe,CAAC;AAC3B,6BAAe,GAAG,kBAAkB,CAAC;AACrC,wBAAU,GAAG,aAAa,CAAC;AAC3B,iBAAG,GAAG,KAAK,CAAC;AACZ,oBAAM,GAAG,QAAQ,CAAC"}
@@ -61,5 +61,14 @@ export declare function wrapError(e: InnerError): FxResult;
61
61
  export declare class FailedToCreateBotRegistrationError extends PluginError {
62
62
  constructor(innerError?: InnerError);
63
63
  }
64
+ export declare class BotFrameworkNotAllowedToAcquireTokenError extends PluginError {
65
+ constructor();
66
+ }
67
+ export declare class BotFrameworkForbiddenResultError extends PluginError {
68
+ constructor();
69
+ }
70
+ export declare class BotFrameworkConflictResultError extends PluginError {
71
+ constructor();
72
+ }
64
73
  export declare const AlreadyCreatedBotNotExist: (botId: string | undefined, innerError: any) => UserError;
65
74
  //# sourceMappingURL=errors.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/botService/errors.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoB,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAA6C,QAAQ,EAAE,MAAM,UAAU,CAAC;AAO/E,eAAO,MAAM,SAAS;;;CAGZ,CAAC;AAEX,oBAAY,SAAS,GAAG,OAAO,SAAS,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAEjE,oBAAY,UAAU,GAAG,SAAS,GAAG,KAAK,GAAG,gBAAgB,GAAG,aAAa,GAAG,OAAO,CAAC;AAExF,oBAAY,SAAS,GAAG;IACtB,QAAQ,EAAE;QACR,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE;YACL,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,KAAK,CAAC,EAAE;gBACN,IAAI,CAAC,EAAE,MAAM,CAAC;gBACd,OAAO,CAAC,EAAE,MAAM,CAAC;aAClB,CAAC;YACF,MAAM,CAAC,EAAE,GAAG,CAAC;SACd,CAAC;KACH,CAAC;CACH,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,WAAW,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,IAAI,SAAS,CAEzD;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,IAAI,gBAAgB,CAEvE;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,WAAW,CAE1D;AAuBD,qBAAa,WAAY,SAAQ,KAAK;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAGvB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EACzB,WAAW,EAAE,MAAM,EAAE,EACrB,UAAU,CAAC,EAAE,UAAU,EACvB,QAAQ,CAAC,EAAE,MAAM;IAYnB,UAAU,IAAI,MAAM;IAOpB,iBAAiB,IAAI,MAAM;CAO5B;AAED,qBAAa,iBAAkB,SAAQ,WAAW;gBACpC,UAAU,CAAC,EAAE,UAAU;CAIpC;AAED,qBAAa,oBAAqB,SAAQ,WAAW;gBACvC,UAAU,CAAC,EAAE,UAAU;CAIpC;AAED,qBAAa,cAAe,SAAQ,WAAW;gBACjC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU;CAStD;AAED,qBAAa,mBAAoB,SAAQ,WAAW;gBACtC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU;CASxD;AAED,qBAAa,4BAA6B,SAAQ,WAAW;gBAC/C,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU;CASnD;AAED,qBAAa,4BAA6B,SAAQ,WAAW;gBAC/C,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU;CAStD;AAGD,wBAAgB,SAAS,CAAC,CAAC,EAAE,UAAU,GAAG,QAAQ,CAmDjD;AAED,qBAAa,kCAAmC,SAAQ,WAAW;gBACrD,UAAU,CAAC,EAAE,UAAU;CASpC;AAED,eAAO,MAAM,yBAAyB,UAAW,MAAM,GAAG,SAAS,cAAc,GAAG,cAgBnF,CAAC"}
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/botService/errors.ts"],"names":[],"mappings":"AASA,OAAO,EAAoB,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAA6C,QAAQ,EAAE,MAAM,UAAU,CAAC;AAO/E,eAAO,MAAM,SAAS;;;CAGZ,CAAC;AAEX,oBAAY,SAAS,GAAG,OAAO,SAAS,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAEjE,oBAAY,UAAU,GAAG,SAAS,GAAG,KAAK,GAAG,gBAAgB,GAAG,aAAa,GAAG,OAAO,CAAC;AAExF,oBAAY,SAAS,GAAG;IACtB,QAAQ,EAAE;QACR,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE;YACL,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,KAAK,CAAC,EAAE;gBACN,IAAI,CAAC,EAAE,MAAM,CAAC;gBACd,OAAO,CAAC,EAAE,MAAM,CAAC;aAClB,CAAC;YACF,MAAM,CAAC,EAAE,GAAG,CAAC;SACd,CAAC;KACH,CAAC;CACH,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,WAAW,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,IAAI,SAAS,CAEzD;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,IAAI,gBAAgB,CAEvE;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,WAAW,CAE1D;AAuBD,qBAAa,WAAY,SAAQ,KAAK;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAGvB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EACzB,WAAW,EAAE,MAAM,EAAE,EACrB,UAAU,CAAC,EAAE,UAAU,EACvB,QAAQ,CAAC,EAAE,MAAM;IAYnB,UAAU,IAAI,MAAM;IAOpB,iBAAiB,IAAI,MAAM;CAO5B;AAED,qBAAa,iBAAkB,SAAQ,WAAW;gBACpC,UAAU,CAAC,EAAE,UAAU;CAIpC;AAED,qBAAa,oBAAqB,SAAQ,WAAW;gBACvC,UAAU,CAAC,EAAE,UAAU;CAIpC;AAED,qBAAa,cAAe,SAAQ,WAAW;gBACjC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU;CAStD;AAED,qBAAa,mBAAoB,SAAQ,WAAW;gBACtC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU;CASxD;AAED,qBAAa,4BAA6B,SAAQ,WAAW;gBAC/C,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU;CASnD;AAED,qBAAa,4BAA6B,SAAQ,WAAW;gBAC/C,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU;CAStD;AAGD,wBAAgB,SAAS,CAAC,CAAC,EAAE,UAAU,GAAG,QAAQ,CAmDjD;AAED,qBAAa,kCAAmC,SAAQ,WAAW;gBACrD,UAAU,CAAC,EAAE,UAAU;CASpC;AAED,qBAAa,yCAA0C,SAAQ,WAAW;;CASzE;AAED,qBAAa,gCAAiC,SAAQ,WAAW;;CAShE;AAED,qBAAa,+BAAgC,SAAQ,WAAW;;CAS/D;AAED,eAAO,MAAM,yBAAyB,UAAW,MAAM,GAAG,SAAS,cAAc,GAAG,cAgBnF,CAAC"}
@@ -2,7 +2,10 @@
2
2
  // Copyright (c) Microsoft Corporation.
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.AlreadyCreatedBotNotExist = exports.FailedToCreateBotRegistrationError = exports.wrapError = exports.MessageEndpointUpdatingError = exports.BotRegistrationNotFoundError = exports.ConfigUpdatingError = exports.ProvisionError = exports.CreateAADSecretError = exports.CreateAADAppError = exports.PluginError = exports.isPluginError = exports.isErrorWithMessage = exports.isHttpError = exports.ErrorType = void 0;
5
+ exports.AlreadyCreatedBotNotExist = exports.BotFrameworkConflictResultError = exports.BotFrameworkForbiddenResultError = exports.BotFrameworkNotAllowedToAcquireTokenError = exports.FailedToCreateBotRegistrationError = exports.wrapError = exports.MessageEndpointUpdatingError = exports.BotRegistrationNotFoundError = exports.ConfigUpdatingError = exports.ProvisionError = exports.CreateAADSecretError = exports.CreateAADAppError = exports.PluginError = exports.isPluginError = exports.isErrorWithMessage = exports.isHttpError = exports.ErrorType = void 0;
6
+ /**
7
+ * @author zhijie <zhihuan@microsoft.com>
8
+ */
6
9
  const constants_1 = require("./constants");
7
10
  const messages_1 = require("./messages");
8
11
  const localizeUtils_1 = require("../../../common/localizeUtils");
@@ -162,6 +165,24 @@ class FailedToCreateBotRegistrationError extends PluginError {
162
165
  }
163
166
  }
164
167
  exports.FailedToCreateBotRegistrationError = FailedToCreateBotRegistrationError;
168
+ class BotFrameworkNotAllowedToAcquireTokenError extends PluginError {
169
+ constructor() {
170
+ super(exports.ErrorType.USER, constants_1.ErrorNames.ACQUIRE_BOT_FRAMEWORK_TOKEN_ERROR, messages_1.Messages.NotAllowedToAcquireBotFrameworkToken(), [messages_1.Messages.CheckOutputLogAndTryToFix]);
171
+ }
172
+ }
173
+ exports.BotFrameworkNotAllowedToAcquireTokenError = BotFrameworkNotAllowedToAcquireTokenError;
174
+ class BotFrameworkForbiddenResultError extends PluginError {
175
+ constructor() {
176
+ super(exports.ErrorType.USER, constants_1.ErrorNames.FORBIDDEN_RESULT_BOT_FRAMEWORK_ERROR, messages_1.Messages.BotProvisionReturnsForbiddenResult(), [messages_1.Messages.CheckOutputLogAndTryToFix, messages_1.Messages.RetryTheCurrentStep]);
177
+ }
178
+ }
179
+ exports.BotFrameworkForbiddenResultError = BotFrameworkForbiddenResultError;
180
+ class BotFrameworkConflictResultError extends PluginError {
181
+ constructor() {
182
+ super(exports.ErrorType.USER, constants_1.ErrorNames.CONFLICT_RESULT_BOT_FRAMEWORK_ERROR, messages_1.Messages.BotProvisionReturnsConflictResult(), [messages_1.Messages.CheckOutputLogAndTryToFix, messages_1.Messages.RetryTheCurrentStep]);
183
+ }
184
+ }
185
+ exports.BotFrameworkConflictResultError = BotFrameworkConflictResultError;
165
186
  const AlreadyCreatedBotNotExist = (botId, innerError) => {
166
187
  return new teamsfx_api_1.UserError({
167
188
  source: "RegisterBot",
@@ -1 +1 @@
1
- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/errors.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/errors.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AACH,2CAAyC;AACzC,yCAAsC;AACtC,iEAAqF;AACrF,wDAAqE;AACrE,qCAA+E;AAC/E,6EAAgF;AAChF,6CAAqE;AACrE,qDAAuD;AACvD,yDAAsD;AACtD,uCAA0C;AAE7B,QAAA,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;CACR,CAAC;AA4BX,SAAgB,WAAW,CAAC,CAAa;IACvC,OAAO,CAAC,YAAY,MAAM,IAAI,UAAU,IAAI,CAAC,CAAC;AAChD,CAAC;AAFD,kCAEC;AAED,SAAgB,kBAAkB,CAAC,CAAa;IAC9C,OAAO,CAAC,YAAY,MAAM,IAAI,SAAS,IAAI,CAAC,CAAC;AAC/C,CAAC;AAFD,gDAEC;AAED,SAAgB,aAAa,CAAC,CAAU;IACtC,OAAO,CAAC,YAAY,MAAM,IAAI,YAAY,IAAI,CAAC,CAAC;AAClD,CAAC;AAFD,sCAEC;AAED,SAAS,iBAAiB,CAAC,MAAmB,EAAE,WAAgC;;IAC9E,IAAI,CAAC,MAAM,CAAC,UAAU;QAAE,OAAO;IAE/B,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,UAAU,CAAC,QAAQ,0CAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC;IAC7F,IAAI,UAAU,EAAE;QACd,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG,EAAE;YACzC,MAAM,CAAC,SAAS,GAAG,iBAAS,CAAC,IAAI,CAAC;SACnC;aAAM;YACL,MAAM,CAAC,SAAS,GAAG,iBAAS,CAAC,MAAM,CAAC;SACrC;KACF;IAED,IAAI,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAClC,MAAM,SAAS,GAAG,MAAA,MAAA,MAAA,MAAM,CAAC,UAAU,CAAC,QAAQ,0CAAE,IAAI,0CAAE,KAAK,0CAAE,IAAI,CAAC;QAChE,IAAI,SAAS,EAAE;YACb,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC5C,IAAI,QAAQ;gBAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAC1C;KACF;AACH,CAAC;AAED,MAAa,WAAY,SAAQ,KAAK;IAQpC,YACE,IAAe,EACf,IAAY,EACZ,OAAyB,EACzB,WAAqB,EACrB,UAAuB,EACvB,QAAiB;QAEjB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;IAED,UAAU;QACR,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;QAChC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,GAAG,IAAI,gCAAgB,CAAC,8BAA8B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACrF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,iBAAiB;QACf,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;QAChC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,GAAG,IAAI,kCAAkB,CAAC,8BAA8B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACvF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAxCD,kCAwCC;AAED,MAAa,iBAAkB,SAAQ,WAAW;IAChD,YAAY,UAAuB;QACjC,KAAK,CAAC,iBAAS,CAAC,IAAI,EAAE,uBAAc,CAAC,IAAI,EAAE,uBAAc,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QACrF,iBAAiB,CAAC,IAAI,EAAE,4BAAe,CAAC,CAAC;IAC3C,CAAC;CACF;AALD,8CAKC;AAED,MAAa,oBAAqB,SAAQ,WAAW;IACnD,YAAY,UAAuB;QACjC,KAAK,CAAC,iBAAS,CAAC,IAAI,EAAE,0BAAiB,CAAC,IAAI,EAAE,0BAAiB,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QAC3F,iBAAiB,CAAC,IAAI,EAAE,4BAAe,CAAC,CAAC;IAC3C,CAAC;CACF;AALD,oDAKC;AAED,MAAa,cAAe,SAAQ,WAAW;IAC7C,YAAY,QAAgB,EAAE,UAAuB;QACnD,KAAK,CACH,iBAAS,CAAC,IAAI,EACd,sBAAU,CAAC,eAAe,EAC1B,mBAAQ,CAAC,2BAA2B,CAAC,QAAQ,CAAC,EAC9C,CAAC,mBAAQ,CAAC,yBAAyB,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,EAClE,UAAU,CACX,CAAC;IACJ,CAAC;CACF;AAVD,wCAUC;AAED,MAAa,mBAAoB,SAAQ,WAAW;IAClD,YAAY,UAAkB,EAAE,UAAuB;QACrD,KAAK,CACH,iBAAS,CAAC,IAAI,EACd,sBAAU,CAAC,qBAAqB,EAChC,mBAAQ,CAAC,mBAAmB,CAAC,UAAU,CAAC,EACxC,CAAC,mBAAQ,CAAC,yBAAyB,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,EAClE,UAAU,CACX,CAAC;IACJ,CAAC;CACF;AAVD,kDAUC;AAED,MAAa,4BAA6B,SAAQ,WAAW;IAC3D,YAAY,KAAa,EAAE,UAAuB;QAChD,KAAK,CACH,iBAAS,CAAC,IAAI,EACd,sBAAU,CAAC,+BAA+B,EAC1C,mBAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,EAC3C,CAAC,mBAAQ,CAAC,yBAAyB,CAAC,EACpC,UAAU,CACX,CAAC;IACJ,CAAC;CACF;AAVD,oEAUC;AAED,MAAa,4BAA6B,SAAQ,WAAW;IAC3D,YAAY,QAAgB,EAAE,UAAuB;QACnD,KAAK,CACH,iBAAS,CAAC,IAAI,EACd,sBAAU,CAAC,2BAA2B,EACtC,mBAAQ,CAAC,2BAA2B,CAAC,QAAQ,CAAC,EAC9C,CAAC,mBAAQ,CAAC,yBAAyB,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,EAClE,UAAU,CACX,CAAC;IACJ,CAAC;CACF;AAVD,oEAUC;AAED,wFAAwF;AACxF,SAAgB,SAAS,CAAC,CAAa;;IACrC,IAAI,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/D,IAAI,UAAU,EAAE;QACd,QAAQ,IAAI,kCAAkB,CAC5B,2BAA2B,EAC3B,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACzD,CAAC;QACF,IAAI,WAAW,CAAC,UAAU,CAAC,EAAE;YAC3B,IAAI,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,IAAI,0CAAE,YAAY,EAAE;gBAC3C,QAAQ,IAAI,kCAAkB,CAC5B,iCAAiC,EACjC,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,IAAI,0CAAE,YAAY,CACxC,CAAC;aACH;iBAAM,IAAI,MAAA,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,IAAI,0CAAE,KAAK,0CAAE,OAAO,EAAE;gBACpD,mCAAmC;gBACnC,QAAQ,IAAI,kCAAkB,CAC5B,iCAAiC,EACjC,MAAA,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,IAAI,0CAAE,KAAK,0CAAE,OAAO,CAC1C,CAAC;aACH;iBAAM,IAAI,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,IAAI,0CAAE,MAAM,EAAE;gBAC5C,wCAAwC;gBACxC,QAAQ,IAAI,kCAAkB,CAC5B,iCAAiC,EACjC,IAAI,CAAC,SAAS,CAAC,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,IAAI,0CAAE,MAAM,CAAC,CAClD,CAAC;aACH;SACF;KACF;IACD,IAAI,CAAC,YAAY,uBAAS,IAAI,CAAC,YAAY,yBAAW,EAAE;QACtD,MAAM,GAAG,GAAG,iBAAG,CAAC,CAAC,CAAC,CAAC;QACnB,OAAO,GAAG,CAAC;KACZ;IACD,IAAI,CAAC,YAAY,WAAW,IAAI,CAAC,YAAY,iCAAkB,EAAE;QAC/D,MAAM,OAAO,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC/B,MAAM,cAAc,GAAG,CAAC,CAAC,iBAAiB,EAAE,CAAC;QAC7C,MAAM,MAAM,GACV,CAAC,YAAY,WAAW,IAAI,CAAC,CAAC,SAAS,KAAK,iBAAS,CAAC,MAAM;YAC1D,CAAC,CAAC,iCAAa,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC;YAC5E,CAAC,CAAC,iCAAa,CAAC,SAAS,CACrB,CAAC,CAAC,IAAI,EACN,CAAC,OAAO,EAAE,cAAc,CAAC,EACzB,CAAC,CAAC,UAAU,EACZ,CAAC,YAAY,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAC3C,CAAC;QACR,OAAO,MAAM,CAAC;KACf;SAAM;QACL,0BAA0B;QAC1B,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;QAC5C,OAAO,iCAAa,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC;KACxF;AACH,CAAC;AAnDD,8BAmDC;AAED,MAAa,kCAAmC,SAAQ,WAAW;IACjE,YAAY,UAAuB;QACjC,KAAK,CACH,iBAAS,CAAC,MAAM,EAChB,sBAAU,CAAC,iCAAiC,EAC5C,mBAAQ,CAAC,2BAA2B,CAAC,uBAAa,CAAC,2BAA2B,CAAC,EAC/E,CAAC,mBAAQ,CAAC,yBAAyB,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,EAClE,UAAU,CACX,CAAC;IACJ,CAAC;CACF;AAVD,gFAUC;AAED,MAAa,yCAA0C,SAAQ,WAAW;IACxE;QACE,KAAK,CACH,iBAAS,CAAC,IAAI,EACd,sBAAU,CAAC,iCAAiC,EAC5C,mBAAQ,CAAC,oCAAoC,EAAE,EAC/C,CAAC,mBAAQ,CAAC,yBAAyB,CAAC,CACrC,CAAC;IACJ,CAAC;CACF;AATD,8FASC;AAED,MAAa,gCAAiC,SAAQ,WAAW;IAC/D;QACE,KAAK,CACH,iBAAS,CAAC,IAAI,EACd,sBAAU,CAAC,oCAAoC,EAC/C,mBAAQ,CAAC,kCAAkC,EAAE,EAC7C,CAAC,mBAAQ,CAAC,yBAAyB,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,CACnE,CAAC;IACJ,CAAC;CACF;AATD,4EASC;AAED,MAAa,+BAAgC,SAAQ,WAAW;IAC9D;QACE,KAAK,CACH,iBAAS,CAAC,IAAI,EACd,sBAAU,CAAC,mCAAmC,EAC9C,mBAAQ,CAAC,iCAAiC,EAAE,EAC5C,CAAC,mBAAQ,CAAC,yBAAyB,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,CACnE,CAAC;IACJ,CAAC;CACF;AATD,0EASC;AAEM,MAAM,yBAAyB,GAAG,CAAC,KAAyB,EAAE,UAAe,EAAE,EAAE;IACtF,OAAO,IAAI,uBAAS,CAAC;QACnB,MAAM,EAAE,aAAa;QACrB,IAAI,EAAE,2BAA2B;QACjC,OAAO,EAAE,kCAAkB,CACzB,0CAA0C,EAC1C,KAAK,EACL,qBAAS,CAAC,kBAAkB,CAC7B;QACD,cAAc,EAAE,kCAAkB,CAChC,0CAA0C,EAC1C,KAAK,EACL,qBAAS,CAAC,kBAAkB,CAC7B;QACD,KAAK,EAAE,UAAU;KAClB,CAAC,CAAC;AACL,CAAC,CAAC;AAhBW,QAAA,yBAAyB,6BAgBpC"}
@@ -1,15 +1,19 @@
1
+ export declare function localString(key: string, ...params: any[]): [string, string];
1
2
  export declare class Messages {
2
3
  static readonly SomethingIsMissing: (something: string) => [string, string];
3
4
  static readonly FailToProvisionSomeResource: (resource: string) => [string, string];
4
5
  static readonly FailToUpdateConfigs: (something: string) => [string, string];
5
6
  static readonly BotRegistrationNotFoundWith: (botId: string) => [string, string];
6
7
  static readonly FailToUpdateMessageEndpoint: (endpoint: string) => [string, string];
7
- static readonly FailToCallAppStudioForCheckingAADApp: string[];
8
+ static readonly FailToCallAppStudioForCheckingAADApp: () => [string, string];
8
9
  static readonly BotResourceExist: (where: string) => string;
9
10
  static readonly SuccessfullyCreatedBotAadApp: string;
10
11
  static readonly ProvisioningBotRegistration: string;
11
12
  static readonly SuccessfullyProvisionedBotRegistration: string;
12
13
  static readonly RetryTheCurrentStep: string;
13
14
  static readonly CheckOutputLogAndTryToFix: string;
15
+ static readonly NotAllowedToAcquireBotFrameworkToken: () => [string, string];
16
+ static readonly BotProvisionReturnsForbiddenResult: () => [string, string];
17
+ static readonly BotProvisionReturnsConflictResult: () => [string, string];
14
18
  }
15
19
  //# sourceMappingURL=messages.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/botService/messages.ts"],"names":[],"mappings":"AAKA,qBAAa,QAAQ;IACnB,gBAAuB,kBAAkB,cAAe,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAG/E;IAEF,gBAAuB,2BAA2B,aAAc,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAGvF;IACF,gBAAuB,mBAAmB,cAAe,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAGhF;IACF,gBAAuB,2BAA2B,UAAW,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAGpF;IACF,gBAAuB,2BAA2B,aAAc,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAGvF;IAEF,gBAAuB,oCAAoC,WAGzD;IAEF,gBAAuB,gBAAgB,UAAW,MAAM,KAAG,MAAM,CACJ;IAC7D,gBAAuB,4BAA4B,SAEjD;IAEF,gBAAuB,2BAA2B,SAEhD;IACF,gBAAuB,sCAAsC,SAE3D;IAGF,gBAAuB,mBAAmB,SAExC;IACF,gBAAuB,yBAAyB,SAE9C;CACH"}
1
+ {"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/botService/messages.ts"],"names":[],"mappings":"AAQA,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAE3E;AACD,qBAAa,QAAQ;IACnB,gBAAuB,kBAAkB,cAAe,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CACtB;IAE3D,gBAAuB,2BAA2B,aAAc,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAChC;IAEzD,gBAAuB,mBAAmB,cAAe,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CACpB;IAE9D,gBAAuB,2BAA2B,UAAW,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CACtB;IAEhE,gBAAuB,2BAA2B,aAAc,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CACtB;IAEnE,gBAAuB,oCAAoC,QAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAC9B;IACpD,gBAAuB,gBAAgB,UAAW,MAAM,KAAG,MAAM,CACJ;IAC7D,gBAAuB,4BAA4B,SAEjD;IAEF,gBAAuB,2BAA2B,SAEhD;IACF,gBAAuB,sCAAsC,SAE3D;IAGF,gBAAuB,mBAAmB,SAExC;IACF,gBAAuB,yBAAyB,SAE9C;IAEF,gBAAuB,oCAAoC,QAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CACZ;IACtE,gBAAuB,kCAAkC,QAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CACZ;IACpE,gBAAuB,iCAAiC,QAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CACZ;CACpE"}
@@ -2,35 +2,24 @@
2
2
  // Copyright (c) Microsoft Corporation.
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.Messages = void 0;
5
+ exports.Messages = exports.localString = void 0;
6
+ /**
7
+ * @author zhijie <zhihuan@microsoft.com>
8
+ */
6
9
  const localizeUtils_1 = require("../../../common/localizeUtils");
10
+ function localString(key, ...params) {
11
+ return [localizeUtils_1.getDefaultString(key, ...params), localizeUtils_1.getLocalizedString(key, ...params)];
12
+ }
13
+ exports.localString = localString;
7
14
  class Messages {
8
15
  }
9
16
  exports.Messages = Messages;
10
- Messages.SomethingIsMissing = (something) => [
11
- localizeUtils_1.getDefaultString("plugins.bot.SomethingIsMissing", something),
12
- localizeUtils_1.getLocalizedString("plugins.bot.SomethingIsMissing", something),
13
- ];
14
- Messages.FailToProvisionSomeResource = (resource) => [
15
- localizeUtils_1.getDefaultString("plugins.bot.FailedToProvision", resource),
16
- localizeUtils_1.getLocalizedString("plugins.bot.FailedToProvision", resource),
17
- ];
18
- Messages.FailToUpdateConfigs = (something) => [
19
- localizeUtils_1.getDefaultString("plugins.bot.FailedToUpdateConfigs", something),
20
- localizeUtils_1.getLocalizedString("plugins.bot.FailedToUpdateConfigs", something),
21
- ];
22
- Messages.BotRegistrationNotFoundWith = (botId) => [
23
- localizeUtils_1.getDefaultString("plugins.bot.BotRegistrationNotFoundWith", botId),
24
- localizeUtils_1.getLocalizedString("plugins.bot.BotRegistrationNotFoundWith", botId),
25
- ];
26
- Messages.FailToUpdateMessageEndpoint = (endpoint) => [
27
- localizeUtils_1.getDefaultString("plugins.bot.FailedUpdateMessageEndpoint", endpoint),
28
- localizeUtils_1.getLocalizedString("plugins.bot.FailedUpdateMessageEndpoint", endpoint),
29
- ];
30
- Messages.FailToCallAppStudioForCheckingAADApp = [
31
- localizeUtils_1.getDefaultString("plugins.bot.FailToCallAppStudioApi"),
32
- localizeUtils_1.getLocalizedString("plugins.bot.FailToCallAppStudioApi"),
33
- ];
17
+ Messages.SomethingIsMissing = (something) => localString("plugins.bot.SomethingIsMissing", something);
18
+ Messages.FailToProvisionSomeResource = (resource) => localString("plugins.bot.FailedToProvision", resource);
19
+ Messages.FailToUpdateConfigs = (something) => localString("plugins.bot.FailedToUpdateConfigs", something);
20
+ Messages.BotRegistrationNotFoundWith = (botId) => localString("plugins.bot.BotRegistrationNotFoundWith", botId);
21
+ Messages.FailToUpdateMessageEndpoint = (endpoint) => localString("plugins.bot.FailedUpdateMessageEndpoint", endpoint);
22
+ Messages.FailToCallAppStudioForCheckingAADApp = () => localString("plugins.bot.FailToCallAppStudioApi");
34
23
  Messages.BotResourceExist = (where) => localizeUtils_1.getLocalizedString("plugins.bot.BotResourceExists", where);
35
24
  Messages.SuccessfullyCreatedBotAadApp = localizeUtils_1.getLocalizedString("plugins.bot.CreateBotAADSuccess");
36
25
  Messages.ProvisioningBotRegistration = localizeUtils_1.getLocalizedString("plugins.bot.ProvisionBotRegistration");
@@ -38,4 +27,7 @@ Messages.SuccessfullyProvisionedBotRegistration = localizeUtils_1.getLocalizedSt
38
27
  // Suggestions
39
28
  Messages.RetryTheCurrentStep = localizeUtils_1.getLocalizedString("suggestions.retryTheCurrentStep");
40
29
  Messages.CheckOutputLogAndTryToFix = localizeUtils_1.getLocalizedString("plugins.bot.CheckLogAndFix");
30
+ Messages.NotAllowedToAcquireBotFrameworkToken = () => localString("error.appstudio.NotAllowedToAcquireBotFrameworkToken");
31
+ Messages.BotProvisionReturnsForbiddenResult = () => localString("error.appstudio.BotProvisionReturnsForbiddenResult");
32
+ Messages.BotProvisionReturnsConflictResult = () => localString("error.appstudio.BotProvisionReturnsConflictResult");
41
33
  //# sourceMappingURL=messages.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/messages.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,iEAAqF;AAErF,MAAa,QAAQ;;AAArB,4BAgDC;AA/CwB,2BAAkB,GAAG,CAAC,SAAiB,EAAoB,EAAE,CAAC;IACnF,gCAAgB,CAAC,gCAAgC,EAAE,SAAS,CAAC;IAC7D,kCAAkB,CAAC,gCAAgC,EAAE,SAAS,CAAC;CAChE,CAAC;AAEqB,oCAA2B,GAAG,CAAC,QAAgB,EAAoB,EAAE,CAAC;IAC3F,gCAAgB,CAAC,+BAA+B,EAAE,QAAQ,CAAC;IAC3D,kCAAkB,CAAC,+BAA+B,EAAE,QAAQ,CAAC;CAC9D,CAAC;AACqB,4BAAmB,GAAG,CAAC,SAAiB,EAAoB,EAAE,CAAC;IACpF,gCAAgB,CAAC,mCAAmC,EAAE,SAAS,CAAC;IAChE,kCAAkB,CAAC,mCAAmC,EAAE,SAAS,CAAC;CACnE,CAAC;AACqB,oCAA2B,GAAG,CAAC,KAAa,EAAoB,EAAE,CAAC;IACxF,gCAAgB,CAAC,yCAAyC,EAAE,KAAK,CAAC;IAClE,kCAAkB,CAAC,yCAAyC,EAAE,KAAK,CAAC;CACrE,CAAC;AACqB,oCAA2B,GAAG,CAAC,QAAgB,EAAoB,EAAE,CAAC;IAC3F,gCAAgB,CAAC,yCAAyC,EAAE,QAAQ,CAAC;IACrE,kCAAkB,CAAC,yCAAyC,EAAE,QAAQ,CAAC;CACxE,CAAC;AAEqB,6CAAoC,GAAG;IAC5D,gCAAgB,CAAC,oCAAoC,CAAC;IACtD,kCAAkB,CAAC,oCAAoC,CAAC;CACzD,CAAC;AAEqB,yBAAgB,GAAG,CAAC,KAAa,EAAU,EAAE,CAClE,kCAAkB,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;AACtC,qCAA4B,GAAG,kCAAkB,CACtE,iCAAiC,CAClC,CAAC;AAEqB,oCAA2B,GAAG,kCAAkB,CACrE,sCAAsC,CACvC,CAAC;AACqB,+CAAsC,GAAG,kCAAkB,CAChF,6CAA6C,CAC9C,CAAC;AAEF,cAAc;AACS,4BAAmB,GAAG,kCAAkB,CAC7D,iCAAiC,CAClC,CAAC;AACqB,kCAAyB,GAAG,kCAAkB,CACnE,4BAA4B,CAC7B,CAAC"}
1
+ {"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/messages.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AACH,iEAAqF;AAErF,SAAgB,WAAW,CAAC,GAAW,EAAE,GAAG,MAAa;IACvD,OAAO,CAAC,gCAAgB,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,EAAE,kCAAkB,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;AAChF,CAAC;AAFD,kCAEC;AACD,MAAa,QAAQ;;AAArB,4BA6CC;AA5CwB,2BAAkB,GAAG,CAAC,SAAiB,EAAoB,EAAE,CAClF,WAAW,CAAC,gCAAgC,EAAE,SAAS,CAAC,CAAC;AAEpC,oCAA2B,GAAG,CAAC,QAAgB,EAAoB,EAAE,CAC1F,WAAW,CAAC,+BAA+B,EAAE,QAAQ,CAAC,CAAC;AAElC,4BAAmB,GAAG,CAAC,SAAiB,EAAoB,EAAE,CACnF,WAAW,CAAC,mCAAmC,EAAE,SAAS,CAAC,CAAC;AAEvC,oCAA2B,GAAG,CAAC,KAAa,EAAoB,EAAE,CACvF,WAAW,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;AAEzC,oCAA2B,GAAG,CAAC,QAAgB,EAAoB,EAAE,CAC1F,WAAW,CAAC,yCAAyC,EAAE,QAAQ,CAAC,CAAC;AAE5C,6CAAoC,GAAG,GAAqB,EAAE,CACnF,WAAW,CAAC,oCAAoC,CAAC,CAAC;AAC7B,yBAAgB,GAAG,CAAC,KAAa,EAAU,EAAE,CAClE,kCAAkB,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;AACtC,qCAA4B,GAAG,kCAAkB,CACtE,iCAAiC,CAClC,CAAC;AAEqB,oCAA2B,GAAG,kCAAkB,CACrE,sCAAsC,CACvC,CAAC;AACqB,+CAAsC,GAAG,kCAAkB,CAChF,6CAA6C,CAC9C,CAAC;AAEF,cAAc;AACS,4BAAmB,GAAG,kCAAkB,CAC7D,iCAAiC,CAClC,CAAC;AACqB,kCAAyB,GAAG,kCAAkB,CACnE,4BAA4B,CAC7B,CAAC;AAEqB,6CAAoC,GAAG,GAAqB,EAAE,CACnF,WAAW,CAAC,sDAAsD,CAAC,CAAC;AAC/C,2CAAkC,GAAG,GAAqB,EAAE,CACjF,WAAW,CAAC,oDAAoD,CAAC,CAAC;AAC7C,0CAAiC,GAAG,GAAqB,EAAE,CAChF,WAAW,CAAC,mDAAmD,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"retryHandler.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/botService/retryHandler.ts"],"names":[],"mappings":"AAIA,qBAAa,YAAY;WACH,KAAK,CAAC,CAAC,EACzB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EACxB,WAAW,UAAQ,GAClB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAgB1B"}
1
+ {"version":3,"file":"retryHandler.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/botService/retryHandler.ts"],"names":[],"mappings":"AAOA,qBAAa,YAAY;WACH,KAAK,CAAC,CAAC,EACzB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EACxB,WAAW,UAAQ,GAClB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAiB1B"}
@@ -3,9 +3,13 @@
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
5
  exports.RetryHandler = void 0;
6
+ /**
7
+ * @author zhijie <zhihuan@microsoft.com>
8
+ */
6
9
  const constants_1 = require("./constants");
7
10
  class RetryHandler {
8
11
  static async Retry(fn, ignoreError = false) {
12
+ var _a;
9
13
  let retries = constants_1.Retry.RETRY_TIMES;
10
14
  while (retries > 0) {
11
15
  retries = retries - 1;
@@ -13,7 +17,8 @@ class RetryHandler {
13
17
  return await fn();
14
18
  }
15
19
  catch (e) {
16
- if (retries <= 0) {
20
+ // Directly throw 404 error, keep trying for other status code e.g. 503 400 500
21
+ if (retries <= 0 || [401, 403, 404, 429].includes((_a = e.response) === null || _a === void 0 ? void 0 : _a.status)) {
17
22
  if (!ignoreError)
18
23
  throw e;
19
24
  }
@@ -1 +1 @@
1
- {"version":3,"file":"retryHandler.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/retryHandler.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,2CAAoC;AACpC,MAAa,YAAY;IAChB,MAAM,CAAC,KAAK,CAAC,KAAK,CACvB,EAAwB,EACxB,WAAW,GAAG,KAAK;QAEnB,IAAI,OAAO,GAAG,iBAAK,CAAC,WAAW,CAAC;QAChC,OAAO,OAAO,GAAG,CAAC,EAAE;YAClB,OAAO,GAAG,OAAO,GAAG,CAAC,CAAC;YACtB,IAAI;gBACF,OAAO,MAAM,EAAE,EAAE,CAAC;aACnB;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,OAAO,IAAI,CAAC,EAAE;oBAChB,IAAI,CAAC,WAAW;wBAAE,MAAM,CAAC,CAAC;iBAC3B;qBAAM;oBACL,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,iBAAK,CAAC,eAAe,CAAC,CAAC,CAAC;iBAC5E;aACF;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AApBD,oCAoBC"}
1
+ {"version":3,"file":"retryHandler.js","sourceRoot":"","sources":["../../../../src/component/resource/botService/retryHandler.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AACH,2CAAoC;AACpC,MAAa,YAAY;IAChB,MAAM,CAAC,KAAK,CAAC,KAAK,CACvB,EAAwB,EACxB,WAAW,GAAG,KAAK;;QAEnB,IAAI,OAAO,GAAG,iBAAK,CAAC,WAAW,CAAC;QAChC,OAAO,OAAO,GAAG,CAAC,EAAE;YAClB,OAAO,GAAG,OAAO,GAAG,CAAC,CAAC;YACtB,IAAI;gBACF,OAAO,MAAM,EAAE,EAAE,CAAC;aACnB;YAAC,OAAO,CAAM,EAAE;gBACf,+EAA+E;gBAC/E,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAA,CAAC,CAAC,QAAQ,0CAAE,MAAM,CAAC,EAAE;oBACrE,IAAI,CAAC,WAAW;wBAAE,MAAM,CAAC,CAAC;iBAC3B;qBAAM;oBACL,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,iBAAK,CAAC,eAAe,CAAC,CAAC,CAAC;iBAC5E;aACF;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AArBD,oCAqBC"}
@@ -4,7 +4,26 @@ export declare type DotenvOutput = {
4
4
  [k: string]: string;
5
5
  };
6
6
  export declare class EnvUtil {
7
+ /**
8
+ * read .env file and set to process.env (if loadToProcessEnv = true)
9
+ * if silent = true, no error will return if .env file is not available, this function returns ok({ TEAMSFX_ENV: env })
10
+ * if silent = false, this function will return error if .env file is not available.
11
+ * @param projectPath
12
+ * @param env
13
+ * @param loadToProcessEnv
14
+ * @param silent
15
+ * @returns
16
+ */
7
17
  readEnv(projectPath: string, env: string, loadToProcessEnv?: boolean, silent?: boolean): Promise<Result<DotenvOutput, FxError>>;
18
+ /**
19
+ * write env variables into .env file,
20
+ * if .env file does not exist, this function will create a default one
21
+ * if .env fila path is not available, the default path is `./env/.env.{env}`
22
+ * @param projectPath
23
+ * @param env
24
+ * @param envs
25
+ * @returns
26
+ */
8
27
  writeEnv(projectPath: string, env: string, envs: DotenvOutput): Promise<Result<undefined, FxError>>;
9
28
  listEnv(projectPath: string): Promise<Result<string[], FxError>>;
10
29
  object2map(obj: DotenvOutput): Map<string, string>;
@@ -1 +1 @@
1
- {"version":3,"file":"envUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":";AAAA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAiC,MAAM,wBAAwB,CAAC;AAQjG,oBAAY,YAAY,GAAG;IACzB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAEF,qBAAa,OAAO;IACZ,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,EACvB,MAAM,UAAQ,GACb,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IA8CnC,QAAQ,CACZ,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAiChC,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAQtE,UAAU,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAOlD,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY;CAOnD;AAED,eAAO,MAAM,OAAO,SAAgB,CAAC;AAMrC,aAAK,gBAAgB,GACjB,MAAM,GACN;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,CAAA;CAAE,CAAC;AACxE,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC3B,GAAG,EAAE,YAAY,CAAC;CACnB;AAED,qBAAa,UAAU;IACrB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,iBAAiB;IAwCpD,SAAS,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;CAmC7C;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC"}
1
+ {"version":3,"file":"envUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":";AAAA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAa,MAAM,wBAAwB,CAAC;AAW7E,oBAAY,YAAY,GAAG;IACzB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAEF,qBAAa,OAAO;IAClB;;;;;;;;;OASG;IACG,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,EACvB,MAAM,UAAO,GACZ,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAkDzC;;;;;;;;OAQG;IACG,QAAQ,CACZ,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA0ChC,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAWtE,UAAU,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAOlD,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY;CAOnD;AAED,eAAO,MAAM,OAAO,SAAgB,CAAC;AAMrC,aAAK,gBAAgB,GACjB,MAAM,GACN;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,CAAA;CAAE,CAAC;AACxE,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC3B,GAAG,EAAE,YAAY,CAAC;CACnB;AAED,qBAAa,UAAU;IACrB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,iBAAiB;IAwCpD,SAAS,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;CAmC7C;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC"}
@@ -3,19 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.dotenvUtil = exports.DotenvUtil = exports.envUtil = exports.EnvUtil = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
6
- const path = tslib_1.__importStar(require("path"));
7
6
  const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
8
7
  const lodash_1 = require("lodash");
9
8
  const settingsUtil_1 = require("./settingsUtil");
10
9
  const crypto_1 = require("../../core/crypto");
11
10
  const localizeUtils_1 = require("../../common/localizeUtils");
11
+ const pathUtils_1 = require("./pathUtils");
12
+ const globalVars_1 = require("../../core/globalVars");
13
+ const path = tslib_1.__importStar(require("path"));
14
+ const os_1 = require("os");
12
15
  class EnvUtil {
13
- async readEnv(projectPath, env, loadToProcessEnv = true, silent = false) {
16
+ /**
17
+ * read .env file and set to process.env (if loadToProcessEnv = true)
18
+ * if silent = true, no error will return if .env file is not available, this function returns ok({ TEAMSFX_ENV: env })
19
+ * if silent = false, this function will return error if .env file is not available.
20
+ * @param projectPath
21
+ * @param env
22
+ * @param loadToProcessEnv
23
+ * @param silent
24
+ * @returns
25
+ */
26
+ async readEnv(projectPath, env, loadToProcessEnv = true, silent = true) {
14
27
  // read
15
- const dotEnvFilePath = path.join(projectPath, teamsfx_api_1.SettingsFolderName, `.env.${env}`);
16
- if (!(await fs_extra_1.default.pathExists(dotEnvFilePath))) {
28
+ const dotEnvFilePathRes = await pathUtils_1.pathUtils.getEnvFilePath(projectPath, env);
29
+ if (dotEnvFilePathRes.isErr())
30
+ return teamsfx_api_1.err(dotEnvFilePathRes.error);
31
+ const dotEnvFilePath = dotEnvFilePathRes.value;
32
+ if (!dotEnvFilePath || !(await fs_extra_1.default.pathExists(dotEnvFilePath))) {
17
33
  if (silent) {
18
- return teamsfx_api_1.ok({});
34
+ // .env file does not exist, just ignore
35
+ process.env.TEAMSFX_ENV = env;
36
+ return teamsfx_api_1.ok({ TEAMSFX_ENV: env });
19
37
  }
20
38
  else {
21
39
  return teamsfx_api_1.err(new teamsfx_api_1.UserError({
@@ -52,7 +70,17 @@ class EnvUtil {
52
70
  }
53
71
  return teamsfx_api_1.ok(parseResult.obj);
54
72
  }
73
+ /**
74
+ * write env variables into .env file,
75
+ * if .env file does not exist, this function will create a default one
76
+ * if .env fila path is not available, the default path is `./env/.env.{env}`
77
+ * @param projectPath
78
+ * @param env
79
+ * @param envs
80
+ * @returns
81
+ */
55
82
  async writeEnv(projectPath, env, envs) {
83
+ envs.TEAMSFX_ENV = env;
56
84
  //encrypt
57
85
  const settingsRes = await settingsUtil_1.settingsUtil.readSettings(projectPath);
58
86
  if (settingsRes.isErr()) {
@@ -70,21 +98,36 @@ class EnvUtil {
70
98
  envs[key] = value;
71
99
  }
72
100
  }
73
- //replace existing
74
- const dotEnvFilePath = path.join(projectPath, teamsfx_api_1.SettingsFolderName, `.env.${env}`);
75
- const parsedDotenv = (await fs_extra_1.default.pathExists(dotEnvFilePath))
101
+ //replace existing, if env file not exist, create a default one
102
+ const dotEnvFilePathRes = await pathUtils_1.pathUtils.getEnvFilePath(projectPath, env);
103
+ if (dotEnvFilePathRes.isErr())
104
+ return teamsfx_api_1.err(dotEnvFilePathRes.error);
105
+ const dotEnvFilePath = dotEnvFilePathRes.value || path.resolve(projectPath, "env", `.env.${env ? env : "dev"}`);
106
+ const envFileExists = await fs_extra_1.default.pathExists(dotEnvFilePath);
107
+ const parsedDotenv = envFileExists
76
108
  ? exports.dotenvUtil.deserialize(await fs_extra_1.default.readFile(dotEnvFilePath))
77
109
  : { obj: {} };
78
- parsedDotenv.obj = envs;
110
+ lodash_1.merge(parsedDotenv.obj, envs);
79
111
  //serialize
80
112
  const content = exports.dotenvUtil.serialize(parsedDotenv);
81
113
  //persist
114
+ globalVars_1.TOOLS.logProvider.info(` Env output:\n${content}\n`);
115
+ if (!envFileExists)
116
+ await fs_extra_1.default.ensureFile(dotEnvFilePath);
82
117
  await fs_extra_1.default.writeFile(dotEnvFilePath, content, { encoding: "utf8" });
118
+ if (!envFileExists) {
119
+ globalVars_1.TOOLS.logProvider.info(" Created environment file at " + dotEnvFilePath + os_1.EOL + os_1.EOL);
120
+ }
83
121
  return teamsfx_api_1.ok(undefined);
84
122
  }
85
123
  async listEnv(projectPath) {
86
- const folder = path.join(projectPath, teamsfx_api_1.SettingsFolderName);
87
- const list = await fs_extra_1.default.readdir(folder);
124
+ const folderRes = await pathUtils_1.pathUtils.getEnvFolderPath(projectPath);
125
+ if (folderRes.isErr())
126
+ return teamsfx_api_1.err(folderRes.error);
127
+ const envFolderPath = folderRes.value;
128
+ if (!envFolderPath)
129
+ return teamsfx_api_1.ok([]);
130
+ const list = await fs_extra_1.default.readdir(envFolderPath);
88
131
  const envs = list
89
132
  .filter((fileName) => fileName.startsWith(".env."))
90
133
  .map((fileName) => fileName.substring(5));
@@ -1 +1 @@
1
- {"version":3,"file":"envUtil.js","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"envUtil.js","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,10 @@
1
+ import { FxError, Result } from "@microsoft/teamsfx-api";
2
+ export declare const YmlFileNameOld = "app.yml";
3
+ export declare const LocalYmlFileNameOld = "app.local.yml";
4
+ export declare class PathUtils {
5
+ getYmlFilePath(projectPath: string, env?: string): string;
6
+ getEnvFolderPath(projectPath: string): Promise<Result<string | undefined, FxError>>;
7
+ getEnvFilePath(projectPath: string, env: string): Promise<Result<string | undefined, FxError>>;
8
+ }
9
+ export declare const pathUtils: PathUtils;
10
+ //# sourceMappingURL=pathUtils.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAGP,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAOhC,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,mBAAmB,kBAAkB,CAAC;AAEnD,qBAAa,SAAS;IACpB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IAiBnD,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAYnF,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CAQhD;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}
@@ -0,0 +1,52 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.pathUtils = exports.PathUtils = exports.LocalYmlFileNameOld = exports.YmlFileNameOld = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
6
+ const path = tslib_1.__importStar(require("path"));
7
+ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
8
+ const parser_1 = require("../configManager/parser");
9
+ const versionMetadata_1 = require("../../common/versionMetadata");
10
+ exports.YmlFileNameOld = "app.yml";
11
+ exports.LocalYmlFileNameOld = "app.local.yml";
12
+ class PathUtils {
13
+ getYmlFilePath(projectPath, env) {
14
+ const envName = env || process.env.TEAMSFX_ENV;
15
+ if (!envName)
16
+ throw new teamsfx_api_1.InvalidInputError("util", "env", "env is undefined");
17
+ let ymlPath = path.join(projectPath, envName === "local" ? versionMetadata_1.MetadataV3.localConfigFile : versionMetadata_1.MetadataV3.configFile);
18
+ if (fs_extra_1.default.pathExistsSync(ymlPath)) {
19
+ return ymlPath;
20
+ }
21
+ ymlPath = path.join(projectPath, teamsfx_api_1.SettingsFolderName, envName === "local" ? exports.LocalYmlFileNameOld : exports.YmlFileNameOld);
22
+ return ymlPath;
23
+ }
24
+ async getEnvFolderPath(projectPath) {
25
+ const ymlFilePath = this.getYmlFilePath(projectPath, "dev");
26
+ const parseRes = await parser_1.yamlParser.parse(ymlFilePath);
27
+ if (parseRes.isErr())
28
+ return teamsfx_api_1.err(parseRes.error);
29
+ const projectModel = parseRes.value;
30
+ if (!projectModel.environmentFolderPath)
31
+ return teamsfx_api_1.ok(undefined); //err(new InvalidEnvFolderPath("missing field: environmentFolderPath"));
32
+ const envFolderPath = path.isAbsolute(projectModel.environmentFolderPath)
33
+ ? projectModel.environmentFolderPath
34
+ : path.join(projectPath, projectModel.environmentFolderPath);
35
+ if (!(await fs_extra_1.default.pathExists(envFolderPath)))
36
+ return teamsfx_api_1.ok(undefined); //err(new InvalidEnvFolderPath("environment folder not exist: " + envFolderPath));
37
+ return teamsfx_api_1.ok(envFolderPath);
38
+ }
39
+ async getEnvFilePath(projectPath, env) {
40
+ const envFolderPathRes = await this.getEnvFolderPath(projectPath);
41
+ if (envFolderPathRes.isErr())
42
+ return teamsfx_api_1.err(envFolderPathRes.error);
43
+ const folderPath = envFolderPathRes.value;
44
+ if (!folderPath)
45
+ return teamsfx_api_1.ok(undefined);
46
+ const envFilePath = path.join(folderPath, `.env.${env}`);
47
+ return teamsfx_api_1.ok(envFilePath);
48
+ }
49
+ }
50
+ exports.PathUtils = PathUtils;
51
+ exports.pathUtils = new PathUtils();
52
+ //# sourceMappingURL=pathUtils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":";;;;AAAA,wDAOgC;AAChC,mDAA6B;AAC7B,gEAA0B;AAC1B,oDAAqD;AAErD,kEAA0D;AAE7C,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,mBAAmB,GAAG,eAAe,CAAC;AAEnD,MAAa,SAAS;IACpB,cAAc,CAAC,WAAmB,EAAE,GAAY;QAC9C,MAAM,OAAO,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QAC/C,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,+BAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;QAC7E,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CACrB,WAAW,EACX,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,4BAAU,CAAC,eAAe,CAAC,CAAC,CAAC,4BAAU,CAAC,UAAU,CACzE,CAAC;QACF,IAAI,kBAAE,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YAC9B,OAAO,OAAO,CAAC;SAChB;QACD,OAAO,GAAG,IAAI,CAAC,IAAI,CACjB,WAAW,EACX,gCAAkB,EAClB,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,2BAAmB,CAAC,CAAC,CAAC,sBAAc,CAC3D,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,KAAK,CAAC,gBAAgB,CAAC,WAAmB;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,MAAM,mBAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,QAAQ,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC;QACpC,IAAI,CAAC,YAAY,CAAC,qBAAqB;YAAE,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC,CAAC,wEAAwE;QACvI,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,qBAAqB,CAAC;YACvE,CAAC,CAAC,YAAY,CAAC,qBAAqB;YACpC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,qBAAqB,CAAC,CAAC;QAC/D,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAAE,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC,CAAC,kFAAkF;QACnJ,OAAO,gBAAE,CAAC,aAAa,CAAC,CAAC;IAC3B,CAAC;IACD,KAAK,CAAC,cAAc,CAClB,WAAmB,EACnB,GAAW;QAEX,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAClE,IAAI,gBAAgB,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAC1C,IAAI,CAAC,UAAU;YAAE,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,EAAE,CAAC,CAAC;QACzD,OAAO,gBAAE,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;CACF;AAzCD,8BAyCC;AAEY,QAAA,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"settingsUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/settingsUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,QAAQ,EACR,MAAM,EAKP,MAAM,wBAAwB,CAAC;AAOhC,qBAAa,aAAa;IAClB,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,gBAAgB,UAAO,GACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAa/B,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAK/F;AAED,eAAO,MAAM,YAAY,eAAsB,CAAC"}
1
+ {"version":3,"file":"settingsUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/settingsUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAe5E,qBAAa,aAAa;IAClB,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,gBAAgB,UAAO,GACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAwB/B,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAW/F;AAED,eAAO,MAAM,YAAY,eAAsB,CAAC"}