@microsoft/teamsfx-core 2.0.6-alpha.ae74bd5cd.0 → 2.0.6-alpha.b2e46f3b2.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 (389) hide show
  1. package/build/common/constants.d.ts +3 -2
  2. package/build/common/constants.d.ts.map +1 -1
  3. package/build/common/constants.js +3 -2
  4. package/build/common/constants.js.map +1 -1
  5. package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
  6. package/build/common/deps-checker/checkerFactory.js +3 -0
  7. package/build/common/deps-checker/checkerFactory.js.map +1 -1
  8. package/build/common/deps-checker/constant/telemetry.d.ts +1 -0
  9. package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
  10. package/build/common/deps-checker/constant/telemetry.js +1 -0
  11. package/build/common/deps-checker/constant/telemetry.js.map +1 -1
  12. package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts +17 -0
  13. package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts.map +1 -0
  14. package/build/common/deps-checker/coreDepsLoggerAdapter.js +47 -0
  15. package/build/common/deps-checker/coreDepsLoggerAdapter.js.map +1 -0
  16. package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts +16 -0
  17. package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts.map +1 -0
  18. package/build/common/deps-checker/coreDepsTelemetryAdapter.js +53 -0
  19. package/build/common/deps-checker/coreDepsTelemetryAdapter.js.map +1 -0
  20. package/build/common/deps-checker/depsChecker.d.ts +6 -1
  21. package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
  22. package/build/common/deps-checker/depsChecker.js +6 -1
  23. package/build/common/deps-checker/depsChecker.js.map +1 -1
  24. package/build/common/deps-checker/index.d.ts +2 -0
  25. package/build/common/deps-checker/index.d.ts.map +1 -1
  26. package/build/common/deps-checker/index.js +2 -0
  27. package/build/common/deps-checker/index.js.map +1 -1
  28. package/build/common/deps-checker/internal/funcToolChecker.d.ts +1 -1
  29. package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
  30. package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
  31. package/build/common/deps-checker/internal/testToolChecker.d.ts +14 -3
  32. package/build/common/deps-checker/internal/testToolChecker.d.ts.map +1 -1
  33. package/build/common/deps-checker/internal/testToolChecker.js +178 -70
  34. package/build/common/deps-checker/internal/testToolChecker.js.map +1 -1
  35. package/build/common/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -1
  36. package/build/common/deps-checker/internal/vxTestAppChecker.js +3 -45
  37. package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
  38. package/build/common/deps-checker/util/downloadHelper.d.ts +15 -0
  39. package/build/common/deps-checker/util/downloadHelper.d.ts.map +1 -0
  40. package/build/common/deps-checker/util/downloadHelper.js +59 -0
  41. package/build/common/deps-checker/util/downloadHelper.js.map +1 -0
  42. package/build/common/featureFlags.d.ts +3 -3
  43. package/build/common/featureFlags.d.ts.map +1 -1
  44. package/build/common/featureFlags.js +11 -12
  45. package/build/common/featureFlags.js.map +1 -1
  46. package/build/common/local/constants.d.ts +1 -0
  47. package/build/common/local/constants.d.ts.map +1 -1
  48. package/build/common/local/constants.js +1 -0
  49. package/build/common/local/constants.js.map +1 -1
  50. package/build/common/local/localCertificateManager.d.ts +5 -4
  51. package/build/common/local/localCertificateManager.d.ts.map +1 -1
  52. package/build/common/local/localCertificateManager.js +9 -2
  53. package/build/common/local/localCertificateManager.js.map +1 -1
  54. package/build/common/local/packageJsonHelper.d.ts +0 -1
  55. package/build/common/local/packageJsonHelper.d.ts.map +1 -1
  56. package/build/common/local/packageJsonHelper.js +1 -29
  57. package/build/common/local/packageJsonHelper.js.map +1 -1
  58. package/build/common/m365/packageService.d.ts +1 -0
  59. package/build/common/m365/packageService.d.ts.map +1 -1
  60. package/build/common/m365/packageService.js +85 -7
  61. package/build/common/m365/packageService.js.map +1 -1
  62. package/build/common/projectTypeChecker.d.ts +38 -0
  63. package/build/common/projectTypeChecker.d.ts.map +1 -0
  64. package/build/common/projectTypeChecker.js +217 -0
  65. package/build/common/projectTypeChecker.js.map +1 -0
  66. package/build/common/samples.d.ts +13 -7
  67. package/build/common/samples.d.ts.map +1 -1
  68. package/build/common/samples.js +83 -49
  69. package/build/common/samples.js.map +1 -1
  70. package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +1 -1
  71. package/build/common/spec-parser/adaptiveCardGenerator.js +2 -4
  72. package/build/common/spec-parser/adaptiveCardGenerator.js.map +1 -1
  73. package/build/common/spec-parser/constants.d.ts +22 -13
  74. package/build/common/spec-parser/constants.d.ts.map +1 -1
  75. package/build/common/spec-parser/constants.js +22 -14
  76. package/build/common/spec-parser/constants.js.map +1 -1
  77. package/build/common/spec-parser/index.browser.d.ts +6 -0
  78. package/build/common/spec-parser/index.browser.d.ts.map +1 -0
  79. package/build/common/spec-parser/index.browser.js +16 -0
  80. package/build/common/spec-parser/index.browser.js.map +1 -0
  81. package/build/common/spec-parser/index.d.ts +5 -0
  82. package/build/common/spec-parser/index.d.ts.map +1 -0
  83. package/build/common/spec-parser/index.js +16 -0
  84. package/build/common/spec-parser/index.js.map +1 -0
  85. package/build/common/spec-parser/interfaces.d.ts +37 -3
  86. package/build/common/spec-parser/interfaces.d.ts.map +1 -1
  87. package/build/common/spec-parser/interfaces.js +3 -3
  88. package/build/common/spec-parser/interfaces.js.map +1 -1
  89. package/build/common/spec-parser/manifestUpdater.d.ts +4 -4
  90. package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
  91. package/build/common/spec-parser/manifestUpdater.js +49 -110
  92. package/build/common/spec-parser/manifestUpdater.js.map +1 -1
  93. package/build/common/spec-parser/specFilter.d.ts +1 -1
  94. package/build/common/spec-parser/specFilter.d.ts.map +1 -1
  95. package/build/common/spec-parser/specFilter.js +2 -2
  96. package/build/common/spec-parser/specFilter.js.map +1 -1
  97. package/build/common/spec-parser/specParser.browser.d.ts +46 -0
  98. package/build/common/spec-parser/specParser.browser.d.ts.map +1 -0
  99. package/build/common/spec-parser/specParser.browser.js +139 -0
  100. package/build/common/spec-parser/specParser.browser.js.map +1 -0
  101. package/build/common/spec-parser/specParser.d.ts +11 -11
  102. package/build/common/spec-parser/specParser.d.ts.map +1 -1
  103. package/build/common/spec-parser/specParser.js +100 -113
  104. package/build/common/spec-parser/specParser.js.map +1 -1
  105. package/build/common/spec-parser/utils.d.ts +18 -5
  106. package/build/common/spec-parser/utils.d.ts.map +1 -1
  107. package/build/common/spec-parser/utils.js +304 -41
  108. package/build/common/spec-parser/utils.js.map +1 -1
  109. package/build/common/telemetry.d.ts +23 -2
  110. package/build/common/telemetry.d.ts.map +1 -1
  111. package/build/common/telemetry.js +40 -1
  112. package/build/common/telemetry.js.map +1 -1
  113. package/build/common/templates-config.json +2 -2
  114. package/build/common/tools.d.ts.map +1 -1
  115. package/build/common/tools.js +1 -1
  116. package/build/common/tools.js.map +1 -1
  117. package/build/component/configManager/validator.d.ts.map +1 -1
  118. package/build/component/configManager/validator.js +2 -3
  119. package/build/component/configManager/validator.js.map +1 -1
  120. package/build/component/coordinator/index.d.ts +2 -1
  121. package/build/component/coordinator/index.d.ts.map +1 -1
  122. package/build/component/coordinator/index.js +3 -1
  123. package/build/component/coordinator/index.js.map +1 -1
  124. package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
  125. package/build/component/developerPortalScaffoldUtils.js +32 -0
  126. package/build/component/developerPortalScaffoldUtils.js.map +1 -1
  127. package/build/component/driver/aad/create.js +1 -1
  128. package/build/component/driver/aad/create.js.map +1 -1
  129. package/build/component/driver/aad/error/invalidFieldInManifestError.js +1 -1
  130. package/build/component/driver/aad/error/invalidFieldInManifestError.js.map +1 -1
  131. package/build/component/driver/aad/permissions/index.d.ts +3 -0
  132. package/build/component/driver/aad/permissions/index.d.ts.map +1 -1
  133. package/build/component/driver/aad/permissions/index.js +34 -1
  134. package/build/component/driver/aad/permissions/index.js.map +1 -1
  135. package/build/component/driver/aad/permissions/permissions.json +42 -42
  136. package/build/component/driver/aad/update.d.ts +1 -0
  137. package/build/component/driver/aad/update.d.ts.map +1 -1
  138. package/build/component/driver/aad/update.js +19 -17
  139. package/build/component/driver/aad/update.js.map +1 -1
  140. package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
  141. package/build/component/driver/aad/utility/aadAppClient.js +9 -9
  142. package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
  143. package/build/component/driver/aad/utility/constants.js +1 -1
  144. package/build/component/driver/aad/utility/constants.js.map +1 -1
  145. package/build/component/driver/apiKey/create.d.ts +17 -0
  146. package/build/component/driver/apiKey/create.d.ts.map +1 -0
  147. package/build/component/driver/apiKey/create.js +228 -0
  148. package/build/component/driver/apiKey/create.js.map +1 -0
  149. package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.d.ts +5 -0
  150. package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.d.ts.map +1 -0
  151. package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js +22 -0
  152. package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js.map +1 -0
  153. package/build/component/driver/apiKey/error/apiKeyDomainInvalid.d.ts +5 -0
  154. package/build/component/driver/apiKey/error/apiKeyDomainInvalid.d.ts.map +1 -0
  155. package/build/component/driver/apiKey/error/apiKeyDomainInvalid.js +22 -0
  156. package/build/component/driver/apiKey/error/apiKeyDomainInvalid.js.map +1 -0
  157. package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.d.ts +5 -0
  158. package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.d.ts.map +1 -0
  159. package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.js +21 -0
  160. package/build/component/driver/apiKey/error/apiKeyFailedToGetDomain.js.map +1 -0
  161. package/build/component/driver/apiKey/error/apiKeyNameTooLong.d.ts +5 -0
  162. package/build/component/driver/apiKey/error/apiKeyNameTooLong.d.ts.map +1 -0
  163. package/build/component/driver/apiKey/error/apiKeyNameTooLong.js +21 -0
  164. package/build/component/driver/apiKey/error/apiKeyNameTooLong.js.map +1 -0
  165. package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts +7 -0
  166. package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts.map +1 -0
  167. package/build/component/driver/apiKey/interface/createApiKeyArgs.js +5 -0
  168. package/build/component/driver/apiKey/interface/createApiKeyArgs.js.map +1 -0
  169. package/build/component/driver/apiKey/interface/createApiKeyOutputs.d.ts +7 -0
  170. package/build/component/driver/apiKey/interface/createApiKeyOutputs.d.ts.map +1 -0
  171. package/build/component/driver/apiKey/interface/createApiKeyOutputs.js +10 -0
  172. package/build/component/driver/apiKey/interface/createApiKeyOutputs.js.map +1 -0
  173. package/build/component/driver/apiKey/utility/constants.d.ts +10 -0
  174. package/build/component/driver/apiKey/utility/constants.d.ts.map +1 -0
  175. package/build/component/driver/apiKey/utility/constants.js +15 -0
  176. package/build/component/driver/apiKey/utility/constants.js.map +1 -0
  177. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts +3 -2
  178. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
  179. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +5 -1
  180. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
  181. package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts +5 -0
  182. package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
  183. package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +27 -6
  184. package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
  185. package/build/component/driver/devTool/installDriver.d.ts +2 -1
  186. package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
  187. package/build/component/driver/devTool/installDriver.js +5 -2
  188. package/build/component/driver/devTool/installDriver.js.map +1 -1
  189. package/build/component/driver/index.d.ts +1 -0
  190. package/build/component/driver/index.d.ts.map +1 -1
  191. package/build/component/driver/index.js +1 -0
  192. package/build/component/driver/index.js.map +1 -1
  193. package/build/component/driver/script/scriptDriver.d.ts +12 -7
  194. package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
  195. package/build/component/driver/script/scriptDriver.js +52 -23
  196. package/build/component/driver/script/scriptDriver.js.map +1 -1
  197. package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +13 -0
  198. package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
  199. package/build/component/driver/teamsApp/clients/appStudioClient.js +38 -0
  200. package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
  201. package/build/component/driver/teamsApp/constants.d.ts +2 -0
  202. package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
  203. package/build/component/driver/teamsApp/constants.js +2 -0
  204. package/build/component/driver/teamsApp/constants.js.map +1 -1
  205. package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
  206. package/build/component/driver/teamsApp/createAppPackage.js +26 -6
  207. package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
  208. package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.d.ts +44 -0
  209. package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.d.ts.map +1 -0
  210. package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.js +21 -0
  211. package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.js.map +1 -0
  212. package/build/component/driver/teamsApp/interfaces/ApiSecretRegistrationClientSecret.d.ts +15 -0
  213. package/build/component/driver/teamsApp/interfaces/ApiSecretRegistrationClientSecret.d.ts.map +1 -0
  214. package/build/component/driver/teamsApp/interfaces/ApiSecretRegistrationClientSecret.js +5 -0
  215. package/build/component/driver/teamsApp/interfaces/ApiSecretRegistrationClientSecret.js.map +1 -0
  216. package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts +1 -1
  217. package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts.map +1 -1
  218. package/build/component/driver/teamsApp/publishAppPackage.d.ts +1 -0
  219. package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
  220. package/build/component/driver/teamsApp/publishAppPackage.js +9 -9
  221. package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
  222. package/build/component/driver/teamsApp/teamsappMgr.d.ts +20 -0
  223. package/build/component/driver/teamsApp/teamsappMgr.d.ts.map +1 -0
  224. package/build/component/driver/teamsApp/teamsappMgr.js +278 -0
  225. package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -0
  226. package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
  227. package/build/component/driver/teamsApp/validate.js +7 -2
  228. package/build/component/driver/teamsApp/validate.js.map +1 -1
  229. package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
  230. package/build/component/driver/teamsApp/validateAppPackage.js +49 -15
  231. package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
  232. package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
  233. package/build/component/generator/copilotPlugin/generator.js +47 -30
  234. package/build/component/generator/copilotPlugin/generator.js.map +1 -1
  235. package/build/component/generator/copilotPlugin/helper.d.ts +4 -2
  236. package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
  237. package/build/component/generator/copilotPlugin/helper.js +105 -20
  238. package/build/component/generator/copilotPlugin/helper.js.map +1 -1
  239. package/build/component/generator/error.d.ts +5 -8
  240. package/build/component/generator/error.d.ts.map +1 -1
  241. package/build/component/generator/error.js +16 -16
  242. package/build/component/generator/error.js.map +1 -1
  243. package/build/component/generator/generator.d.ts +5 -1
  244. package/build/component/generator/generator.d.ts.map +1 -1
  245. package/build/component/generator/generator.js +26 -27
  246. package/build/component/generator/generator.js.map +1 -1
  247. package/build/component/generator/generatorAction.d.ts +6 -1
  248. package/build/component/generator/generatorAction.d.ts.map +1 -1
  249. package/build/component/generator/generatorAction.js +30 -12
  250. package/build/component/generator/generatorAction.js.map +1 -1
  251. package/build/component/generator/officeAddin/helperMethods.js +21 -20
  252. package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
  253. package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
  254. package/build/component/generator/spfx/spfxGenerator.js +7 -0
  255. package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
  256. package/build/component/generator/spfx/utils/constants.d.ts +1 -14
  257. package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
  258. package/build/component/generator/spfx/utils/constants.js +1 -14
  259. package/build/component/generator/spfx/utils/constants.js.map +1 -1
  260. package/build/component/generator/utils.d.ts +7 -5
  261. package/build/component/generator/utils.d.ts.map +1 -1
  262. package/build/component/generator/utils.js +35 -16
  263. package/build/component/generator/utils.js.map +1 -1
  264. package/build/component/middleware/questionMW.d.ts +1 -1
  265. package/build/component/middleware/questionMW.d.ts.map +1 -1
  266. package/build/component/middleware/questionMW.js +4 -1
  267. package/build/component/middleware/questionMW.js.map +1 -1
  268. package/build/component/utils/ResourceGroupHelper.d.ts +1 -0
  269. package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
  270. package/build/component/utils/ResourceGroupHelper.js +31 -1
  271. package/build/component/utils/ResourceGroupHelper.js.map +1 -1
  272. package/build/component/utils/common.d.ts +3 -1
  273. package/build/component/utils/common.d.ts.map +1 -1
  274. package/build/component/utils/common.js +2 -2
  275. package/build/component/utils/common.js.map +1 -1
  276. package/build/component/utils/envUtil.d.ts +1 -0
  277. package/build/component/utils/envUtil.d.ts.map +1 -1
  278. package/build/component/utils/envUtil.js +6 -1
  279. package/build/component/utils/envUtil.js.map +1 -1
  280. package/build/component/utils/fileOperation.d.ts +1 -1
  281. package/build/component/utils/fileOperation.d.ts.map +1 -1
  282. package/build/component/utils/fileOperation.js +34 -48
  283. package/build/component/utils/fileOperation.js.map +1 -1
  284. package/build/component/utils/metadataGraphPermssion.d.ts +16 -0
  285. package/build/component/utils/metadataGraphPermssion.d.ts.map +1 -0
  286. package/build/component/utils/metadataGraphPermssion.js +96 -0
  287. package/build/component/utils/metadataGraphPermssion.js.map +1 -0
  288. package/build/component/utils/metadataUtil.d.ts.map +1 -1
  289. package/build/component/utils/metadataUtil.js +2 -0
  290. package/build/component/utils/metadataUtil.js.map +1 -1
  291. package/build/core/FxCore.d.ts +24 -1
  292. package/build/core/FxCore.d.ts.map +1 -1
  293. package/build/core/FxCore.js +189 -25
  294. package/build/core/FxCore.js.map +1 -1
  295. package/build/core/middleware/projectMigratorV3.d.ts +1 -1
  296. package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
  297. package/build/core/middleware/projectMigratorV3.js +11 -10
  298. package/build/core/middleware/projectMigratorV3.js.map +1 -1
  299. package/build/core/middleware/projectVersionChecker.js +4 -4
  300. package/build/core/middleware/projectVersionChecker.js.map +1 -1
  301. package/build/core/middleware/utils/debug/taskMigrator.js +1 -1
  302. package/build/error/common.d.ts +9 -0
  303. package/build/error/common.d.ts.map +1 -1
  304. package/build/error/common.js +34 -1
  305. package/build/error/common.js.map +1 -1
  306. package/build/error/deploy.d.ts +6 -0
  307. package/build/error/deploy.d.ts.map +1 -1
  308. package/build/error/deploy.js +25 -1
  309. package/build/error/deploy.js.map +1 -1
  310. package/build/error/teamsApp.d.ts +4 -1
  311. package/build/error/teamsApp.d.ts.map +1 -1
  312. package/build/error/teamsApp.js +13 -1
  313. package/build/error/teamsApp.js.map +1 -1
  314. package/build/index.d.ts +4 -0
  315. package/build/index.d.ts.map +1 -1
  316. package/build/index.js +8 -1
  317. package/build/index.js.map +1 -1
  318. package/build/question/create.d.ts +2 -1
  319. package/build/question/create.d.ts.map +1 -1
  320. package/build/question/create.js +78 -24
  321. package/build/question/create.js.map +1 -1
  322. package/build/question/generator.js +1 -3
  323. package/build/question/generator.js.map +1 -1
  324. package/build/question/index.d.ts +1 -0
  325. package/build/question/index.d.ts.map +1 -1
  326. package/build/question/index.js +3 -0
  327. package/build/question/index.js.map +1 -1
  328. package/build/question/inputs/CreateProjectInputs.d.ts +1 -1
  329. package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
  330. package/build/question/inputs/DeployAadManifestInputs.d.ts +1 -1
  331. package/build/question/inputs/DeployAadManifestInputs.d.ts.map +1 -1
  332. package/build/question/inputs/PermissionGrantInputs.d.ts +2 -2
  333. package/build/question/inputs/PermissionGrantInputs.d.ts.map +1 -1
  334. package/build/question/inputs/PermissionListInputs.d.ts +1 -1
  335. package/build/question/inputs/PermissionListInputs.d.ts.map +1 -1
  336. package/build/question/inputs/SPFxAddWebpartInputs.d.ts +2 -0
  337. package/build/question/inputs/SPFxAddWebpartInputs.d.ts.map +1 -1
  338. package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
  339. package/build/question/options/CreateProjectOptions.js +2 -1
  340. package/build/question/options/CreateProjectOptions.js.map +1 -1
  341. package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -1
  342. package/build/question/options/CreateSampleProjectOptions.js +5 -1
  343. package/build/question/options/CreateSampleProjectOptions.js.map +1 -1
  344. package/build/question/options/DeployAadManifestOptions.js +2 -2
  345. package/build/question/options/DeployAadManifestOptions.js.map +1 -1
  346. package/build/question/options/PermissionGrantOptions.js +2 -2
  347. package/build/question/options/PermissionGrantOptions.js.map +1 -1
  348. package/build/question/options/PermissionListOptions.js +2 -2
  349. package/build/question/options/PermissionListOptions.js.map +1 -1
  350. package/build/question/options/SPFxAddWebpartOptions.d.ts.map +1 -1
  351. package/build/question/options/SPFxAddWebpartOptions.js +9 -0
  352. package/build/question/options/SPFxAddWebpartOptions.js.map +1 -1
  353. package/build/question/other.d.ts +3 -1
  354. package/build/question/other.d.ts.map +1 -1
  355. package/build/question/other.js +83 -7
  356. package/build/question/other.js.map +1 -1
  357. package/build/question/questionNames.d.ts +2 -0
  358. package/build/question/questionNames.d.ts.map +1 -1
  359. package/build/question/questionNames.js +2 -0
  360. package/build/question/questionNames.js.map +1 -1
  361. package/build/ui/visitor.d.ts.map +1 -1
  362. package/build/ui/visitor.js +11 -2
  363. package/build/ui/visitor.js.map +1 -1
  364. package/package.json +16 -23
  365. package/resource/package.nls.json +74 -51
  366. package/resource/yaml-schema/v1.3/yaml.schema.json +81 -35
  367. package/templates/core/v3Migration/csharp.app.local.yml +6 -6
  368. package/templates/core/v3Migration/csharp.app.yml +6 -6
  369. package/templates/core/v3Migration/js.ts.app.local.yml +11 -11
  370. package/templates/core/v3Migration/js.ts.app.yml +12 -12
  371. package/templates/fallback/common.zip +0 -0
  372. package/templates/fallback/csharp.zip +0 -0
  373. package/templates/fallback/js.zip +0 -0
  374. package/templates/fallback/ts.zip +0 -0
  375. package/templates/plugins/resource/aad/auth/V3/Bot/Pages/BotAuthorizeEndPage.cshtml +55 -51
  376. package/templates/plugins/resource/aad/auth/V3/Enable SSO.txt +2 -2
  377. package/templates/plugins/resource/aad/auth/bot/README.md +13 -13
  378. package/templates/plugins/resource/aad/auth/bot/README.txt +7 -7
  379. package/templates/plugins/resource/aad/auth/bot/csharp/Pages/BotAuthorizeEndPage.cshtml +55 -51
  380. package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +6 -2
  381. package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +5 -1
  382. package/templates/plugins/resource/aad/auth/tab/README.md +6 -6
  383. package/templates/plugins/resource/aad/auth/tab/README.txt +5 -5
  384. package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +16 -9
  385. package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +11 -7
  386. package/templates/plugins/resource/aad/auth/tab/js/sso/GetUserProfile.jsx +1 -1
  387. package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +16 -9
  388. package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +11 -7
  389. package/templates/plugins/resource/aad/auth/tab/ts/sso/GetUserProfile.tsx +1 -1
@@ -20,6 +20,7 @@ const localizeUtils_1 = require("../../../../../common/localizeUtils");
20
20
  const error_1 = require("../../../../../error");
21
21
  const hooks_1 = require("@feathersjs/hooks");
22
22
  const globalVars_1 = require("../../../../../core/globalVars");
23
+ const path_1 = tslib_1.__importDefault(require("path"));
23
24
  class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
24
25
  constructor() {
25
26
  super(...arguments);
@@ -43,8 +44,28 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
43
44
  return false;
44
45
  }
45
46
  await this.azureDeploy(inputs, azureResource, azureCredential);
47
+ await this.cleanup();
46
48
  return true;
47
49
  }
50
+ /**
51
+ * cleanup function after deployment is finished
52
+ * @protected
53
+ */
54
+ async cleanup() {
55
+ if (this.zipFilePath && !this.dryRun && fs.existsSync(this.zipFilePath)) {
56
+ try {
57
+ await fs.remove(this.zipFilePath);
58
+ // if upper folder is empty, remove it
59
+ const parentFolder = path_1.default.dirname(this.zipFilePath);
60
+ if ((await fs.readdir(parentFolder)).length === 0) {
61
+ await fs.remove(parentFolder);
62
+ }
63
+ }
64
+ catch (e) {
65
+ this.logger.warning(`Failed to remove zip package. ${JSON.stringify(e, Object.getOwnPropertyNames(e))}`);
66
+ }
67
+ }
68
+ }
48
69
  /**
49
70
  * check if resource id is legal and parse it
50
71
  * @param resourceId deploy target
@@ -110,7 +131,7 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
110
131
  const defaultScope = "https://management.azure.com/.default";
111
132
  const token = await azureCredential.getToken(defaultScope);
112
133
  if (token) {
113
- this.logger.info("Get AAD token successfully. Upload zip package through AAD Auth mode.");
134
+ this.logger.info("Get Microsoft Entra token successfully. Upload zip package through AAD Auth mode.");
114
135
  return {
115
136
  headers: {
116
137
  "Content-Type": "application/octet-stream",
@@ -123,10 +144,10 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
123
144
  };
124
145
  }
125
146
  else {
126
- this.context.telemetryReporter.sendTelemetryErrorEvent("Get-Deploy-AAD-token-failed", {
127
- error: "AAD token is empty.",
147
+ this.context.telemetryReporter.sendTelemetryErrorEvent("Get-Deploy-Microsoft Entra-token-failed", {
148
+ error: "Microsoft Entra token is empty.",
128
149
  });
129
- this.logger.info("Get AAD token failed. AAD Token is empty. Upload zip package through basic auth mode. Please check your Azure credential.");
150
+ this.logger.info("Get Microsoft Entra token failed. AAD Token is empty. Upload zip package through basic auth mode. Please check your Azure credential.");
130
151
  }
131
152
  }
132
153
  catch (e) {
@@ -135,9 +156,9 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
135
156
  });
136
157
  this.logger.info(`Get AAD token failed with error: ${JSON.stringify(e, Object.getOwnPropertyNames(e))}. Upload zip package through basic auth mode.`);
137
158
  }
138
- // IF only enable AAD deploy, throw error
159
+ // IF only enable Microsoft Entra deploy, throw error
139
160
  if (process.env["TEAMSFX_AAD_DEPLOY_ONLY"] === "true") {
140
- throw new error_1.GetPublishingCredentialsError(azureResource.instanceId, azureResource.resourceGroupName, new Error("Get AAD token failed."), this.helpLink);
161
+ throw new error_1.GetPublishingCredentialsError(azureResource.instanceId, azureResource.resourceGroupName, new Error("Get Microsoft Entra token failed."), this.helpLink);
141
162
  }
142
163
  const managementClient = this.managementClient;
143
164
  const listResponse = await azureSdkErrorHandler_1.wrapAzureOperation(() => managementClient.webApps.beginListPublishingCredentialsAndWait(azureResource.resourceGroupName, azureResource.instanceId), (e) => new error_1.GetPublishingCredentialsError(azureResource.instanceId, azureResource.resourceGroupName, e, this.helpLink), (e) => new error_1.GetPublishingCredentialsError(azureResource.instanceId, azureResource.resourceGroupName, e, this.helpLink));
@@ -1 +1 @@
1
- {"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import { FxError, Result } from "@microsoft/teamsfx-api";
2
+ import { TestToolReleaseType } from "../../../common/deps-checker";
2
3
  import { DriverContext } from "../interface/commonArgs";
3
4
  import { ExecutionResult, StepDriver } from "../interface/stepDriver";
4
5
  import { WrapDriverContext } from "../util/wrapUtil";
@@ -17,7 +18,7 @@ export declare class ToolsInstallDriverImpl {
17
18
  resolveLocalCertificate(trustDevCert: boolean, outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
18
19
  resolveFuncCoreTools(version: string, symlinkDir?: string, outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
19
20
  resolveDotnet(outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
20
- resolveTestTool(versionRange: string, symlinkDir: string): Promise<void>;
21
+ resolveTestTool(releaseType: TestToolReleaseType, versionRange: string, symlinkDir: string): Promise<void>;
21
22
  private validateArgs;
22
23
  private setArgTelemetry;
23
24
  private setDevCertTelemetry;
@@ -1 +1 @@
1
- {"version":3,"file":"installDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAYzD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAUrD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAsB/D,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA6B;IACxC,QAAQ,CAAC,aAAa,SAAyD;IAEzE,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK1C,OAAO,CACX,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAUrB,IAAI,CACR,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;CAMjD;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB;IAGxC,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAmCzB,uBAAuB,CAC3B,YAAY,EAAE,OAAO,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAqCzB,oBAAoB,CACxB,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwCzB,aAAa,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAuCpF,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B9E,OAAO,CAAC,YAAY;IAqCpB,OAAO,CAAC,eAAe;IAyBvB,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,qBAAqB;CAe9B"}
1
+ {"version":3,"file":"installDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAIL,mBAAmB,EAEpB,MAAM,8BAA8B,CAAC;AAMtC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAUrD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAsB/D,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA6B;IACxC,QAAQ,CAAC,aAAa,SAAyD;IAEzE,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK1C,OAAO,CACX,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAUrB,IAAI,CACR,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;CAMjD;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB;IAGxC,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwCzB,uBAAuB,CAC3B,YAAY,EAAE,OAAO,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAqCzB,oBAAoB,CACxB,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwCzB,aAAa,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAuCpF,eAAe,CACnB,WAAW,EAAE,mBAAmB,EAChC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IA+BhB,OAAO,CAAC,YAAY;IAqCpB,OAAO,CAAC,eAAe;IAyBvB,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,qBAAqB;CAe9B"}
@@ -91,7 +91,9 @@ class ToolsInstallDriverImpl {
91
91
  dotnetRes.forEach((v, k) => res.set(k, v));
92
92
  }
93
93
  if (args.testTool) {
94
- await this.resolveTestTool(`${args.testTool.version}`, args.testTool.symlinkDir);
94
+ await this.resolveTestTool(
95
+ // Hardcode to npm release type if running from YAML
96
+ deps_checker_1.TestToolReleaseType.Npm, `${args.testTool.version}`, args.testTool.symlinkDir);
95
97
  }
96
98
  return res;
97
99
  }
@@ -197,11 +199,12 @@ class ToolsInstallDriverImpl {
197
199
  }
198
200
  return res;
199
201
  }
200
- async resolveTestTool(versionRange, symlinkDir) {
202
+ async resolveTestTool(releaseType, versionRange, symlinkDir) {
201
203
  var _a;
202
204
  const checker = new testToolChecker_1.TestToolChecker();
203
205
  const projectPath = this.context.projectPath;
204
206
  const status = await checker.resolve({
207
+ releaseType,
205
208
  versionRange,
206
209
  symlinkDir,
207
210
  projectPath,
@@ -1 +1 @@
1
- {"version":3,"file":"installDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"installDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"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"}
@@ -26,4 +26,5 @@ import "./file/createOrUpdateJsonFile";
26
26
  import "./botFramework/createOrUpdateBot";
27
27
  import "./m365/acquire";
28
28
  import "./add/addWebPart";
29
+ import "./apiKey/create";
29
30
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,mBAAmB,CAAC;AAC3B,OAAO,qBAAqB,CAAC;AAC7B,OAAO,+BAA+B,CAAC;AACvC,OAAO,sBAAsB,CAAC;AAC9B,OAAO,iCAAiC,CAAC;AACzC,OAAO,8BAA8B,CAAC;AACtC,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,oBAAoB,CAAC;AAC5B,OAAO,4CAA4C,CAAC;AACpD,OAAO,0CAA0C,CAAC;AAClD,OAAO,yCAAyC,CAAC;AACjD,OAAO,sDAAsD,CAAC;AAC9D,OAAO,4BAA4B,CAAC;AACpC,OAAO,4BAA4B,CAAC;AACpC,OAAO,yBAAyB,CAAC;AACjC,OAAO,yBAAyB,CAAC;AACjC,OAAO,uBAAuB,CAAC;AAC/B,OAAO,yBAAyB,CAAC;AACjC,OAAO,sCAAsC,CAAC;AAC9C,OAAO,+BAA+B,CAAC;AACvC,OAAO,kCAAkC,CAAC;AAC1C,OAAO,gBAAgB,CAAC;AACxB,OAAO,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,mBAAmB,CAAC;AAC3B,OAAO,qBAAqB,CAAC;AAC7B,OAAO,+BAA+B,CAAC;AACvC,OAAO,sBAAsB,CAAC;AAC9B,OAAO,iCAAiC,CAAC;AACzC,OAAO,8BAA8B,CAAC;AACtC,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,oBAAoB,CAAC;AAC5B,OAAO,4CAA4C,CAAC;AACpD,OAAO,0CAA0C,CAAC;AAClD,OAAO,yCAAyC,CAAC;AACjD,OAAO,sDAAsD,CAAC;AAC9D,OAAO,4BAA4B,CAAC;AACpC,OAAO,4BAA4B,CAAC;AACpC,OAAO,yBAAyB,CAAC;AACjC,OAAO,yBAAyB,CAAC;AACjC,OAAO,uBAAuB,CAAC;AAC/B,OAAO,yBAAyB,CAAC;AACjC,OAAO,sCAAsC,CAAC;AAC9C,OAAO,+BAA+B,CAAC;AACvC,OAAO,kCAAkC,CAAC;AAC1C,OAAO,gBAAgB,CAAC;AACxB,OAAO,kBAAkB,CAAC;AAC1B,OAAO,iBAAiB,CAAC"}
@@ -30,4 +30,5 @@ require("./file/createOrUpdateJsonFile");
30
30
  require("./botFramework/createOrUpdateBot");
31
31
  require("./m365/acquire");
32
32
  require("./add/addWebPart");
33
+ require("./apiKey/create");
33
34
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAElC;;GAEG;AACH,6BAA2B;AAC3B,+BAA6B;AAC7B,yCAAuC;AACvC,gCAA8B;AAC9B,2CAAyC;AACzC,wCAAsC;AACtC,wBAAsB;AACtB,wBAAsB;AACtB,wBAAsB;AACtB,8BAA4B;AAC5B,sDAAoD;AACpD,oDAAkD;AAClD,mDAAiD;AACjD,gEAA8D;AAC9D,sCAAoC;AACpC,sCAAoC;AACpC,mCAAiC;AACjC,mCAAiC;AACjC,iCAA+B;AAC/B,mCAAiC;AACjC,gDAA8C;AAC9C,yCAAuC;AACvC,4CAA0C;AAC1C,0BAAwB;AACxB,4BAA0B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAElC;;GAEG;AACH,6BAA2B;AAC3B,+BAA6B;AAC7B,yCAAuC;AACvC,gCAA8B;AAC9B,2CAAyC;AACzC,wCAAsC;AACtC,wBAAsB;AACtB,wBAAsB;AACtB,wBAAsB;AACtB,8BAA4B;AAC5B,sDAAoD;AACpD,oDAAkD;AAClD,mDAAiD;AACjD,gEAA8D;AAC9D,sCAAoC;AACpC,sCAAoC;AACpC,mCAAiC;AACjC,mCAAiC;AACjC,iCAA+B;AAC/B,mCAAiC;AACjC,gDAA8C;AAC9C,yCAAuC;AACvC,4CAA0C;AAC1C,0BAAwB;AACxB,4BAA0B;AAC1B,2BAAyB"}
@@ -1,13 +1,10 @@
1
1
  /// <reference types="node" />
2
- /**
3
- * @author huajiezhang <huajiezhang@microsoft.com>
4
- */
5
- import { FxError, Result, LogProvider } from "@microsoft/teamsfx-api";
2
+ import { FxError, LogProvider, Result } from "@microsoft/teamsfx-api";
3
+ import child_process from "child_process";
4
+ import { ScriptExecutionError, ScriptTimeoutError } from "../../../error/script";
5
+ import { DotenvOutput } from "../../utils/envUtil";
6
6
  import { DriverContext } from "../interface/commonArgs";
7
7
  import { ExecutionResult, StepDriver } from "../interface/stepDriver";
8
- import { DotenvOutput } from "../../utils/envUtil";
9
- import { ScriptExecutionError, ScriptTimeoutError } from "../../../error/script";
10
- import child_process from "child_process";
11
8
  interface ScriptDriverArgs {
12
9
  run: string;
13
10
  workingDirectory?: string;
@@ -15,6 +12,14 @@ interface ScriptDriverArgs {
15
12
  timeout?: number;
16
13
  redirectTo?: string;
17
14
  }
15
+ /**
16
+ * Get the default shell for the current platform:
17
+ * - If `SHELL` environment variable is set, return its value. otherwise:
18
+ * - On macOS, return `/bin/zsh` if it exists, otherwise return `/bin/bash`.
19
+ * - On Windows, return the value of the `ComSpec` environment variable if it exists, otherwise return `cmd.exe`.
20
+ * - On Linux, return `/bin/sh`.
21
+ */
22
+ export declare function defaultShell(): Promise<string | undefined>;
18
23
  export declare class ScriptDriver implements StepDriver {
19
24
  _run(typedArgs: ScriptDriverArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
20
25
  execute(args: unknown, ctx: DriverContext): Promise<ExecutionResult>;
@@ -1 +1 @@
1
- {"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAMjF,OAAO,aAAa,MAAM,eAAe,CAAC;AAI1C,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAsB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAQ3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CAkElD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAYlE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAUvD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD"}
1
+ {"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAC/E,OAAO,aAAa,MAAM,eAAe,CAAC;AAM1C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgBhE;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAsB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAQ3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CAsElD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAYlE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAUvD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD"}
@@ -2,25 +2,52 @@
2
2
  // Copyright (c) Microsoft Corporation.
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.capitalizeFirstLetter = exports.maskSecretValues = exports.parseSetOutputCommand = exports.convertScriptErrorToFxError = exports.bufferToString = exports.getStderrHandler = exports.executeCommand = exports.scriptDriver = exports.ScriptDriver = void 0;
5
+ exports.capitalizeFirstLetter = exports.maskSecretValues = exports.parseSetOutputCommand = exports.convertScriptErrorToFxError = exports.bufferToString = exports.getStderrHandler = exports.executeCommand = exports.scriptDriver = exports.ScriptDriver = exports.defaultShell = void 0;
6
6
  const tslib_1 = require("tslib");
7
7
  /**
8
8
  * @author huajiezhang <huajiezhang@microsoft.com>
9
9
  */
10
+ const hooks_1 = require("@feathersjs/hooks");
10
11
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
12
+ const child_process_1 = tslib_1.__importDefault(require("child_process"));
13
+ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
14
+ const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
15
+ const os_1 = tslib_1.__importDefault(require("os"));
16
+ const path = tslib_1.__importStar(require("path"));
11
17
  const typedi_1 = require("typedi");
12
- const hooks_1 = require("@feathersjs/hooks");
13
- const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
18
+ const script_1 = require("../../../error/script");
14
19
  const commonConstant_1 = require("../../constant/commonConstant");
15
20
  const messages_1 = require("../../messages");
16
- const script_1 = require("../../../error/script");
17
21
  const charsetUtils_1 = require("../../utils/charsetUtils");
18
- const path = tslib_1.__importStar(require("path"));
19
- const os_1 = tslib_1.__importDefault(require("os"));
20
- const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
21
- const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
22
- const child_process_1 = tslib_1.__importDefault(require("child_process"));
22
+ const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
23
23
  const ACTION_NAME = "script";
24
+ /**
25
+ * Get the default shell for the current platform:
26
+ * - If `SHELL` environment variable is set, return its value. otherwise:
27
+ * - On macOS, return `/bin/zsh` if it exists, otherwise return `/bin/bash`.
28
+ * - On Windows, return the value of the `ComSpec` environment variable if it exists, otherwise return `cmd.exe`.
29
+ * - On Linux, return `/bin/sh`.
30
+ */
31
+ async function defaultShell() {
32
+ if (process.env.SHELL) {
33
+ return process.env.SHELL;
34
+ }
35
+ if (process.platform === "darwin") {
36
+ if (await fs_extra_1.default.pathExists("/bin/zsh"))
37
+ return "/bin/zsh";
38
+ else if (await fs_extra_1.default.pathExists("/bin/bash"))
39
+ return "/bin/bash";
40
+ return undefined;
41
+ }
42
+ if (process.platform === "win32") {
43
+ return process.env.ComSpec || "cmd.exe";
44
+ }
45
+ if (await fs_extra_1.default.pathExists("/bin/sh")) {
46
+ return "/bin/sh";
47
+ }
48
+ return undefined;
49
+ }
50
+ exports.defaultShell = defaultShell;
24
51
  let ScriptDriver = class ScriptDriver {
25
52
  async _run(typedArgs, context) {
26
53
  var _a, _b;
@@ -54,34 +81,36 @@ exports.ScriptDriver = ScriptDriver;
54
81
  exports.scriptDriver = new ScriptDriver();
55
82
  async function executeCommand(command, projectPath, logProvider, ui, workingDirectory, env, shell, timeout, redirectTo) {
56
83
  const systemEncoding = await charsetUtils_1.getSystemEncoding();
57
- return new Promise((resolve, reject) => {
84
+ const dshell = await defaultShell();
85
+ return new Promise((resolve) => {
58
86
  var _a, _b;
87
+ const finalShell = shell || dshell;
88
+ let finalCmd = command;
89
+ if (typeof finalShell === "string" && finalShell.includes("cmd")) {
90
+ finalCmd = `%ComSpec% /D /E:ON /V:OFF /S /C "CALL ${command}"`;
91
+ }
59
92
  const platform = os_1.default.platform();
60
93
  let workingDir = workingDirectory || ".";
61
94
  workingDir = path.isAbsolute(workingDir) ? workingDir : path.join(projectPath, workingDir);
62
95
  if (platform === "win32") {
63
96
  workingDir = capitalizeFirstLetter(path.resolve(workingDir !== null && workingDir !== void 0 ? workingDir : ""));
64
97
  }
65
- let run = command;
66
98
  let appendFile = undefined;
67
99
  if (redirectTo) {
68
100
  appendFile = path.isAbsolute(redirectTo) ? redirectTo : path.join(projectPath, redirectTo);
69
101
  }
70
- if (shell === "cmd") {
71
- run = `%ComSpec% /D /E:ON /V:OFF /S /C "CALL ${command}"`;
72
- }
73
- logProvider.verbose(`Start to run command: "${command}" with args: ${JSON.stringify({
74
- shell: shell,
102
+ logProvider.verbose(`Start to run command: "${maskSecretValues(finalCmd)}" with args: ${JSON.stringify({
103
+ shell: finalShell,
75
104
  cwd: workingDir,
76
- encoding: "buffer",
105
+ encoding: systemEncoding,
77
106
  env: Object.assign(Object.assign({}, process.env), env),
78
107
  timeout: timeout,
79
108
  })}.`);
80
109
  const allOutputStrings = [];
81
110
  const stderrStrings = [];
82
111
  process.env.VSLANG = undefined; // Workaroud to disable VS environment variable to void charset encoding issue for non-English characters
83
- const cp = child_process_1.default.exec(run, {
84
- shell: shell,
112
+ const cp = child_process_1.default.exec(finalCmd, {
113
+ shell: finalShell,
85
114
  cwd: workingDir,
86
115
  encoding: "buffer",
87
116
  env: Object.assign(Object.assign({}, process.env), env),
@@ -89,14 +118,14 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
89
118
  }, (error) => {
90
119
  if (error) {
91
120
  error.message = stderrStrings.join("").trim() || error.message;
92
- resolve(teamsfx_api_1.err(convertScriptErrorToFxError(error, run)));
121
+ resolve(teamsfx_api_1.err(convertScriptErrorToFxError(error, finalCmd)));
93
122
  }
94
123
  else {
95
124
  // handle '::set-output' or '::set-teamsfx-env' pattern
96
125
  const outputString = allOutputStrings.join("");
97
126
  const outputObject = parseSetOutputCommand(outputString);
98
127
  if (Object.keys(outputObject).length > 0)
99
- logProvider.verbose(`script output env variables: ${JSON.stringify(outputObject)}`);
128
+ logProvider.verbose(`script output env variables: ${maskSecretValues(JSON.stringify(outputObject))}`);
100
129
  resolve(teamsfx_api_1.ok([outputString, outputObject]));
101
130
  }
102
131
  });
@@ -108,7 +137,7 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
108
137
  };
109
138
  (_a = cp.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
110
139
  const str = bufferToString(data, systemEncoding);
111
- logProvider.info(` [script action stdout] ${maskSecretValues(str)}`);
140
+ logProvider.info(` [script stdout] ${maskSecretValues(str)}`);
112
141
  dataHandler(str);
113
142
  });
114
143
  const handler = getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler);
@@ -119,7 +148,7 @@ exports.executeCommand = executeCommand;
119
148
  function getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler) {
120
149
  return (data) => {
121
150
  const str = bufferToString(data, systemEncoding);
122
- logProvider.warning(` [script action stderr] ${maskSecretValues(str)}`);
151
+ logProvider.warning(` [script stderr] ${maskSecretValues(str)}`);
123
152
  dataHandler(str);
124
153
  stderrStrings.push(str);
125
154
  };
@@ -1 +1 @@
1
- {"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ import { AppDefinition } from "../../../driver/teamsApp/interfaces/appdefinition
4
4
  import { AppUser } from "../../../driver/teamsApp/interfaces/appdefinitions/appUser";
5
5
  import { IPublishingAppDenition } from "../interfaces/appdefinitions/IPublishingAppDefinition";
6
6
  import { IValidationResult } from "../../../driver/teamsApp/interfaces/appdefinitions/IValidationResult";
7
+ import { ApiSecretRegistration } from "../interfaces/ApiSecretRegistration";
7
8
  export declare namespace AppStudioClient {
8
9
  /**
9
10
  * Set user region
@@ -66,5 +67,17 @@ export declare namespace AppStudioClient {
66
67
  function getAppPackage(teamsAppId: string, appStudioToken: string, logProvider?: LogProvider): Promise<any>;
67
68
  function partnerCenterAppPackageValidation(file: Buffer, appStudioToken: string): Promise<IValidationResult>;
68
69
  function getSideloadingStatus(appStudioToken: string): Promise<boolean | undefined>;
70
+ /**
71
+ * Create the Api Key registration.
72
+ * @param appStudioToken
73
+ * @param apiKeyRegistration
74
+ */
75
+ function createApiKeyRegistration(appStudioToken: string, apiKeyRegistration: ApiSecretRegistration): Promise<ApiSecretRegistration>;
76
+ /**
77
+ * Get the Api Key registration by Id.
78
+ * @param appStudioToken
79
+ * @param apiSecretRegistrationId
80
+ */
81
+ function getApiKeyRegistrationById(appStudioToken: string, apiSecretRegistrationId: string): Promise<ApiSecretRegistration>;
69
82
  }
70
83
  //# sourceMappingURL=appStudioClient.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/clients/appStudioClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/clients/appStudioClient.ts"],"names":[],"mappings":"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"}
@@ -563,6 +563,44 @@ var AppStudioClient;
563
563
  return undefined;
564
564
  }
565
565
  AppStudioClient.getSideloadingStatus = getSideloadingStatus;
566
+ /**
567
+ * Create the Api Key registration.
568
+ * @param appStudioToken
569
+ * @param apiKeyRegistration
570
+ */
571
+ async function createApiKeyRegistration(appStudioToken, apiKeyRegistration) {
572
+ sendStartEvent(constants_1.APP_STUDIO_API_NAMES.CREATE_API_KEY);
573
+ const requester = createRequesterWithToken(appStudioToken);
574
+ try {
575
+ const response = await utils_1.RetryHandler.Retry(() => requester.post("/api/v1.0/apiSecretRegistrations", apiKeyRegistration));
576
+ sendSuccessEvent(constants_1.APP_STUDIO_API_NAMES.CREATE_API_KEY);
577
+ return response === null || response === void 0 ? void 0 : response.data;
578
+ }
579
+ catch (e) {
580
+ const error = wrapException(e, constants_1.APP_STUDIO_API_NAMES.CREATE_API_KEY);
581
+ throw error;
582
+ }
583
+ }
584
+ AppStudioClient.createApiKeyRegistration = createApiKeyRegistration;
585
+ /**
586
+ * Get the Api Key registration by Id.
587
+ * @param appStudioToken
588
+ * @param apiSecretRegistrationId
589
+ */
590
+ async function getApiKeyRegistrationById(appStudioToken, apiSecretRegistrationId) {
591
+ sendStartEvent(constants_1.APP_STUDIO_API_NAMES.GET_API_KEY);
592
+ const requester = createRequesterWithToken(appStudioToken);
593
+ try {
594
+ const response = await utils_1.RetryHandler.Retry(() => requester.get(`/api/v1.0/apiSecretRegistrations/${apiSecretRegistrationId}`));
595
+ sendSuccessEvent(constants_1.APP_STUDIO_API_NAMES.GET_API_KEY);
596
+ return response === null || response === void 0 ? void 0 : response.data;
597
+ }
598
+ catch (e) {
599
+ const error = wrapException(e, constants_1.APP_STUDIO_API_NAMES.GET_API_KEY);
600
+ throw error;
601
+ }
602
+ }
603
+ AppStudioClient.getApiKeyRegistrationById = getApiKeyRegistrationById;
566
604
  function extractRegionFromBaseUrl(url) {
567
605
  if (region && region.length >= 32) {
568
606
  return region.substring(32);