@microsoft/teamsfx-core 2.0.14-rc.1 → 2.0.15-alpha.0b985f7da.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 (208) hide show
  1. package/build/common/featureFlags.d.ts +0 -31
  2. package/build/common/featureFlags.d.ts.map +1 -1
  3. package/build/common/featureFlags.js +2 -34
  4. package/build/common/featureFlags.js.map +1 -1
  5. package/build/common/projectTypeChecker.d.ts +1 -0
  6. package/build/common/projectTypeChecker.d.ts.map +1 -1
  7. package/build/common/projectTypeChecker.js +6 -1
  8. package/build/common/projectTypeChecker.js.map +1 -1
  9. package/build/common/secretmasker/masker.d.ts +1 -1
  10. package/build/common/secretmasker/masker.d.ts.map +1 -1
  11. package/build/common/secretmasker/masker.js +2 -2
  12. package/build/common/secretmasker/masker.js.map +1 -1
  13. package/build/common/stringUtils.js +1 -1
  14. package/build/common/stringUtils.js.map +1 -1
  15. package/build/common/templates-config.json +1 -1
  16. package/build/component/configManager/actionInjector.d.ts +1 -1
  17. package/build/component/configManager/actionInjector.d.ts.map +1 -1
  18. package/build/component/configManager/actionInjector.js +17 -8
  19. package/build/component/configManager/actionInjector.js.map +1 -1
  20. package/build/component/configManager/validator.d.ts.map +1 -1
  21. package/build/component/configManager/validator.js +11 -1
  22. package/build/component/configManager/validator.js.map +1 -1
  23. package/build/component/coordinator/index.d.ts.map +1 -1
  24. package/build/component/coordinator/index.js +18 -4
  25. package/build/component/coordinator/index.js.map +1 -1
  26. package/build/component/driver/aad/update.d.ts.map +1 -1
  27. package/build/component/driver/aad/update.js +31 -12
  28. package/build/component/driver/aad/update.js.map +1 -1
  29. package/build/component/driver/aad/utility/aadAppClient.d.ts +1 -1
  30. package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
  31. package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
  32. package/build/component/driver/aad/utility/aadManifestHelper.d.ts +8 -3
  33. package/build/component/driver/aad/utility/aadManifestHelper.d.ts.map +1 -1
  34. package/build/component/driver/aad/utility/aadManifestHelper.js +109 -16
  35. package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
  36. package/build/component/driver/aad/utility/buildAadManifest.d.ts +2 -1
  37. package/build/component/driver/aad/utility/buildAadManifest.d.ts.map +1 -1
  38. package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
  39. package/build/component/driver/add/utility/constants.d.ts +1 -1
  40. package/build/component/driver/add/utility/constants.d.ts.map +1 -1
  41. package/build/component/driver/add/utility/constants.js +1 -1
  42. package/build/component/driver/add/utility/constants.js.map +1 -1
  43. package/build/component/driver/apiKey/utility/utility.d.ts.map +1 -1
  44. package/build/component/driver/apiKey/utility/utility.js +4 -3
  45. package/build/component/driver/apiKey/utility/utility.js.map +1 -1
  46. package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
  47. package/build/component/driver/devTool/installDriver.js +26 -21
  48. package/build/component/driver/devTool/installDriver.js.map +1 -1
  49. package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts +1 -0
  50. package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts.map +1 -1
  51. package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts +0 -1
  52. package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
  53. package/build/component/driver/file/createOrUpdateEnvironmentFile.js +12 -7
  54. package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
  55. package/build/component/driver/script/scriptDriver.d.ts +0 -1
  56. package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
  57. package/build/component/driver/script/scriptDriver.js +23 -15
  58. package/build/component/driver/script/scriptDriver.js.map +1 -1
  59. package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
  60. package/build/component/driver/teamsApp/createAppPackage.js +14 -4
  61. package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
  62. package/build/component/driver/teamsApp/teamsappMgr.d.ts.map +1 -1
  63. package/build/component/driver/teamsApp/teamsappMgr.js +2 -0
  64. package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
  65. package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
  66. package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +2 -0
  67. package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
  68. package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +1 -0
  69. package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
  70. package/build/component/driver/teamsApp/utils/ManifestUtils.js +12 -0
  71. package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
  72. package/build/component/driver/teamsApp/validate.js +4 -4
  73. package/build/component/driver/teamsApp/validate.js.map +1 -1
  74. package/build/component/generator/apiSpec/generator.d.ts.map +1 -1
  75. package/build/component/generator/apiSpec/generator.js +72 -28
  76. package/build/component/generator/apiSpec/generator.js.map +1 -1
  77. package/build/component/generator/apiSpec/helper.d.ts +4 -2
  78. package/build/component/generator/apiSpec/helper.d.ts.map +1 -1
  79. package/build/component/generator/apiSpec/helper.js +143 -33
  80. package/build/component/generator/apiSpec/helper.js.map +1 -1
  81. package/build/component/generator/copilotExtension/generator.d.ts.map +1 -1
  82. package/build/component/generator/copilotExtension/generator.js +4 -5
  83. package/build/component/generator/copilotExtension/generator.js.map +1 -1
  84. package/build/component/generator/generator.d.ts +2 -2
  85. package/build/component/generator/generator.d.ts.map +1 -1
  86. package/build/component/generator/generator.js +25 -13
  87. package/build/component/generator/generator.js.map +1 -1
  88. package/build/component/generator/officeAddin/generator.d.ts +3 -5
  89. package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
  90. package/build/component/generator/officeAddin/generator.js +28 -103
  91. package/build/component/generator/officeAddin/generator.js.map +1 -1
  92. package/build/component/generator/spfx/utils/constants.d.ts +1 -1
  93. package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
  94. package/build/component/generator/spfx/utils/constants.js +1 -1
  95. package/build/component/generator/spfx/utils/constants.js.map +1 -1
  96. package/build/component/generator/templates/ssrTabGenerator.d.ts.map +1 -1
  97. package/build/component/generator/templates/ssrTabGenerator.js +7 -3
  98. package/build/component/generator/templates/ssrTabGenerator.js.map +1 -1
  99. package/build/component/generator/templates/templateNames.d.ts +0 -5
  100. package/build/component/generator/templates/templateNames.d.ts.map +1 -1
  101. package/build/component/generator/templates/templateNames.js +2 -47
  102. package/build/component/generator/templates/templateNames.js.map +1 -1
  103. package/build/component/generator/utils.d.ts.map +1 -1
  104. package/build/component/generator/utils.js +8 -1
  105. package/build/component/generator/utils.js.map +1 -1
  106. package/build/component/m365/launchHelper.d.ts.map +1 -1
  107. package/build/component/m365/launchHelper.js +1 -0
  108. package/build/component/m365/launchHelper.js.map +1 -1
  109. package/build/component/m365/packageService.d.ts +9 -1
  110. package/build/component/m365/packageService.d.ts.map +1 -1
  111. package/build/component/m365/packageService.js +144 -5
  112. package/build/component/m365/packageService.js.map +1 -1
  113. package/build/component/provisionUtils.d.ts.map +1 -1
  114. package/build/component/provisionUtils.js +2 -1
  115. package/build/component/provisionUtils.js.map +1 -1
  116. package/build/component/utils/envFunctionUtils.d.ts.map +1 -1
  117. package/build/component/utils/envFunctionUtils.js +0 -4
  118. package/build/component/utils/envFunctionUtils.js.map +1 -1
  119. package/build/component/utils/pathUtils.d.ts +1 -0
  120. package/build/component/utils/pathUtils.d.ts.map +1 -1
  121. package/build/component/utils/pathUtils.js +7 -0
  122. package/build/component/utils/pathUtils.js.map +1 -1
  123. package/build/core/FxCore.d.ts +10 -0
  124. package/build/core/FxCore.d.ts.map +1 -1
  125. package/build/core/FxCore.js +210 -38
  126. package/build/core/FxCore.js.map +1 -1
  127. package/build/core/collaborator.d.ts.map +1 -1
  128. package/build/core/collaborator.js +5 -2
  129. package/build/core/collaborator.js.map +1 -1
  130. package/build/index.d.ts +1 -1
  131. package/build/index.d.ts.map +1 -1
  132. package/build/index.js +2 -3
  133. package/build/index.js.map +1 -1
  134. package/build/question/constants.d.ts +13 -11
  135. package/build/question/constants.d.ts.map +1 -1
  136. package/build/question/constants.js +59 -129
  137. package/build/question/constants.js.map +1 -1
  138. package/build/question/create.d.ts +1 -11
  139. package/build/question/create.d.ts.map +1 -1
  140. package/build/question/create.js +49 -134
  141. package/build/question/create.js.map +1 -1
  142. package/build/question/generator.js +2 -0
  143. package/build/question/generator.js.map +1 -1
  144. package/build/question/index.d.ts +3 -0
  145. package/build/question/index.d.ts.map +1 -1
  146. package/build/question/index.js +9 -0
  147. package/build/question/index.js.map +1 -1
  148. package/build/question/inputs/AddAuthActionInputs.d.ts +20 -0
  149. package/build/question/inputs/AddAuthActionInputs.d.ts.map +1 -0
  150. package/build/question/inputs/AddAuthActionInputs.js +5 -0
  151. package/build/question/inputs/AddAuthActionInputs.js.map +1 -0
  152. package/build/question/inputs/AddPluginInputs.d.ts +1 -1
  153. package/build/question/inputs/AddPluginInputs.d.ts.map +1 -1
  154. package/build/question/inputs/CreateProjectInputs.d.ts +4 -6
  155. package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
  156. package/build/question/inputs/index.d.ts +1 -0
  157. package/build/question/inputs/index.d.ts.map +1 -1
  158. package/build/question/inputs/index.js +1 -0
  159. package/build/question/inputs/index.js.map +1 -1
  160. package/build/question/options/AddAuthActionOptions.d.ts +10 -0
  161. package/build/question/options/AddAuthActionOptions.d.ts.map +1 -0
  162. package/build/question/options/AddAuthActionOptions.js +39 -0
  163. package/build/question/options/AddAuthActionOptions.js.map +1 -0
  164. package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
  165. package/build/question/options/CreateProjectOptions.js +2 -10
  166. package/build/question/options/CreateProjectOptions.js.map +1 -1
  167. package/build/question/options/index.d.ts +1 -0
  168. package/build/question/options/index.d.ts.map +1 -1
  169. package/build/question/options/index.js +1 -0
  170. package/build/question/options/index.js.map +1 -1
  171. package/build/question/other.d.ts +7 -1
  172. package/build/question/other.d.ts.map +1 -1
  173. package/build/question/other.js +147 -1
  174. package/build/question/other.js.map +1 -1
  175. package/build/tsconfig.tsbuildinfo +1 -1
  176. package/package.json +4 -4
  177. package/resource/package.nls.cs.json +543 -263
  178. package/resource/package.nls.de.json +531 -251
  179. package/resource/package.nls.es.json +543 -263
  180. package/resource/package.nls.fr.json +557 -277
  181. package/resource/package.nls.it.json +546 -266
  182. package/resource/package.nls.ja.json +536 -256
  183. package/resource/package.nls.json +48 -42
  184. package/resource/package.nls.ko.json +532 -252
  185. package/resource/package.nls.pl.json +539 -259
  186. package/resource/package.nls.pt-BR.json +555 -275
  187. package/resource/package.nls.ru.json +547 -267
  188. package/resource/package.nls.tr.json +541 -261
  189. package/resource/package.nls.zh-Hans.json +528 -248
  190. package/resource/package.nls.zh-Hant.json +539 -259
  191. package/resource/yaml-schema/v1.8/yaml.schema.json +1858 -0
  192. package/resource/yaml-schema/yaml.schema.json +5 -1
  193. package/templates/fallback/common.zip +0 -0
  194. package/templates/fallback/csharp.zip +0 -0
  195. package/templates/fallback/js.zip +0 -0
  196. package/templates/fallback/python.zip +0 -0
  197. package/templates/fallback/ts.zip +0 -0
  198. package/templates/plugins/resource/aad/auth/V3/Enable SSO.txt +2 -2
  199. package/templates/plugins/resource/aad/auth/V3/aad.manifest.template.json +87 -77
  200. package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +2 -2
  201. package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +2 -2
  202. package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +2 -2
  203. package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +2 -2
  204. package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +2 -2
  205. package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +2 -2
  206. package/templates/plugins/resource/aad/manifest/aad.template.json +109 -97
  207. package/templates/plugins/resource/aad/manifest/bot/aad.manifest.template.json +90 -81
  208. package/templates/plugins/resource/aad/manifest/tab/aad.manifest.template.json +93 -89
@@ -3,6 +3,7 @@ declare class PathUtils {
3
3
  getYmlFilePath(projectPath: string, env?: string): string;
4
4
  getEnvFolderPath(projectPath: string): Promise<Result<string | undefined, FxError>>;
5
5
  getEnvFilePath(projectPath: string, env: string): Promise<Result<string | undefined, FxError>>;
6
+ resolveFilePath(projectPath: string, absoluteOrRelativePath?: string): string;
6
7
  }
7
8
  export declare const pathUtils: PathUtils;
8
9
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAQlE,cAAM,SAAS;IACb,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IAqBnD,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAWnF,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"}
1
+ {"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAQlE,cAAM,SAAS;IACb,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IAqBnD,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAWnF,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAQ/C,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,MAAM;CAK9E;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}
@@ -56,6 +56,13 @@ class PathUtils {
56
56
  const envFilePath = path.join(folderPath, `.env.${env}`);
57
57
  return (0, teamsfx_api_1.ok)(envFilePath);
58
58
  }
59
+ resolveFilePath(projectPath, absoluteOrRelativePath) {
60
+ if (!absoluteOrRelativePath)
61
+ return projectPath;
62
+ if (path.isAbsolute(absoluteOrRelativePath))
63
+ return absoluteOrRelativePath;
64
+ return path.join(projectPath, absoluteOrRelativePath);
65
+ }
59
66
  }
60
67
  exports.pathUtils = new PathUtils();
61
68
  //# sourceMappingURL=pathUtils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkE;AAClE,gEAA0B;AAC1B,mDAA6B;AAC7B,wDAAwB;AACxB,kEAA0D;AAC1D,gEAAoE;AACpE,+CAAyF;AAEzF,MAAM,SAAS;IACb,cAAc,CAAC,WAAmB,EAAE,GAAY;QAC9C,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;QACtF,MAAM,OAAO,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,KAAK,CAAC;QACxD,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,kCAAyB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CACvB,WAAW,EACX,OAAO,KAAK,wCAAsB,CAAC,eAAe,EAAE;YAClD,CAAC,CAAC,4BAAU,CAAC,eAAe;YAC5B,CAAC,CAAC,OAAO,KAAK,wCAAsB,CAAC,kBAAkB,EAAE;gBACzD,CAAC,CAAC,4BAAU,CAAC,kBAAkB;gBAC/B,CAAC,CAAC,4BAAU,CAAC,UAAU,CAC1B,CAAC;QACF,IAAI,kBAAE,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YAC9B,OAAO,OAAO,CAAC;SAChB;QACD,IAAI,wCAAsB,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE;YACvD,MAAM,IAAI,iCAAwB,CAAC,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;SACzD;aAAM;YACL,MAAM,IAAI,iCAAwB,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SAC/D;IACH,CAAC;IACD,KAAK,CAAC,gBAAgB,CAAC,WAAmB;;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,cAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,CAAA,MAAA,OAAO,CAAC,qBAAqB,0CAAE,QAAQ,EAAE,KAAI,OAAO,CAAC;QACxE,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YAC/C,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAAE,OAAO,IAAA,gBAAE,EAAC,SAAS,CAAC,CAAC;QAChE,OAAO,IAAA,gBAAE,EAAC,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,IAAA,iBAAG,EAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAC1C,IAAI,CAAC,UAAU;YAAE,OAAO,IAAA,gBAAE,EAAC,SAAS,CAAC,CAAC;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,EAAE,CAAC,CAAC;QACzD,OAAO,IAAA,gBAAE,EAAC,WAAW,CAAC,CAAC;IACzB,CAAC;CACF;AAEY,QAAA,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC"}
1
+ {"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../../src/component/utils/pathUtils.ts"],"names":[],"mappings":"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"}
@@ -83,6 +83,7 @@ export declare class FxCore {
83
83
  * v3 only none lifecycle command
84
84
  */
85
85
  buildAadManifest(inputs: Inputs): Promise<Result<undefined, FxError>>;
86
+ convertAadToNewSchema(inputs: Inputs): Promise<Result<undefined, FxError>>;
86
87
  /**
87
88
  * v3 only none lifecycle command
88
89
  */
@@ -209,5 +210,14 @@ export declare class FxCore {
209
210
  * Add plugin
210
211
  */
211
212
  addPlugin(inputs: Inputs): Promise<Result<undefined | any, FxError>>;
213
+ /**
214
+ * Kiota regenerate
215
+ * Need to update da manifest and update teamsapp.yml
216
+ */
217
+ kiotaRegenerate(inputs: Inputs): Promise<Result<undefined, FxError>>;
218
+ addAuthAction(inputs: Inputs): Promise<Result<undefined, FxError>>;
219
+ private updateAuthActionInYaml;
220
+ private parseAuthNameAndScheme;
221
+ isDelcarativeAgentApp(inputs: Inputs): Promise<Result<any, FxError>>;
212
222
  }
213
223
  //# sourceMappingURL=FxCore.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"FxCore.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FxCore.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"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"}
@@ -68,6 +68,7 @@ const teamsDevPortalClient_1 = require("../client/teamsDevPortalClient");
68
68
  const utils_3 = require("../common/utils");
69
69
  const helper_2 = require("../component/generator/copilotExtension/helper");
70
70
  const featureFlags_1 = require("../common/featureFlags");
71
+ const aadManifestHelper_1 = require("../component/driver/aad/utility/aadManifestHelper");
71
72
  class FxCore {
72
73
  constructor(tools) {
73
74
  (0, globalVars_1.setTools)(tools);
@@ -549,6 +550,11 @@ class FxCore {
549
550
  await (0, buildAadManifest_1.buildAadManifest)(Context, manifestTemplatePath, manifestOutputPath);
550
551
  return (0, teamsfx_api_1.ok)(undefined);
551
552
  }
553
+ async convertAadToNewSchema(inputs) {
554
+ const manifestTemplatePath = inputs[constants_3.QuestionNames.AadAppManifestFilePath];
555
+ const projectPath = inputs[constants_3.QuestionNames.ProjectPath];
556
+ return aadManifestHelper_1.AadManifestHelper.convertManifestToNewSchemaAndOverride(manifestTemplatePath, projectPath);
557
+ }
552
558
  /**
553
559
  * v3 only none lifecycle command
554
560
  */
@@ -1128,7 +1134,7 @@ class FxCore {
1128
1134
  const adaptiveCardFolder = path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ResponseTemplatesFolderName);
1129
1135
  const authNames = new Set();
1130
1136
  const serverUrls = new Set();
1131
- let authScheme = undefined;
1137
+ const authNamesDict = {};
1132
1138
  for (const api of operations) {
1133
1139
  const operation = apiResultList.find((op) => op.api === api);
1134
1140
  if (operation &&
@@ -1137,17 +1143,16 @@ class FxCore {
1137
1143
  m365_spec_parser_1.Utils.isOAuthWithAuthCodeFlow(operation.auth.authScheme))) {
1138
1144
  authNames.add(operation.auth.name);
1139
1145
  serverUrls.add(operation.server);
1140
- authScheme = operation.auth.authScheme;
1146
+ authNamesDict[operation.auth.name] = operation.auth.authScheme;
1141
1147
  }
1142
1148
  }
1143
- if (authNames.size > 1) {
1144
- throw new common_2.MultipleAuthError(authNames);
1145
- }
1146
1149
  if (serverUrls.size > 1) {
1147
1150
  throw new common_2.MultipleServerError(serverUrls);
1148
1151
  }
1149
- if (authNames.size === 1 && authScheme) {
1150
- await (0, helper_1.injectAuthAction)(inputs.projectPath, [...authNames][0], authScheme, outputApiSpecPath, false);
1152
+ if (authNames.size >= 1) {
1153
+ for (const authName of authNames) {
1154
+ await (0, helper_1.injectAuthAction)(inputs.projectPath, [...authNames][0], authNamesDict[authName], outputApiSpecPath, false);
1155
+ }
1151
1156
  }
1152
1157
  let pluginPath;
1153
1158
  if (isPlugin) {
@@ -1242,6 +1247,7 @@ class FxCore {
1242
1247
  inputs[constants_3.QuestionNames.ApiPluginType] === constants_3.ApiPluginStartOptions.apiSpec().id &&
1243
1248
  !!!inputs[constants_3.QuestionNames.ApiPluginManifestPath]) {
1244
1249
  return (0, teamsfx_api_1.ok)({
1250
+ projectPath: inputs.projectPath,
1245
1251
  lastCommand: constants_2.KiotaLastCommands.addPlugin,
1246
1252
  manifestPath: inputs[constants_3.QuestionNames.ManifestPath],
1247
1253
  });
@@ -1250,7 +1256,8 @@ class FxCore {
1250
1256
  const teamsManifestPath = inputs[constants_3.QuestionNames.ManifestPath];
1251
1257
  const appPackageFolder = path.dirname(teamsManifestPath);
1252
1258
  const isGenerateFromApiSpec = inputs[constants_3.QuestionNames.ApiPluginType] === constants_3.ApiPluginStartOptions.apiSpec().id;
1253
- const isKiotaIntegration = featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaIntegration) &&
1259
+ const isKiotaIntegration = inputs.platform === teamsfx_api_1.Platform.VSCode &&
1260
+ featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaIntegration) &&
1254
1261
  !!inputs[constants_3.QuestionNames.ApiPluginManifestPath];
1255
1262
  // validate the project is valid for adding plugin
1256
1263
  const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
@@ -1277,30 +1284,18 @@ class FxCore {
1277
1284
  let confirmMessage = (0, localizeUtils_1.getLocalizedString)("core.addApi.confirm", path.relative(inputs.projectPath, appPackageFolder));
1278
1285
  // Will be used if generating from API spec
1279
1286
  let specParser = undefined;
1280
- let authName = undefined;
1281
- let authScheme = undefined;
1287
+ let authNameAndSchemes = [];
1282
1288
  if (isGenerateFromApiSpec) {
1283
1289
  specParser = new m365_spec_parser_1.SpecParser(inputs[constants_3.QuestionNames.ApiSpecLocation].trim(), (0, helper_1.getParserOptions)(m365_spec_parser_1.ProjectType.Copilot, true));
1284
1290
  const listResult = await specParser.list();
1285
- const authApis = listResult.APIs.filter((value) => value.isValid && !!value.auth);
1286
1291
  if (inputs.platform === teamsfx_api_1.Platform.VSCode &&
1287
1292
  featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaIntegration) &&
1288
1293
  inputs[constants_3.QuestionNames.ApiPluginType] === constants_3.ApiPluginStartOptions.apiSpec().id &&
1289
1294
  !!inputs[constants_3.QuestionNames.ApiPluginManifestPath]) {
1290
1295
  inputs[constants_3.QuestionNames.ApiOperation] = listResult.APIs.filter((value) => value.isValid).map((value) => value.api);
1291
1296
  }
1292
- for (const api of inputs[constants_3.QuestionNames.ApiOperation]) {
1293
- const operation = authApis.find((op) => op.api === api);
1294
- if (operation &&
1295
- operation.auth &&
1296
- (m365_spec_parser_1.Utils.isBearerTokenAuth(operation.auth.authScheme) ||
1297
- m365_spec_parser_1.Utils.isOAuthWithAuthCodeFlow(operation.auth.authScheme))) {
1298
- authName = operation.auth.name;
1299
- authScheme = operation.auth.authScheme;
1300
- break; // Only one auth is supported for one plugin for now.
1301
- }
1302
- }
1303
- if (authName && authScheme) {
1297
+ authNameAndSchemes = this.parseAuthNameAndScheme(listResult, inputs);
1298
+ if (authNameAndSchemes.length > 0) {
1304
1299
  const doesLocalYamlPathExists = await fs_extra_1.default.pathExists(path.join(inputs.projectPath, versionMetadata_1.MetadataV3.localConfigFile));
1305
1300
  confirmMessage = doesLocalYamlPathExists
1306
1301
  ? (0, localizeUtils_1.getLocalizedString)("core.addApi.confirm.localTeamsYaml", path.relative(inputs.projectPath, appPackageFolder), versionMetadata_1.MetadataV3.localConfigFile, versionMetadata_1.MetadataV3.configFile)
@@ -1327,11 +1322,12 @@ class FxCore {
1327
1322
  let destinationPluginManifestPath;
1328
1323
  // generate files
1329
1324
  if (isGenerateFromApiSpec && specParser) {
1330
- destinationPluginManifestPath =
1331
- await CopilotGptManifestUtils_1.copilotGptManifestUtils.getDefaultNextAvailablePluginManifestPath(appPackageFolder, isKiotaIntegration
1332
- ? path.basename(inputs[constants_3.QuestionNames.ApiPluginManifestPath])
1333
- : undefined, isKiotaIntegration);
1334
- const destinationApiSpecPath = await PluginManifestUtils_1.pluginManifestUtils.getDefaultNextAvailableApiSpecPath(inputs[constants_3.QuestionNames.ApiSpecLocation].trim(), path.join(appPackageFolder, isKiotaIntegration ? "" : teamsfx_api_1.DefaultApiSpecFolderName), isKiotaIntegration ? path.basename(inputs[constants_3.QuestionNames.ApiSpecLocation]) : undefined, isKiotaIntegration);
1325
+ destinationPluginManifestPath = isKiotaIntegration
1326
+ ? inputs[constants_3.QuestionNames.ApiPluginManifestPath].trim()
1327
+ : await CopilotGptManifestUtils_1.copilotGptManifestUtils.getDefaultNextAvailablePluginManifestPath(appPackageFolder, undefined);
1328
+ const destinationApiSpecPath = isKiotaIntegration
1329
+ ? inputs[constants_3.QuestionNames.ApiSpecLocation].trim()
1330
+ : await PluginManifestUtils_1.pluginManifestUtils.getDefaultNextAvailableApiSpecPath(inputs[constants_3.QuestionNames.ApiSpecLocation].trim(), path.join(appPackageFolder, teamsfx_api_1.DefaultApiSpecFolderName), undefined);
1335
1331
  const generateRes = await (0, helper_1.generateFromApiSpec)(specParser, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.addPlugin, m365_spec_parser_1.ProjectType.Copilot, {
1336
1332
  destinationApiSpecFilePath: destinationApiSpecPath,
1337
1333
  pluginManifestFilePath: destinationPluginManifestPath,
@@ -1348,16 +1344,8 @@ class FxCore {
1348
1344
  if (addActionRes.isErr()) {
1349
1345
  return (0, teamsfx_api_1.err)(addActionRes.error);
1350
1346
  }
1351
- // update teamspp.local.yaml and teamsapp.yaml if auth action is needed
1352
- if (authName && authScheme) {
1353
- const authInjectRes = await (0, helper_1.injectAuthAction)(inputs.projectPath, authName, authScheme, destinationApiSpecPath, true);
1354
- if ((authInjectRes === null || authInjectRes === void 0 ? void 0 : authInjectRes.defaultRegistrationIdEnvName) &&
1355
- (authInjectRes === null || authInjectRes === void 0 ? void 0 : authInjectRes.registrationIdEnvName) &&
1356
- authInjectRes.defaultRegistrationIdEnvName !== authInjectRes.registrationIdEnvName) {
1357
- const pluginManifestContent = await fs_extra_1.default.readFile(destinationPluginManifestPath, "utf-8");
1358
- const updatedPluginManifestContext = pluginManifestContent.replace(authInjectRes.defaultRegistrationIdEnvName, authInjectRes.registrationIdEnvName);
1359
- await fs_extra_1.default.writeFile(destinationPluginManifestPath, updatedPluginManifestContext);
1360
- }
1347
+ for (const authNameAndScheme of authNameAndSchemes) {
1348
+ await this.updateAuthActionInYaml(authNameAndScheme.authName, authNameAndScheme.authScheme, inputs.projectPath, destinationApiSpecPath, destinationPluginManifestPath);
1361
1349
  }
1362
1350
  }
1363
1351
  else {
@@ -1388,6 +1376,158 @@ class FxCore {
1388
1376
  }
1389
1377
  return (0, teamsfx_api_1.ok)(undefined);
1390
1378
  }
1379
+ /**
1380
+ * Kiota regenerate
1381
+ * Need to update da manifest and update teamsapp.yml
1382
+ */
1383
+ async kiotaRegenerate(inputs) {
1384
+ var _a, _b, _c, _d, _e;
1385
+ if (!inputs.projectPath) {
1386
+ throw new Error("projectPath is undefined"); // should never happen
1387
+ }
1388
+ const teamsManifestPath = inputs[constants_3.QuestionNames.ManifestPath];
1389
+ const appPackageFolder = path.dirname(teamsManifestPath);
1390
+ const context = (0, globalVars_1.createContext)();
1391
+ // validate the project is valid for adding plugin
1392
+ const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
1393
+ if (manifestRes.isErr()) {
1394
+ return (0, teamsfx_api_1.err)(manifestRes.error);
1395
+ }
1396
+ const teamsManifest = manifestRes.value;
1397
+ const declarativeGpt = teamsManifest.copilotExtensions
1398
+ ? (_a = teamsManifest.copilotExtensions.declarativeCopilots) === null || _a === void 0 ? void 0 : _a[0]
1399
+ : (_c = (_b = teamsManifest.copilotAgents) === null || _b === void 0 ? void 0 : _b.declarativeAgents) === null || _c === void 0 ? void 0 : _c[0];
1400
+ if (!(declarativeGpt === null || declarativeGpt === void 0 ? void 0 : declarativeGpt.file)) {
1401
+ return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.name, errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.message("declarativeCopilots", teamsManifestPath)));
1402
+ }
1403
+ const gptManifestFilePathRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.getManifestPath(teamsManifestPath);
1404
+ if (gptManifestFilePathRes.isErr()) {
1405
+ return (0, teamsfx_api_1.err)(gptManifestFilePathRes.error);
1406
+ }
1407
+ const declarativeCopilotManifestPath = gptManifestFilePathRes.value;
1408
+ const declarativeCopilotManifesRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.readCopilotGptManifestFile(declarativeCopilotManifestPath);
1409
+ if (declarativeCopilotManifesRes.isErr()) {
1410
+ return (0, teamsfx_api_1.err)(declarativeCopilotManifesRes.error);
1411
+ }
1412
+ const declarativeCopilotManifest = declarativeCopilotManifesRes.value;
1413
+ const pluginManifestFilePath = inputs[constants_3.QuestionNames.ApiPluginManifestPath];
1414
+ let actionId = "";
1415
+ (_d = declarativeCopilotManifest.actions) === null || _d === void 0 ? void 0 : _d.forEach((action) => {
1416
+ const actionFilePath = path.normalize(path.join(appPackageFolder, action.file));
1417
+ if (actionFilePath.toLowerCase() === path.normalize(pluginManifestFilePath).toLowerCase()) {
1418
+ actionId = action.id;
1419
+ }
1420
+ });
1421
+ // Does not found same plugin manifest in da manifest, so add a new action
1422
+ // Should not happen when regenerate
1423
+ if (!actionId) {
1424
+ let suffix = 1;
1425
+ actionId = `action_${suffix}`;
1426
+ const existingActionIds = (_e = declarativeCopilotManifest.actions) === null || _e === void 0 ? void 0 : _e.map((action) => action.id);
1427
+ while (existingActionIds === null || existingActionIds === void 0 ? void 0 : existingActionIds.includes(actionId)) {
1428
+ suffix += 1;
1429
+ actionId = `action_${suffix}`;
1430
+ }
1431
+ const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_1.normalizePath)(path.relative(appPackageFolder, pluginManifestFilePath), true));
1432
+ if (addActionRes.isErr()) {
1433
+ return (0, teamsfx_api_1.err)(addActionRes.error);
1434
+ }
1435
+ }
1436
+ // Update teamsapp.local.yaml and teamsapp.yaml if need to add auth action
1437
+ const specPath = inputs[constants_3.QuestionNames.ApiSpecLocation].trim();
1438
+ const specParser = new m365_spec_parser_1.SpecParser(specPath, (0, helper_1.getParserOptions)(m365_spec_parser_1.ProjectType.Copilot, true));
1439
+ const listResult = await specParser.list();
1440
+ inputs[constants_3.QuestionNames.ApiOperation] = listResult.APIs.filter((value) => value.isValid).map((value) => value.api);
1441
+ const authNameAndSchemes = this.parseAuthNameAndScheme(listResult, inputs);
1442
+ for (const authInfo of authNameAndSchemes) {
1443
+ await this.updateAuthActionInYaml(authInfo.authName, authInfo.authScheme, inputs.projectPath, specPath, pluginManifestFilePath, false);
1444
+ }
1445
+ // Add dc to plugin manifest
1446
+ const generateRes = await (0, helper_1.generateFromApiSpec)(specParser, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.kiotaRegenerate, m365_spec_parser_1.ProjectType.Copilot, {
1447
+ destinationApiSpecFilePath: inputs[constants_3.QuestionNames.ApiSpecLocation].trim(),
1448
+ pluginManifestFilePath: inputs[constants_3.QuestionNames.ApiPluginManifestPath].trim(),
1449
+ });
1450
+ if (generateRes.isErr()) {
1451
+ return (0, teamsfx_api_1.err)(generateRes.error);
1452
+ }
1453
+ return (0, teamsfx_api_1.ok)(undefined);
1454
+ }
1455
+ async addAuthAction(inputs) {
1456
+ var _a;
1457
+ if (!inputs.projectPath) {
1458
+ throw new Error("projectPath is undefined"); // should never happen
1459
+ }
1460
+ const pluginManifestPath = inputs[constants_3.QuestionNames.PluginManifestFilePath];
1461
+ const apiSpecRelativePath = inputs[constants_3.QuestionNames.ApiSpecLocation];
1462
+ const apiOperation = inputs[constants_3.QuestionNames.ApiOperation];
1463
+ const authName = inputs[constants_3.QuestionNames.AuthName];
1464
+ const apiSpecPath = path.normalize(path.join(pluginManifestPath, apiSpecRelativePath));
1465
+ let authType;
1466
+ switch (inputs[constants_3.QuestionNames.ApiAuth]) {
1467
+ case "api-key":
1468
+ default:
1469
+ authType = "ApiKeyPluginVault";
1470
+ break;
1471
+ case "oauth":
1472
+ authType = "OAuthPluginVault";
1473
+ break;
1474
+ }
1475
+ const addAuthActionRes = await (0, helper_1.injectAuthAction)(inputs.projectPath, authName, undefined, apiSpecPath, true, authType);
1476
+ if (addAuthActionRes === null || addAuthActionRes === void 0 ? void 0 : addAuthActionRes.registrationIdEnvName) {
1477
+ const pluginManifest = (await fs_extra_1.default.readJson(pluginManifestPath));
1478
+ (_a = pluginManifest.runtimes) === null || _a === void 0 ? void 0 : _a.push({
1479
+ type: "OpenApi",
1480
+ auth: {
1481
+ type: authType,
1482
+ reference_id: `\$\{\{${addAuthActionRes.registrationIdEnvName}\}\}`,
1483
+ },
1484
+ spec: {
1485
+ url: apiSpecRelativePath,
1486
+ progress_style: "ShowUsageWithInputAndOutput",
1487
+ },
1488
+ run_for_functions: apiOperation,
1489
+ });
1490
+ await fs_extra_1.default.writeJson(pluginManifestPath, pluginManifest, { spaces: 4 });
1491
+ }
1492
+ return (0, teamsfx_api_1.ok)(undefined);
1493
+ }
1494
+ async updateAuthActionInYaml(authName, authScheme, projectPath, apSpecPath, pluginManifestPath, forceToAddNew = true) {
1495
+ if (authName && authScheme) {
1496
+ const authInjectRes = await (0, helper_1.injectAuthAction)(projectPath, authName, authScheme, apSpecPath, forceToAddNew);
1497
+ if ((authInjectRes === null || authInjectRes === void 0 ? void 0 : authInjectRes.defaultRegistrationIdEnvName) &&
1498
+ (authInjectRes === null || authInjectRes === void 0 ? void 0 : authInjectRes.registrationIdEnvName) &&
1499
+ authInjectRes.defaultRegistrationIdEnvName !== authInjectRes.registrationIdEnvName) {
1500
+ const pluginManifestContent = await fs_extra_1.default.readFile(pluginManifestPath, "utf-8");
1501
+ const updatedPluginManifestContext = pluginManifestContent.replace(authInjectRes.defaultRegistrationIdEnvName, authInjectRes.registrationIdEnvName);
1502
+ await fs_extra_1.default.writeFile(pluginManifestPath, updatedPluginManifestContext);
1503
+ }
1504
+ }
1505
+ }
1506
+ parseAuthNameAndScheme(listResult, inputs) {
1507
+ const authApis = listResult.APIs.filter((value) => value.isValid && !!value.auth);
1508
+ const result = [];
1509
+ for (const api of inputs[constants_3.QuestionNames.ApiOperation]) {
1510
+ const operation = authApis.find((op) => op.api === api);
1511
+ if (operation &&
1512
+ operation.auth &&
1513
+ (m365_spec_parser_1.Utils.isBearerTokenAuth(operation.auth.authScheme) ||
1514
+ m365_spec_parser_1.Utils.isOAuthWithAuthCodeFlow(operation.auth.authScheme))) {
1515
+ if (result.find((value) => value.authName === operation.auth.name)) {
1516
+ continue;
1517
+ }
1518
+ result.push({ authName: operation.auth.name, authScheme: operation.auth.authScheme });
1519
+ }
1520
+ }
1521
+ return result;
1522
+ }
1523
+ async isDelcarativeAgentApp(inputs) {
1524
+ const projectPath = inputs[constants_3.QuestionNames.ProjectPath];
1525
+ const manifestRes = await ManifestUtils_1.manifestUtils.readAppManifest(projectPath);
1526
+ if (manifestRes.isErr()) {
1527
+ return (0, teamsfx_api_1.err)(manifestRes.error);
1528
+ }
1529
+ return (0, teamsfx_api_1.ok)((0, projectTypeChecker_1.IsDeclarativeAgentManifest)(manifestRes.value));
1530
+ }
1391
1531
  }
1392
1532
  tslib_1.__decorate([
1393
1533
  (0, hooks_1.hooks)([
@@ -1589,6 +1729,16 @@ tslib_1.__decorate([
1589
1729
  tslib_1.__metadata("design:paramtypes", [Object]),
1590
1730
  tslib_1.__metadata("design:returntype", Promise)
1591
1731
  ], FxCore.prototype, "buildAadManifest", null);
1732
+ tslib_1.__decorate([
1733
+ (0, hooks_1.hooks)([
1734
+ (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "convertAadToNewSchema", reset: true }),
1735
+ errorHandler_1.ErrorHandlerMW,
1736
+ (0, questionMW_1.QuestionMW)("convertAadToNewSchema"),
1737
+ ]),
1738
+ tslib_1.__metadata("design:type", Function),
1739
+ tslib_1.__metadata("design:paramtypes", [Object]),
1740
+ tslib_1.__metadata("design:returntype", Promise)
1741
+ ], FxCore.prototype, "convertAadToNewSchema", null);
1592
1742
  tslib_1.__decorate([
1593
1743
  (0, hooks_1.hooks)([
1594
1744
  (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "deployTeamsManifest", reset: true }),
@@ -1939,5 +2089,27 @@ tslib_1.__decorate([
1939
2089
  tslib_1.__metadata("design:paramtypes", [Object]),
1940
2090
  tslib_1.__metadata("design:returntype", Promise)
1941
2091
  ], FxCore.prototype, "addPlugin", null);
2092
+ tslib_1.__decorate([
2093
+ (0, hooks_1.hooks)([
2094
+ (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: teamsfx_api_1.Stage.addPlugin }),
2095
+ errorHandler_1.ErrorHandlerMW,
2096
+ (0, questionMW_1.QuestionMW)("kiotaRegenerate"),
2097
+ concurrentLocker_1.ConcurrentLockerMW,
2098
+ ]),
2099
+ tslib_1.__metadata("design:type", Function),
2100
+ tslib_1.__metadata("design:paramtypes", [Object]),
2101
+ tslib_1.__metadata("design:returntype", Promise)
2102
+ ], FxCore.prototype, "kiotaRegenerate", null);
2103
+ tslib_1.__decorate([
2104
+ (0, hooks_1.hooks)([
2105
+ (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: teamsfx_api_1.Stage.addAuthAction }),
2106
+ errorHandler_1.ErrorHandlerMW,
2107
+ (0, questionMW_1.QuestionMW)("addAuthAction"),
2108
+ concurrentLocker_1.ConcurrentLockerMW,
2109
+ ]),
2110
+ tslib_1.__metadata("design:type", Function),
2111
+ tslib_1.__metadata("design:paramtypes", [Object]),
2112
+ tslib_1.__metadata("design:returntype", Promise)
2113
+ ], FxCore.prototype, "addAuthAction", null);
1942
2114
  exports.FxCore = FxCore;
1943
2115
  //# sourceMappingURL=FxCore.js.map