@microsoft/teamsfx-core 2.0.14 → 2.0.15-alpha.0e22b17e0.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 (349) hide show
  1. package/build/common/featureFlags.d.ts +5 -26
  2. package/build/common/featureFlags.d.ts.map +1 -1
  3. package/build/common/featureFlags.js +11 -33
  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 +4 -3
  17. package/build/component/configManager/actionInjector.d.ts.map +1 -1
  18. package/build/component/configManager/actionInjector.js +25 -12
  19. package/build/component/configManager/actionInjector.js.map +1 -1
  20. package/build/component/configManager/constant.d.ts +3 -0
  21. package/build/component/configManager/constant.d.ts.map +1 -1
  22. package/build/component/configManager/constant.js +4 -1
  23. package/build/component/configManager/constant.js.map +1 -1
  24. package/build/component/configManager/lifecycle.d.ts.map +1 -1
  25. package/build/component/configManager/lifecycle.js +10 -0
  26. package/build/component/configManager/lifecycle.js.map +1 -1
  27. package/build/component/configManager/validator.d.ts.map +1 -1
  28. package/build/component/configManager/validator.js +11 -1
  29. package/build/component/configManager/validator.js.map +1 -1
  30. package/build/component/constants.d.ts +8 -0
  31. package/build/component/constants.d.ts.map +1 -1
  32. package/build/component/constants.js +9 -1
  33. package/build/component/constants.js.map +1 -1
  34. package/build/component/coordinator/index.d.ts.map +1 -1
  35. package/build/component/coordinator/index.js +18 -12
  36. package/build/component/coordinator/index.js.map +1 -1
  37. package/build/component/developerPortalScaffoldUtils.js +2 -2
  38. package/build/component/developerPortalScaffoldUtils.js.map +1 -1
  39. package/build/component/driver/aad/update.d.ts.map +1 -1
  40. package/build/component/driver/aad/update.js +31 -12
  41. package/build/component/driver/aad/update.js.map +1 -1
  42. package/build/component/driver/aad/utility/aadAppClient.d.ts +1 -1
  43. package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
  44. package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
  45. package/build/component/driver/aad/utility/aadManifestHelper.d.ts +8 -3
  46. package/build/component/driver/aad/utility/aadManifestHelper.d.ts.map +1 -1
  47. package/build/component/driver/aad/utility/aadManifestHelper.js +109 -16
  48. package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
  49. package/build/component/driver/aad/utility/buildAadManifest.d.ts +2 -1
  50. package/build/component/driver/aad/utility/buildAadManifest.d.ts.map +1 -1
  51. package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
  52. package/build/component/driver/add/utility/constants.d.ts +1 -1
  53. package/build/component/driver/add/utility/constants.d.ts.map +1 -1
  54. package/build/component/driver/add/utility/constants.js +1 -1
  55. package/build/component/driver/add/utility/constants.js.map +1 -1
  56. package/build/component/driver/apiKey/utility/utility.d.ts.map +1 -1
  57. package/build/component/driver/apiKey/utility/utility.js +4 -3
  58. package/build/component/driver/apiKey/utility/utility.js.map +1 -1
  59. package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
  60. package/build/component/driver/devTool/installDriver.js +26 -21
  61. package/build/component/driver/devTool/installDriver.js.map +1 -1
  62. package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts +1 -0
  63. package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts.map +1 -1
  64. package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts +9 -2
  65. package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
  66. package/build/component/driver/file/createOrUpdateEnvironmentFile.js +114 -7
  67. package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
  68. package/build/component/driver/script/scriptDriver.d.ts +0 -1
  69. package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
  70. package/build/component/driver/script/scriptDriver.js +25 -15
  71. package/build/component/driver/script/scriptDriver.js.map +1 -1
  72. package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
  73. package/build/component/driver/teamsApp/createAppPackage.js +56 -12
  74. package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
  75. package/build/component/driver/teamsApp/teamsappMgr.d.ts.map +1 -1
  76. package/build/component/driver/teamsApp/teamsappMgr.js +2 -0
  77. package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
  78. package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts +2 -0
  79. package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
  80. package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +52 -16
  81. package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
  82. package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +1 -0
  83. package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
  84. package/build/component/driver/teamsApp/utils/ManifestUtils.js +12 -0
  85. package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
  86. package/build/component/driver/teamsApp/validate.js +4 -4
  87. package/build/component/driver/teamsApp/validate.js.map +1 -1
  88. package/build/component/generator/apiSpec/generator.d.ts +1 -1
  89. package/build/component/generator/apiSpec/generator.d.ts.map +1 -1
  90. package/build/component/generator/apiSpec/generator.js +279 -62
  91. package/build/component/generator/apiSpec/generator.js.map +1 -1
  92. package/build/component/generator/apiSpec/helper.d.ts +3 -2
  93. package/build/component/generator/apiSpec/helper.d.ts.map +1 -1
  94. package/build/component/generator/apiSpec/helper.js +129 -36
  95. package/build/component/generator/apiSpec/helper.js.map +1 -1
  96. package/build/component/generator/copilotExtension/generator.d.ts +3 -1
  97. package/build/component/generator/copilotExtension/generator.d.ts.map +1 -1
  98. package/build/component/generator/copilotExtension/generator.js +31 -45
  99. package/build/component/generator/copilotExtension/generator.js.map +1 -1
  100. package/build/component/generator/defaultGenerator.d.ts +13 -0
  101. package/build/component/generator/defaultGenerator.d.ts.map +1 -0
  102. package/build/component/generator/{templates/templateGenerator.js → defaultGenerator.js} +19 -14
  103. package/build/component/generator/defaultGenerator.js.map +1 -0
  104. package/build/component/generator/generator.d.ts +2 -2
  105. package/build/component/generator/generator.d.ts.map +1 -1
  106. package/build/component/generator/generator.js +25 -13
  107. package/build/component/generator/generator.js.map +1 -1
  108. package/build/component/generator/generatorProvider.d.ts +1 -1
  109. package/build/component/generator/generatorProvider.d.ts.map +1 -1
  110. package/build/component/generator/generatorProvider.js +5 -3
  111. package/build/component/generator/generatorProvider.js.map +1 -1
  112. package/build/component/generator/officeAddin/generator.d.ts +4 -6
  113. package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
  114. package/build/component/generator/officeAddin/generator.js +20 -108
  115. package/build/component/generator/officeAddin/generator.js.map +1 -1
  116. package/build/component/generator/{templates → other}/ssrTabGenerator.d.ts +2 -6
  117. package/build/component/generator/other/ssrTabGenerator.d.ts.map +1 -0
  118. package/build/component/generator/other/ssrTabGenerator.js +33 -0
  119. package/build/component/generator/other/ssrTabGenerator.js.map +1 -0
  120. package/build/component/generator/{templates/templateGenerator.d.ts → other/tdpGenerator.d.ts} +11 -6
  121. package/build/component/generator/other/tdpGenerator.d.ts.map +1 -0
  122. package/build/component/generator/other/tdpGenerator.js +49 -0
  123. package/build/component/generator/other/tdpGenerator.js.map +1 -0
  124. package/build/component/generator/spfx/spfxGenerator.d.ts +1 -1
  125. package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
  126. package/build/component/generator/spfx/spfxGenerator.js +7 -6
  127. package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
  128. package/build/component/generator/spfx/utils/constants.d.ts +1 -1
  129. package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
  130. package/build/component/generator/spfx/utils/constants.js +1 -1
  131. package/build/component/generator/spfx/utils/constants.js.map +1 -1
  132. package/build/component/generator/templates/metadata/bot.d.ts +3 -0
  133. package/build/component/generator/templates/metadata/bot.d.ts.map +1 -0
  134. package/build/component/generator/templates/metadata/bot.js +142 -0
  135. package/build/component/generator/templates/metadata/bot.js.map +1 -0
  136. package/build/component/generator/templates/metadata/cea.d.ts +3 -0
  137. package/build/component/generator/templates/metadata/cea.d.ts.map +1 -0
  138. package/build/component/generator/templates/metadata/cea.js +147 -0
  139. package/build/component/generator/templates/metadata/cea.js.map +1 -0
  140. package/build/component/generator/templates/metadata/common.d.ts +3 -0
  141. package/build/component/generator/templates/metadata/common.d.ts.map +1 -0
  142. package/build/component/generator/templates/metadata/common.js +15 -0
  143. package/build/component/generator/templates/metadata/common.js.map +1 -0
  144. package/build/component/generator/templates/metadata/copilotPlugin.d.ts +3 -0
  145. package/build/component/generator/templates/metadata/copilotPlugin.d.ts.map +1 -0
  146. package/build/component/generator/templates/metadata/copilotPlugin.js +15 -0
  147. package/build/component/generator/templates/metadata/copilotPlugin.js.map +1 -0
  148. package/build/component/generator/templates/metadata/da.d.ts +3 -0
  149. package/build/component/generator/templates/metadata/da.d.ts.map +1 -0
  150. package/build/component/generator/templates/metadata/da.js +75 -0
  151. package/build/component/generator/templates/metadata/da.js.map +1 -0
  152. package/build/component/generator/templates/metadata/index.d.ts +5 -0
  153. package/build/component/generator/templates/metadata/index.d.ts.map +1 -0
  154. package/build/component/generator/templates/metadata/index.js +64 -0
  155. package/build/component/generator/templates/metadata/index.js.map +1 -0
  156. package/build/component/generator/templates/metadata/interface.d.ts +8 -0
  157. package/build/component/generator/templates/metadata/interface.d.ts.map +1 -0
  158. package/build/component/generator/templates/metadata/interface.js +5 -0
  159. package/build/component/generator/templates/metadata/interface.js.map +1 -0
  160. package/build/component/generator/templates/metadata/me.d.ts +3 -0
  161. package/build/component/generator/templates/metadata/me.d.ts.map +1 -0
  162. package/build/component/generator/templates/metadata/me.js +111 -0
  163. package/build/component/generator/templates/metadata/me.js.map +1 -0
  164. package/build/component/generator/templates/metadata/special.d.ts +3 -0
  165. package/build/component/generator/templates/metadata/special.d.ts.map +1 -0
  166. package/build/component/generator/templates/metadata/special.js +54 -0
  167. package/build/component/generator/templates/metadata/special.js.map +1 -0
  168. package/build/component/generator/templates/metadata/tab.d.ts +3 -0
  169. package/build/component/generator/templates/metadata/tab.d.ts.map +1 -0
  170. package/build/component/generator/templates/metadata/tab.js +47 -0
  171. package/build/component/generator/templates/metadata/tab.js.map +1 -0
  172. package/build/component/generator/templates/metadata/tdp.d.ts +3 -0
  173. package/build/component/generator/templates/metadata/tdp.d.ts.map +1 -0
  174. package/build/component/generator/templates/metadata/tdp.js +51 -0
  175. package/build/component/generator/templates/metadata/tdp.js.map +1 -0
  176. package/build/component/generator/templates/metadata/vs.d.ts +3 -0
  177. package/build/component/generator/templates/metadata/vs.d.ts.map +1 -0
  178. package/build/component/generator/templates/metadata/vs.js +34 -0
  179. package/build/component/generator/templates/metadata/vs.js.map +1 -0
  180. package/build/component/generator/templates/templateNames.d.ts +27 -30
  181. package/build/component/generator/templates/templateNames.d.ts.map +1 -1
  182. package/build/component/generator/templates/templateNames.js +48 -109
  183. package/build/component/generator/templates/templateNames.js.map +1 -1
  184. package/build/component/generator/utils.d.ts.map +1 -1
  185. package/build/component/generator/utils.js +8 -1
  186. package/build/component/generator/utils.js.map +1 -1
  187. package/build/component/m365/launchHelper.d.ts.map +1 -1
  188. package/build/component/m365/launchHelper.js +1 -0
  189. package/build/component/m365/launchHelper.js.map +1 -1
  190. package/build/component/m365/packageService.d.ts +9 -1
  191. package/build/component/m365/packageService.d.ts.map +1 -1
  192. package/build/component/m365/packageService.js +126 -4
  193. package/build/component/m365/packageService.js.map +1 -1
  194. package/build/component/middleware/questionMW.js +1 -1
  195. package/build/component/middleware/questionMW.js.map +1 -1
  196. package/build/component/provisionUtils.d.ts.map +1 -1
  197. package/build/component/provisionUtils.js +2 -1
  198. package/build/component/provisionUtils.js.map +1 -1
  199. package/build/component/utils/envFunctionUtils.d.ts.map +1 -1
  200. package/build/component/utils/envFunctionUtils.js +0 -4
  201. package/build/component/utils/envFunctionUtils.js.map +1 -1
  202. package/build/component/utils/pathUtils.d.ts +1 -0
  203. package/build/component/utils/pathUtils.d.ts.map +1 -1
  204. package/build/component/utils/pathUtils.js +7 -0
  205. package/build/component/utils/pathUtils.js.map +1 -1
  206. package/build/core/FxCore.d.ts +16 -1
  207. package/build/core/FxCore.d.ts.map +1 -1
  208. package/build/core/FxCore.js +283 -65
  209. package/build/core/FxCore.js.map +1 -1
  210. package/build/core/collaborator.d.ts.map +1 -1
  211. package/build/core/collaborator.js +5 -2
  212. package/build/core/collaborator.js.map +1 -1
  213. package/build/index.d.ts +13 -11
  214. package/build/index.d.ts.map +1 -1
  215. package/build/index.js +20 -17
  216. package/build/index.js.map +1 -1
  217. package/build/question/constants.d.ts +24 -15
  218. package/build/question/constants.d.ts.map +1 -1
  219. package/build/question/constants.js +101 -148
  220. package/build/question/constants.js.map +1 -1
  221. package/build/question/create.d.ts +11 -11
  222. package/build/question/create.d.ts.map +1 -1
  223. package/build/question/create.js +74 -150
  224. package/build/question/create.js.map +1 -1
  225. package/build/question/generator.js +6 -2
  226. package/build/question/generator.js.map +1 -1
  227. package/build/question/index.d.ts +7 -2
  228. package/build/question/index.d.ts.map +1 -1
  229. package/build/question/index.js +24 -2
  230. package/build/question/index.js.map +1 -1
  231. package/build/question/inputs/AddAuthActionInputs.d.ts +20 -0
  232. package/build/question/inputs/AddAuthActionInputs.d.ts.map +1 -0
  233. package/build/question/inputs/AddAuthActionInputs.js +5 -0
  234. package/build/question/inputs/AddAuthActionInputs.js.map +1 -0
  235. package/build/question/inputs/AddKnowledgeInputs.d.ts +12 -0
  236. package/build/question/inputs/AddKnowledgeInputs.d.ts.map +1 -0
  237. package/build/question/inputs/AddKnowledgeInputs.js +5 -0
  238. package/build/question/inputs/AddKnowledgeInputs.js.map +1 -0
  239. package/build/question/inputs/AddPluginInputs.d.ts +1 -1
  240. package/build/question/inputs/AddPluginInputs.d.ts.map +1 -1
  241. package/build/question/inputs/CreateProjectInputs.d.ts +4 -6
  242. package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
  243. package/build/question/inputs/index.d.ts +2 -0
  244. package/build/question/inputs/index.d.ts.map +1 -1
  245. package/build/question/inputs/index.js +2 -0
  246. package/build/question/inputs/index.js.map +1 -1
  247. package/build/question/options/AddAuthActionOptions.d.ts +10 -0
  248. package/build/question/options/AddAuthActionOptions.d.ts.map +1 -0
  249. package/build/question/options/AddAuthActionOptions.js +39 -0
  250. package/build/question/options/AddAuthActionOptions.js.map +1 -0
  251. package/build/question/options/AddKnowledgeOptions.d.ts +10 -0
  252. package/build/question/options/AddKnowledgeOptions.d.ts.map +1 -0
  253. package/build/question/options/AddKnowledgeOptions.js +17 -0
  254. package/build/question/options/AddKnowledgeOptions.js.map +1 -0
  255. package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
  256. package/build/question/options/CreateProjectOptions.js +2 -10
  257. package/build/question/options/CreateProjectOptions.js.map +1 -1
  258. package/build/question/options/index.d.ts +2 -0
  259. package/build/question/options/index.d.ts.map +1 -1
  260. package/build/question/options/index.js +2 -0
  261. package/build/question/options/index.js.map +1 -1
  262. package/build/question/other.d.ts +8 -1
  263. package/build/question/other.d.ts.map +1 -1
  264. package/build/question/other.js +155 -1
  265. package/build/question/other.js.map +1 -1
  266. package/build/question/scaffold/vs/createRootNode.d.ts +14 -0
  267. package/build/question/scaffold/vs/createRootNode.d.ts.map +1 -0
  268. package/build/question/scaffold/vs/createRootNode.js +136 -0
  269. package/build/question/scaffold/vs/createRootNode.js.map +1 -0
  270. package/build/question/scaffold/vsc/CapabilityOptions.d.ts +77 -0
  271. package/build/question/scaffold/vsc/CapabilityOptions.d.ts.map +1 -0
  272. package/build/question/scaffold/vsc/CapabilityOptions.js +474 -0
  273. package/build/question/scaffold/vsc/CapabilityOptions.js.map +1 -0
  274. package/build/question/scaffold/vsc/ProjectTypeOptions.d.ts +22 -0
  275. package/build/question/scaffold/vsc/ProjectTypeOptions.d.ts.map +1 -0
  276. package/build/question/scaffold/vsc/ProjectTypeOptions.js +95 -0
  277. package/build/question/scaffold/vsc/ProjectTypeOptions.js.map +1 -0
  278. package/build/question/scaffold/vsc/createFromTdpNode.d.ts +11 -0
  279. package/build/question/scaffold/vsc/createFromTdpNode.d.ts.map +1 -0
  280. package/build/question/scaffold/vsc/createFromTdpNode.js +175 -0
  281. package/build/question/scaffold/vsc/createFromTdpNode.js.map +1 -0
  282. package/build/question/scaffold/vsc/createRootNode.d.ts +16 -0
  283. package/build/question/scaffold/vsc/createRootNode.d.ts.map +1 -0
  284. package/build/question/scaffold/vsc/createRootNode.js +186 -0
  285. package/build/question/scaffold/vsc/createRootNode.js.map +1 -0
  286. package/build/question/scaffold/vsc/customAgentProjectTypeNode.d.ts +6 -0
  287. package/build/question/scaffold/vsc/customAgentProjectTypeNode.d.ts.map +1 -0
  288. package/build/question/scaffold/vsc/customAgentProjectTypeNode.js +146 -0
  289. package/build/question/scaffold/vsc/customAgentProjectTypeNode.js.map +1 -0
  290. package/build/question/scaffold/vsc/daProjectTypeNode.d.ts +3 -0
  291. package/build/question/scaffold/vsc/daProjectTypeNode.d.ts.map +1 -0
  292. package/build/question/scaffold/vsc/daProjectTypeNode.js +94 -0
  293. package/build/question/scaffold/vsc/daProjectTypeNode.js.map +1 -0
  294. package/build/question/scaffold/vsc/officeAddinProjectTypeNode.d.ts +5 -0
  295. package/build/question/scaffold/vsc/officeAddinProjectTypeNode.d.ts.map +1 -0
  296. package/build/question/scaffold/vsc/officeAddinProjectTypeNode.js +108 -0
  297. package/build/question/scaffold/vsc/officeAddinProjectTypeNode.js.map +1 -0
  298. package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts +7 -0
  299. package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map +1 -0
  300. package/build/question/scaffold/vsc/teamsProjectTypeNode.js +178 -0
  301. package/build/question/scaffold/vsc/teamsProjectTypeNode.js.map +1 -0
  302. package/build/tsconfig.tsbuildinfo +1 -1
  303. package/build/ui/visitor.d.ts.map +1 -1
  304. package/build/ui/visitor.js +36 -5
  305. package/build/ui/visitor.js.map +1 -1
  306. package/package.json +4 -4
  307. package/resource/package.nls.cs.json +564 -264
  308. package/resource/package.nls.de.json +552 -252
  309. package/resource/package.nls.es.json +564 -264
  310. package/resource/package.nls.fr.json +578 -278
  311. package/resource/package.nls.it.json +568 -268
  312. package/resource/package.nls.ja.json +558 -258
  313. package/resource/package.nls.json +64 -43
  314. package/resource/package.nls.ko.json +553 -253
  315. package/resource/package.nls.pl.json +560 -260
  316. package/resource/package.nls.pt-BR.json +577 -277
  317. package/resource/package.nls.ru.json +568 -268
  318. package/resource/package.nls.tr.json +563 -263
  319. package/resource/package.nls.zh-Hans.json +549 -249
  320. package/resource/package.nls.zh-Hant.json +560 -260
  321. package/resource/package.nls.zh-cn.json +528 -248
  322. package/resource/package.nls.zh-tw.json +539 -259
  323. package/resource/yaml-schema/v1.8/yaml.schema.json +1858 -0
  324. package/resource/yaml-schema/yaml.schema.json +5 -1
  325. package/templates/fallback/common.zip +0 -0
  326. package/templates/fallback/csharp.zip +0 -0
  327. package/templates/fallback/js.zip +0 -0
  328. package/templates/fallback/python.zip +0 -0
  329. package/templates/fallback/ts.zip +0 -0
  330. package/templates/plugins/resource/aad/auth/V3/Enable SSO.txt +2 -2
  331. package/templates/plugins/resource/aad/auth/V3/aad.manifest.template.json +87 -77
  332. package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +2 -2
  333. package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +2 -2
  334. package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +2 -2
  335. package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +2 -2
  336. package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +2 -2
  337. package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +2 -2
  338. package/templates/plugins/resource/aad/manifest/aad.template.json +109 -97
  339. package/templates/plugins/resource/aad/manifest/bot/aad.manifest.template.json +90 -81
  340. package/templates/plugins/resource/aad/manifest/tab/aad.manifest.template.json +93 -89
  341. package/build/component/generator/officeXMLAddin/projectConfig.d.ts +0 -22
  342. package/build/component/generator/officeXMLAddin/projectConfig.d.ts.map +0 -1
  343. package/build/component/generator/officeXMLAddin/projectConfig.js +0 -41
  344. package/build/component/generator/officeXMLAddin/projectConfig.js.map +0 -1
  345. package/build/component/generator/templates/ssrTabGenerator.d.ts.map +0 -1
  346. package/build/component/generator/templates/ssrTabGenerator.js +0 -36
  347. package/build/component/generator/templates/ssrTabGenerator.js.map +0 -1
  348. package/build/component/generator/templates/templateGenerator.d.ts.map +0 -1
  349. package/build/component/generator/templates/templateGenerator.js.map +0 -1
@@ -1,10 +1,7 @@
1
1
  export declare function isFeatureFlagEnabled(featureFlagName: string, defaultValue?: boolean): boolean;
2
2
  export declare class FeatureFlagName {
3
3
  static readonly CLIDotNet = "TEAMSFX_CLI_DOTNET";
4
- static readonly OfficeAddin = "TEAMSFX_OFFICE_ADDIN";
5
4
  static readonly OfficeMetaOS = "TEAMSFX_OFFICE_METAOS";
6
- static readonly CopilotExtension = "DEVELOP_COPILOT_EXTENSION";
7
- static readonly CopilotPlugin = "DEVELOP_COPILOT_PLUGIN";
8
5
  static readonly SampleConfigBranch = "TEAMSFX_SAMPLE_CONFIG_BRANCH";
9
6
  static readonly TestTool = "TEAMSFX_TEST_TOOL";
10
7
  static readonly METestTool = "TEAMSFX_ME_TEST_TOOL";
@@ -19,11 +16,10 @@ export declare class FeatureFlagName {
19
16
  static readonly TelemetryTest = "TEAMSFX_TELEMETRY_TEST";
20
17
  static readonly DevTunnelTest = "TEAMSFX_DEV_TUNNEL_TEST";
21
18
  static readonly SyncManifest = "TEAMSFX_SYNC_MANIFEST";
22
- static readonly EnvFileFunc = "TEAMSFX_ENV_FILE_FUNC";
23
19
  static readonly KiotaIntegration = "TEAMSFX_KIOTA_INTEGRATION";
24
- static readonly ApiPluginAAD = "TEAMSFX_API_PLUGIN_AAD";
25
20
  static readonly CEAEnabled = "TEAMSFX_CEA_ENABLED";
26
- static readonly MultiTenant = "TEAMSFX_MULTI_TENANT";
21
+ static readonly BuilderAPIEnabled = "TEAMSFX_BUILDER_API";
22
+ static readonly AddKnowledge = "TEAMSFX_ADD_KNOWLEDGE";
27
23
  }
28
24
  export interface FeatureFlag {
29
25
  name: string;
@@ -35,14 +31,6 @@ export declare class FeatureFlags {
35
31
  name: string;
36
32
  defaultValue: string;
37
33
  };
38
- static readonly CopilotExtension: {
39
- name: string;
40
- defaultValue: string;
41
- };
42
- static readonly CopilotPlugin: {
43
- name: string;
44
- defaultValue: string;
45
- };
46
34
  static readonly TestTool: {
47
35
  name: string;
48
36
  defaultValue: string;
@@ -51,10 +39,6 @@ export declare class FeatureFlags {
51
39
  name: string;
52
40
  defaultValue: string;
53
41
  };
54
- static readonly OfficeAddin: {
55
- name: string;
56
- defaultValue: string;
57
- };
58
42
  static readonly OfficeMetaOS: {
59
43
  name: string;
60
44
  defaultValue: string;
@@ -99,28 +83,23 @@ export declare class FeatureFlags {
99
83
  name: string;
100
84
  defaultValue: string;
101
85
  };
102
- static readonly EnvFileFunc: {
103
- name: string;
104
- defaultValue: string;
105
- };
106
86
  static readonly KiotaIntegration: {
107
87
  name: string;
108
88
  defaultValue: string;
109
89
  };
110
- static readonly ApiPluginAAD: {
90
+ static readonly CEAEnabled: {
111
91
  name: string;
112
92
  defaultValue: string;
113
93
  };
114
- static readonly CEAEnabled: {
94
+ static readonly BuilderAPIEnabled: {
115
95
  name: string;
116
96
  defaultValue: string;
117
97
  };
118
- static readonly MultiTenant: {
98
+ static readonly AddKnowledge: {
119
99
  name: string;
120
100
  defaultValue: string;
121
101
  };
122
102
  }
123
- export declare function isCopilotExtensionEnabled(): boolean;
124
103
  export declare class FeatureFlagManager {
125
104
  getBooleanValue(featureFlag: FeatureFlag): boolean;
126
105
  setBooleanValue(featureFlag: FeatureFlag, value: boolean): void;
@@ -1 +1 @@
1
- {"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAO3F;AACD,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,SAAS,wBAAwB;IACjD,MAAM,CAAC,QAAQ,CAAC,YAAY,2BAA2B;IACvD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,QAAQ,uBAAuB;IAC/C,MAAM,CAAC,QAAQ,CAAC,UAAU,0BAA0B;IACpD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,wBAAwB;IACzD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,mCAAmC;IACrE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,cAAc,8BAA8B;IAC5D,MAAM,CAAC,QAAQ,CAAC,eAAe,8BAA8B;IAC7D,MAAM,CAAC,QAAQ,CAAC,wBAAwB,sCAAsC;IAC9E,MAAM,CAAC,QAAQ,CAAC,QAAQ,eAAe;IACvC,MAAM,CAAC,QAAQ,CAAC,eAAe,8BAA8B;IAC7D,MAAM,CAAC,QAAQ,CAAC,aAAa,4BAA4B;IACzD,MAAM,CAAC,QAAQ,CAAC,aAAa,6BAA6B;IAC1D,MAAM,CAAC,QAAQ,CAAC,YAAY,2BAA2B;IACvD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,+BAA+B;IAC/D,MAAM,CAAC,QAAQ,CAAC,UAAU,yBAAyB;IACnD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,yBAAyB;IAC1D,MAAM,CAAC,QAAQ,CAAC,YAAY,2BAA2B;CACxD;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,YAAY;IACvB,MAAM,CAAC,QAAQ,CAAC,SAAS;;;MAA8D;IACvF,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;MAA4D;IACpF,MAAM,CAAC,QAAQ,CAAC,UAAU;;;MAA8D;IACxF,MAAM,CAAC,QAAQ,CAAC,YAAY;;;MAG1B;IACF,MAAM,CAAC,QAAQ,CAAC,kBAAkB;;;MAGhC;IACF,MAAM,CAAC,QAAQ,CAAC,kBAAkB;;;MAGhC;IACF,MAAM,CAAC,QAAQ,CAAC,cAAc;;;MAAkE;IAChG,MAAM,CAAC,QAAQ,CAAC,eAAe;;;MAG7B;IACF,MAAM,CAAC,QAAQ,CAAC,wBAAwB;;;MAGtC;IACF,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;MAA6D;IACrF,MAAM,CAAC,QAAQ,CAAC,eAAe;;;MAG7B;IACF,MAAM,CAAC,QAAQ,CAAC,aAAa;;;MAG3B;IACF,MAAM,CAAC,QAAQ,CAAC,aAAa;;;MAG3B;IACF,MAAM,CAAC,QAAQ,CAAC,YAAY;;;MAG1B;IACF,MAAM,CAAC,QAAQ,CAAC,gBAAgB;;;MAG9B;IACF,MAAM,CAAC,QAAQ,CAAC,UAAU;;;MAGxB;IACF,MAAM,CAAC,QAAQ,CAAC,iBAAiB;;;MAG/B;IACF,MAAM,CAAC,QAAQ,CAAC,YAAY;;;MAG1B;CACH;AAED,qBAAa,kBAAkB;IAC7B,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO;IAMlD,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAG/D,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM;IAGhD,IAAI,IAAI,WAAW,EAAE;IAGrB,WAAW,IAAI,MAAM,EAAE;CAKxB;AAED,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) Microsoft Corporation.
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.featureFlagManager = exports.FeatureFlagManager = exports.isCopilotExtensionEnabled = exports.FeatureFlags = exports.FeatureFlagName = exports.isFeatureFlagEnabled = void 0;
5
+ exports.featureFlagManager = exports.FeatureFlagManager = exports.FeatureFlags = exports.FeatureFlagName = exports.isFeatureFlagEnabled = void 0;
6
6
  // Determine whether feature flag is enabled based on environment variable setting
7
7
  function isFeatureFlagEnabled(featureFlagName, defaultValue = false) {
8
8
  const flag = process.env[featureFlagName];
@@ -18,10 +18,7 @@ class FeatureFlagName {
18
18
  }
19
19
  exports.FeatureFlagName = FeatureFlagName;
20
20
  FeatureFlagName.CLIDotNet = "TEAMSFX_CLI_DOTNET";
21
- FeatureFlagName.OfficeAddin = "TEAMSFX_OFFICE_ADDIN";
22
21
  FeatureFlagName.OfficeMetaOS = "TEAMSFX_OFFICE_METAOS";
23
- FeatureFlagName.CopilotExtension = "DEVELOP_COPILOT_EXTENSION";
24
- FeatureFlagName.CopilotPlugin = "DEVELOP_COPILOT_PLUGIN";
25
22
  FeatureFlagName.SampleConfigBranch = "TEAMSFX_SAMPLE_CONFIG_BRANCH";
26
23
  FeatureFlagName.TestTool = "TEAMSFX_TEST_TOOL";
27
24
  FeatureFlagName.METestTool = "TEAMSFX_ME_TEST_TOOL";
@@ -36,29 +33,19 @@ FeatureFlagName.ShowDiagnostics = "TEAMSFX_SHOW_DIAGNOSTICS";
36
33
  FeatureFlagName.TelemetryTest = "TEAMSFX_TELEMETRY_TEST";
37
34
  FeatureFlagName.DevTunnelTest = "TEAMSFX_DEV_TUNNEL_TEST";
38
35
  FeatureFlagName.SyncManifest = "TEAMSFX_SYNC_MANIFEST";
39
- FeatureFlagName.EnvFileFunc = "TEAMSFX_ENV_FILE_FUNC";
40
36
  FeatureFlagName.KiotaIntegration = "TEAMSFX_KIOTA_INTEGRATION";
41
- FeatureFlagName.ApiPluginAAD = "TEAMSFX_API_PLUGIN_AAD";
42
37
  FeatureFlagName.CEAEnabled = "TEAMSFX_CEA_ENABLED";
43
- FeatureFlagName.MultiTenant = "TEAMSFX_MULTI_TENANT";
38
+ FeatureFlagName.BuilderAPIEnabled = "TEAMSFX_BUILDER_API";
39
+ FeatureFlagName.AddKnowledge = "TEAMSFX_ADD_KNOWLEDGE";
44
40
  class FeatureFlags {
45
41
  }
46
42
  exports.FeatureFlags = FeatureFlags;
47
43
  FeatureFlags.CLIDotNet = { name: FeatureFlagName.CLIDotNet, defaultValue: "false" };
48
- FeatureFlags.CopilotExtension = {
49
- name: FeatureFlagName.CopilotExtension,
50
- defaultValue: "false",
51
- };
52
- FeatureFlags.CopilotPlugin = {
53
- name: FeatureFlagName.CopilotPlugin,
54
- defaultValue: "false",
55
- }; // old feature flag. Keep it for backwards compatibility.
56
44
  FeatureFlags.TestTool = { name: FeatureFlagName.TestTool, defaultValue: "true" };
57
45
  FeatureFlags.METestTool = { name: FeatureFlagName.METestTool, defaultValue: "true" };
58
- FeatureFlags.OfficeAddin = { name: FeatureFlagName.OfficeAddin, defaultValue: "false" };
59
46
  FeatureFlags.OfficeMetaOS = {
60
47
  name: FeatureFlagName.OfficeMetaOS,
61
- defaultValue: "false",
48
+ defaultValue: "true",
62
49
  };
63
50
  FeatureFlags.TdpTemplateCliTest = {
64
51
  name: FeatureFlagName.TdpTemplateCliTest,
@@ -75,7 +62,7 @@ FeatureFlags.ChatParticipant = {
75
62
  };
76
63
  FeatureFlags.ChatParticipantUIEntries = {
77
64
  name: FeatureFlagName.ChatParticipantUIEntries,
78
- defaultValue: "true",
65
+ defaultValue: "false",
79
66
  };
80
67
  FeatureFlags.SMEOAuth = { name: FeatureFlagName.SMEOAuth, defaultValue: "false" };
81
68
  FeatureFlags.ShowDiagnostics = {
@@ -94,31 +81,22 @@ FeatureFlags.SyncManifest = {
94
81
  name: FeatureFlagName.SyncManifest,
95
82
  defaultValue: "false",
96
83
  };
97
- FeatureFlags.EnvFileFunc = {
98
- name: FeatureFlagName.EnvFileFunc,
99
- defaultValue: "true", // Set it to true for dogfooding.
100
- };
101
84
  FeatureFlags.KiotaIntegration = {
102
85
  name: FeatureFlagName.KiotaIntegration,
103
86
  defaultValue: "false",
104
87
  };
105
- FeatureFlags.ApiPluginAAD = {
106
- name: FeatureFlagName.ApiPluginAAD,
107
- defaultValue: "false",
108
- };
109
88
  FeatureFlags.CEAEnabled = {
110
89
  name: FeatureFlagName.CEAEnabled,
111
90
  defaultValue: "false",
112
91
  };
113
- FeatureFlags.MultiTenant = {
114
- name: FeatureFlagName.MultiTenant,
92
+ FeatureFlags.BuilderAPIEnabled = {
93
+ name: FeatureFlagName.BuilderAPIEnabled,
94
+ defaultValue: "false",
95
+ };
96
+ FeatureFlags.AddKnowledge = {
97
+ name: FeatureFlagName.AddKnowledge,
115
98
  defaultValue: "false",
116
99
  };
117
- function isCopilotExtensionEnabled() {
118
- return (exports.featureFlagManager.getBooleanValue(FeatureFlags.CopilotExtension) ||
119
- exports.featureFlagManager.getBooleanValue(FeatureFlags.CopilotPlugin));
120
- }
121
- exports.isCopilotExtensionEnabled = isCopilotExtensionEnabled;
122
100
  class FeatureFlagManager {
123
101
  getBooleanValue(featureFlag) {
124
102
  return isFeatureFlagEnabled(featureFlag.name, featureFlag.defaultValue === "true" || featureFlag.defaultValue === "1");
@@ -1 +1 @@
1
- {"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"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"}
@@ -35,6 +35,7 @@ declare class ProjectTypeChecker {
35
35
  checkProjectType(projectPath: string): Promise<ProjectTypeResult>;
36
36
  }
37
37
  export declare function getCapabilities(manifest: any): string[];
38
+ export declare function IsDeclarativeAgentManifest(manifest: any): boolean;
38
39
  export declare const projectTypeChecker: ProjectTypeChecker;
39
40
  export {};
40
41
  //# sourceMappingURL=projectTypeChecker.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"projectTypeChecker.d.ts","sourceRoot":"","sources":["../../src/common/projectTypeChecker.ts"],"names":[],"mappings":"AAUA,oBAAY,iBAAiB;IAC3B,mBAAmB,yBAAyB;IAC5C,WAAW,iBAAiB;CAC7B;AACD,eAAO,MAAM,aAAa,wBAAwB,CAAC;AAEnD,eAAO,MAAM,OAAO,oCAAoC,CAAC;AAEzD,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,WAAW,gBAAgB;IAC3B,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,SAAS,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC;CACjE;AAED,cAAM,kBAAkB;IAChB,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,IAAI,EAAE,iBAAiB,EACvB,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,EAC7E,QAAQ,EAAE,MAAM,EAChB,YAAY,SAAI;IAiCZ,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBjF,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAiCxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAsDhF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAanF,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO;IASpE,gBAAgB,CAAC,WAAW,EAAE,MAAM;CA6C3C;AACD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAyCvD;AACD,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}
1
+ {"version":3,"file":"projectTypeChecker.d.ts","sourceRoot":"","sources":["../../src/common/projectTypeChecker.ts"],"names":[],"mappings":"AAUA,oBAAY,iBAAiB;IAC3B,mBAAmB,yBAAyB;IAC5C,WAAW,iBAAiB;CAC7B;AACD,eAAO,MAAM,aAAa,wBAAwB,CAAC;AAEnD,eAAO,MAAM,OAAO,oCAAoC,CAAC;AAEzD,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,WAAW,gBAAgB;IAC3B,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,SAAS,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC;CACjE;AAED,cAAM,kBAAkB;IAChB,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,IAAI,EAAE,iBAAiB,EACvB,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,EAC7E,QAAQ,EAAE,MAAM,EAChB,YAAY,SAAI;IAiCZ,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBjF,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAiCxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAsDhF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAanF,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO;IASpE,gBAAgB,CAAC,WAAW,EAAE,MAAM;CA6C3C;AACD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAyCvD;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAIjE;AACD,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) Microsoft Corporation.
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.projectTypeChecker = exports.getCapabilities = exports.TeamsfxVersionState = exports.SPFxKey = exports.TeamsJsModule = exports.TeamsfxConfigType = void 0;
5
+ exports.projectTypeChecker = exports.IsDeclarativeAgentManifest = exports.getCapabilities = exports.TeamsfxVersionState = exports.SPFxKey = exports.TeamsJsModule = exports.TeamsfxConfigType = void 0;
6
6
  const tslib_1 = require("tslib");
7
7
  const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
8
8
  const path_1 = tslib_1.__importDefault(require("path"));
@@ -240,5 +240,10 @@ function getCapabilities(manifest) {
240
240
  return capabilities;
241
241
  }
242
242
  exports.getCapabilities = getCapabilities;
243
+ function IsDeclarativeAgentManifest(manifest) {
244
+ var _a;
245
+ return !!(((_a = manifest.copilotAgents) === null || _a === void 0 ? void 0 : _a.declarativeAgents) && manifest.copilotAgents.declarativeAgents.length > 0);
246
+ }
247
+ exports.IsDeclarativeAgentManifest = IsDeclarativeAgentManifest;
243
248
  exports.projectTypeChecker = new ProjectTypeChecker();
244
249
  //# sourceMappingURL=projectTypeChecker.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"projectTypeChecker.js","sourceRoot":"","sources":["../../src/common/projectTypeChecker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"projectTypeChecker.js","sourceRoot":"","sources":["../../src/common/projectTypeChecker.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ interface SVMModel {
5
5
  declare class SecretMasker {
6
6
  model: SVMModel;
7
7
  predict(features: number[]): number;
8
- maskSecret(text: string, replace?: string): string;
8
+ maskSecret(text: string, replace?: string, whiteList?: string[]): string;
9
9
  }
10
10
  export declare const secretMasker: SecretMasker;
11
11
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"masker.d.ts","sourceRoot":"","sources":["../../../src/common/secretmasker/masker.ts"],"names":[],"mappings":"AAYA,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,cAAM,YAAY;IAChB,KAAK,EAAE,QAAQ,CAQb;IAEF,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM;IAWnC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,SAAQ,GAAG,MAAM;CAalD;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC"}
1
+ {"version":3,"file":"masker.d.ts","sourceRoot":"","sources":["../../../src/common/secretmasker/masker.ts"],"names":[],"mappings":"AAYA,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,cAAM,YAAY;IAChB,KAAK,EAAE,QAAQ,CAQb;IAEF,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM;IAWnC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,SAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM;CAaxE;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC"}
@@ -34,12 +34,12 @@ class SecretMasker {
34
34
  // If the decision function value is positive, classify as 1 (secret), otherwise 0 (non-secret)
35
35
  return decisionValue > 0 ? 1 : 0;
36
36
  }
37
- maskSecret(text, replace = "***") {
37
+ maskSecret(text, replace = "***", whiteList) {
38
38
  const tokens = (0, feature_1.extractFeatures)(text);
39
39
  for (const token of tokens) {
40
40
  if (token.type === "splitter")
41
41
  continue;
42
- if (WHITE_LIST.includes(token.token))
42
+ if (whiteList && whiteList.includes(token.token))
43
43
  continue;
44
44
  const prediction = this.predict(token.vector);
45
45
  token.label = prediction;
@@ -1 +1 @@
1
- {"version":3,"file":"masker.js","sourceRoot":"","sources":["../../../src/common/secretmasker/masker.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,uCAA4C;AAE5C,MAAM,UAAU,GAAG;IACjB,gBAAgB;IAChB,cAAc;IACd,kBAAkB;IAClB,YAAY;IACZ,mBAAmB;CACpB,CAAC;AAOF,MAAM,YAAY;IAAlB;QACE,UAAK,GAAa;YAChB,KAAK,EAAE;gBACL;oBACE,kBAAkB,EAAE,CAAC,iBAAiB,EAAE,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,GAAG;oBACpF,iBAAiB;iBAClB;aACF;YACD,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC;SAChC,CAAC;IA0BJ,CAAC;IAxBC,OAAO,CAAC,QAAkB;QACxB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACzC,sEAAsE;QACtE,IAAI,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,2BAA2B;QAC9D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxC,aAAa,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC5C;QACD,+CAA+C;QAC/C,+FAA+F;QAC/F,OAAO,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IACD,UAAU,CAAC,IAAY,EAAE,OAAO,GAAG,KAAK;QACtC,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAC;QACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;gBAAE,SAAS;YACxC,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;gBAAE,SAAS;YAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAO,CAAC,CAAC;YAC/C,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC;YACzB,IAAI,UAAU,KAAK,CAAC,EAAE;gBACpB,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC;aACvB;SACF;QACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;CACF;AAEY,QAAA,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC"}
1
+ {"version":3,"file":"masker.js","sourceRoot":"","sources":["../../../src/common/secretmasker/masker.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,uCAA4C;AAE5C,MAAM,UAAU,GAAG;IACjB,gBAAgB;IAChB,cAAc;IACd,kBAAkB;IAClB,YAAY;IACZ,mBAAmB;CACpB,CAAC;AAOF,MAAM,YAAY;IAAlB;QACE,UAAK,GAAa;YAChB,KAAK,EAAE;gBACL;oBACE,kBAAkB,EAAE,CAAC,iBAAiB,EAAE,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,GAAG;oBACpF,iBAAiB;iBAClB;aACF;YACD,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC;SAChC,CAAC;IA0BJ,CAAC;IAxBC,OAAO,CAAC,QAAkB;QACxB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACzC,sEAAsE;QACtE,IAAI,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,2BAA2B;QAC9D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxC,aAAa,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC5C;QACD,+CAA+C;QAC/C,+FAA+F;QAC/F,OAAO,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IACD,UAAU,CAAC,IAAY,EAAE,OAAO,GAAG,KAAK,EAAE,SAAoB;QAC5D,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAC;QACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;gBAAE,SAAS;YACxC,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;gBAAE,SAAS;YAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAO,CAAC,CAAC;YAC/C,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC;YACzB,IAAI,UAAU,KAAK,CAAC,EAAE;gBACpB,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC;aACvB;SACF;QACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;CACF;AAEY,QAAA,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC"}
@@ -17,7 +17,7 @@ function maskSecret(inputText, option) {
17
17
  return "";
18
18
  const replace = (option === null || option === void 0 ? void 0 : option.replace) || SECRET_REPLACE;
19
19
  let output = maskSecretFromEnv(inputText);
20
- output = masker_1.secretMasker.maskSecret(output, replace);
20
+ output = masker_1.secretMasker.maskSecret(output, replace, option === null || option === void 0 ? void 0 : option.whiteList);
21
21
  return output;
22
22
  }
23
23
  exports.maskSecret = maskSecret;
@@ -1 +1 @@
1
- {"version":3,"file":"stringUtils.js","sourceRoot":"","sources":["../../src/common/stringUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAiC;AACjC,+DAAyC;AACzC,6BAA0B;AAC1B,mDAA6B;AAC7B,4CAA+D;AAC/D,mDAAqD;AACrD,kDAAqD;AAErD,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAQ3C,SAAgB,UAAU,CAAC,SAAkB,EAAE,MAA0B;IACvE,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,KAAI,cAAc,CAAC;IAClD,IAAI,MAAM,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,GAAG,qBAAY,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,OAAO,MAAM,CAAC;AAChB,CAAC;AAND,gCAMC;AAED,SAAgB,iBAAiB,CAAC,MAAc,EAAE,OAAO,GAAG,cAAc;IACxE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC1C,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,KAAK,EAAE;gBACT,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;aAC1D;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAVD,8CAUC;AAED,SAAgB,yBAAyB,CAAC,OAAe;IACvD,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAFD,8DAEC;AAED,UAAU,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;IACrD,KAAK,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACjD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/C,CAAC,CAAC,CAAC;AACH,UAAU,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;IACxD,KAAK,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACjD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC,CAAC,CAAC;AACH,UAAU,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;IACpD,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AACtC,CAAC,CAAC,CAAC;AAEH,SAAgB,kCAAkC,CAAC,UAAkB;IACnE,MAAM,MAAM,GAAG,mBAAmB,CAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;IAChF,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,qCAA4B,CAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;KAC3E;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAND,gFAMC;AAED,SAAgB,mBAAmB,CAAC,OAAe,EAAE,UAAkB;IACrE,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACxC,CAAC;AAHD,kDAGC;AAED,SAAgB,OAAO;IACrB,OAAO,IAAI,CAAC,EAAE,EAAE,CAAC;AACnB,CAAC;AAFD,0BAEC;AAED,SAAgB,YAAY,CAAC,OAAe;IAC1C,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACnE,CAAC;AAFD,oCAEC;AAED,SAAgB,yBAAyB;IACvC,OAAO,IAAA,kCAAkB,EAAC,qCAAqC,CAAC,CAAC;AACnE,CAAC;AAFD,8DAEC;AAED,SAAgB,yBAAyB;IACvC,OAAO,IAAA,kCAAkB,EAAC,qCAAqC,CAAC,CAAC;AACnE,CAAC;AAFD,8DAEC;AAED,SAAgB,cAAc,CAAC,KAAa;IAC1C,IAAI,GAAG,CAAC;IACR,IAAI;QACF,GAAG,GAAG,IAAI,SAAG,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC;KAC9D;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AARD,wCAQC"}
1
+ {"version":3,"file":"stringUtils.js","sourceRoot":"","sources":["../../src/common/stringUtils.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": "~4.3",
3
- "localVersion": "4.3.2",
3
+ "localVersion": "4.3.3-alpha.0e22b17e0.0",
4
4
  "tagPrefix": "templates@",
5
5
  "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
6
6
  "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",
@@ -1,8 +1,9 @@
1
1
  export declare class ActionInjector {
2
- static hasActionWithName(provisionNode: any, action: string, name: string): any;
2
+ static hasActionWithName(provisionNode: any, action: string, name: string, specRelativePath: string): any;
3
3
  static getTeamsAppIdEnvName(provisionNode: any): string | undefined;
4
- static generateAuthAction(actionName: string, authName: string, teamsAppIdEnvName: string, specRelativePath: string, envName: string, flow?: string): any;
5
- static injectCreateOAuthAction(ymlPath: string, authName: string, specRelativePath: string, forceToAddNew: boolean): Promise<AuthActionInjectResult | undefined>;
4
+ static generateAuthAction(actionName: string, authName: string, teamsAppIdEnvName: string, specRelativePath: string, envName: string, flow?: string, isMicrosoftEntra?: boolean): any;
5
+ static injectCreateOAuthAction(ymlPath: string, authName: string, specRelativePath: string, forceToAddNew: boolean, // If it from add plugin, then we will add another CreateOAuthAction
6
+ isMicrosoftEntra: boolean): Promise<AuthActionInjectResult | undefined>;
6
7
  static injectCreateAPIKeyAction(ymlPath: string, authName: string, specRelativePath: string, forceToAddNew: boolean): Promise<AuthActionInjectResult | undefined>;
7
8
  static findNextAvailableEnvName(baseEnvName: string, existingEnvNames: string[]): string;
8
9
  }
@@ -1 +1 @@
1
- {"version":3,"file":"actionInjector.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"AAQA,qBAAa,cAAc;IACzB,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG;IAO/E,MAAM,CAAC,oBAAoB,CAAC,aAAa,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAUnE,MAAM,CAAC,kBAAkB,CACvB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,GACZ,GAAG;WAwBO,uBAAuB,CAClC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;WAgEjC,wBAAwB,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IA8D9C,MAAM,CAAC,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,MAAM;CASzF;AAED,MAAM,WAAW,sBAAsB;IACrC,4BAA4B,EAAE,MAAM,GAAG,SAAS,CAAC;IACjD,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C"}
1
+ {"version":3,"file":"actionInjector.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"AASA,qBAAa,cAAc;IACzB,MAAM,CAAC,iBAAiB,CACtB,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,GACvB,GAAG;IAWN,MAAM,CAAC,oBAAoB,CAAC,aAAa,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAUnE,MAAM,CAAC,kBAAkB,CACvB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,EACb,gBAAgB,CAAC,EAAE,OAAO,GACzB,GAAG;WA4BO,uBAAuB,CAClC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,EAAE,oEAAoE;IAC5F,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;WA6EjC,wBAAwB,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IA0E9C,MAAM,CAAC,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,MAAM;CASzF;AAED,MAAM,WAAW,sBAAsB;IACrC,4BAA4B,EAAE,MAAM,GAAG,SAAS,CAAC;IACjD,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C"}
@@ -8,9 +8,13 @@ const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
8
8
  const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
9
9
  const yaml_1 = require("yaml");
10
10
  const common_1 = require("../../error/common");
11
+ const constant_1 = require("./constant");
11
12
  class ActionInjector {
12
- static hasActionWithName(provisionNode, action, name) {
13
- const hasAuthAction = provisionNode.items.some((item) => { var _a; return item.get("uses") === action && ((_a = item.get("with")) === null || _a === void 0 ? void 0 : _a.get("name")) === name; });
13
+ static hasActionWithName(provisionNode, action, name, specRelativePath) {
14
+ const hasAuthAction = provisionNode.items.some((item) => item.get("uses") === action &&
15
+ !!item.get("with") &&
16
+ item.get("with").get("name") === name &&
17
+ item.get("with").get("apiSpecPath") === specRelativePath);
14
18
  return hasAuthAction;
15
19
  }
16
20
  static getTeamsAppIdEnvName(provisionNode) {
@@ -22,7 +26,7 @@ class ActionInjector {
22
26
  }
23
27
  return undefined;
24
28
  }
25
- static generateAuthAction(actionName, authName, teamsAppIdEnvName, specRelativePath, envName, flow) {
29
+ static generateAuthAction(actionName, authName, teamsAppIdEnvName, specRelativePath, envName, flow, isMicrosoftEntra) {
26
30
  const result = {
27
31
  uses: actionName,
28
32
  with: {
@@ -42,16 +46,19 @@ class ActionInjector {
42
46
  registrationId: envName,
43
47
  };
44
48
  }
49
+ if (isMicrosoftEntra) {
50
+ result.with.identityProvider = constant_1.MicrosoftEntraAuthType;
51
+ }
45
52
  return result;
46
53
  }
47
- static async injectCreateOAuthAction(ymlPath, authName, specRelativePath, forceToAddNew // If it from add plugin, then we will add another CreateOAuthAction
48
- ) {
54
+ static async injectCreateOAuthAction(ymlPath, authName, specRelativePath, forceToAddNew, // If it from add plugin, then we will add another CreateOAuthAction
55
+ isMicrosoftEntra) {
49
56
  const ymlContent = await fs_extra_1.default.readFile(ymlPath, "utf-8");
50
57
  const actionName = "oauth/register";
51
58
  const document = (0, yaml_1.parseDocument)(ymlContent);
52
59
  const provisionNode = document.get("provision");
53
60
  if (provisionNode) {
54
- const hasOAuthAction = ActionInjector.hasActionWithName(provisionNode, actionName, authName);
61
+ const hasOAuthAction = ActionInjector.hasActionWithName(provisionNode, actionName, authName, specRelativePath);
55
62
  if (!hasOAuthAction || forceToAddNew) {
56
63
  provisionNode.items = provisionNode.items.filter((item) => {
57
64
  const uses = item.get("uses");
@@ -59,7 +66,10 @@ class ActionInjector {
59
66
  return uses;
60
67
  }
61
68
  else {
62
- return uses !== actionName && uses !== "apiKey/register";
69
+ return (uses != actionName ||
70
+ !item.get("with") ||
71
+ item.get("with").get("apiSpecPath") !== specRelativePath ||
72
+ item.get("with").get("name") !== authName);
63
73
  }
64
74
  });
65
75
  const existingConfigurationIdEnvNames = provisionNode.items
@@ -71,13 +81,13 @@ class ActionInjector {
71
81
  .filter((item) => {
72
82
  return !!item;
73
83
  });
74
- const defaultEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_CONFIGURATION_ID`);
84
+ const defaultEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_${m365_spec_parser_1.ConstantString.RegistrationIdPostfix}`);
75
85
  const registrationIdEnvName = this.findNextAvailableEnvName(defaultEnvName, existingConfigurationIdEnvNames);
76
86
  const teamsAppIdEnvName = ActionInjector.getTeamsAppIdEnvName(provisionNode);
77
87
  if (teamsAppIdEnvName) {
78
88
  const index = provisionNode.items.findIndex((item) => item.get("uses") === "teamsApp/create");
79
89
  const flow = "authorizationCode";
80
- const action = ActionInjector.generateAuthAction(actionName, authName, teamsAppIdEnvName, specRelativePath, registrationIdEnvName, flow);
90
+ const action = ActionInjector.generateAuthAction(actionName, authName, teamsAppIdEnvName, specRelativePath, registrationIdEnvName, flow, isMicrosoftEntra);
81
91
  provisionNode.items.splice(index + 1, 0, action);
82
92
  }
83
93
  else {
@@ -102,7 +112,7 @@ class ActionInjector {
102
112
  const document = (0, yaml_1.parseDocument)(ymlContent);
103
113
  const provisionNode = document.get("provision");
104
114
  if (provisionNode) {
105
- const hasApiKeyAction = ActionInjector.hasActionWithName(provisionNode, actionName, authName);
115
+ const hasApiKeyAction = ActionInjector.hasActionWithName(provisionNode, actionName, authName, specRelativePath);
106
116
  if (!hasApiKeyAction || forceToAddNew) {
107
117
  provisionNode.items = provisionNode.items.filter((item) => {
108
118
  const uses = item.get("uses");
@@ -110,7 +120,10 @@ class ActionInjector {
110
120
  return uses;
111
121
  }
112
122
  else {
113
- return uses !== actionName && uses !== "oauth/register";
123
+ return (uses != actionName ||
124
+ !item.get("with") ||
125
+ item.get("with").get("apiSpecPath") !== specRelativePath ||
126
+ item.get("with").get("name") !== authName);
114
127
  }
115
128
  });
116
129
  const existingRegistrationIdEnvNames = provisionNode.items
@@ -123,7 +136,7 @@ class ActionInjector {
123
136
  return !!item;
124
137
  });
125
138
  const teamsAppIdEnvName = ActionInjector.getTeamsAppIdEnvName(provisionNode);
126
- const defaultEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_REGISTRATION_ID`);
139
+ const defaultEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_${m365_spec_parser_1.ConstantString.RegistrationIdPostfix}`);
127
140
  const registrationIdEnvName = this.findNextAvailableEnvName(defaultEnvName, existingRegistrationIdEnvNames);
128
141
  if (teamsAppIdEnvName) {
129
142
  const index = provisionNode.items.findIndex((item) => item.get("uses") === "teamsApp/create");
@@ -1 +1 @@
1
- {"version":3,"file":"actionInjector.js","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"actionInjector.js","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"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"}
@@ -16,4 +16,7 @@ export declare enum TelemetryProperty {
16
16
  UnresolvedPlaceholders = "unresolved",
17
17
  FailedAction = "failed-action"
18
18
  }
19
+ export declare const MicrosoftEntraAuthType = "MicrosoftEntra";
20
+ export declare const OAuthAuthType = "OAuthPluginVault";
21
+ export declare const APIKeyAuthType = "ApiKeyPluginVault";
19
22
  //# sourceMappingURL=constant.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/constant.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,oBAAY,eAAe;IACzB,SAAS,mBAAc;IACvB,MAAM,oBAAe;IACrB,WAAW,iBAAiB;IAC5B,OAAO,iBAAiB;CACzB;AAED,eAAO,MAAM,SAAS,kBAAkB,CAAC;AAEzC,eAAO,MAAM,uBAAuB,wBAAwB,CAAC;AAE7D,oBAAY,iBAAiB;IAC3B,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,oBAAoB,aAAa;IACjC,sBAAsB,eAAe;IACrC,YAAY,kBAAkB;CAC/B"}
1
+ {"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/constant.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,oBAAY,eAAe;IACzB,SAAS,mBAAc;IACvB,MAAM,oBAAe;IACrB,WAAW,iBAAiB;IAC5B,OAAO,iBAAiB;CACzB;AAED,eAAO,MAAM,SAAS,kBAAkB,CAAC;AAEzC,eAAO,MAAM,uBAAuB,wBAAwB,CAAC;AAE7D,oBAAY,iBAAiB;IAC3B,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,oBAAoB,aAAa;IACjC,sBAAsB,eAAe;IACrC,YAAY,kBAAkB;CAC/B;AAED,eAAO,MAAM,sBAAsB,mBAAmB,CAAC;AACvD,eAAO,MAAM,aAAa,qBAAqB,CAAC;AAChD,eAAO,MAAM,cAAc,sBAAsB,CAAC"}
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) Microsoft Corporation.
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.TelemetryProperty = exports.lifecycleExecutionEvent = exports.component = exports.SummaryConstant = void 0;
5
+ exports.APIKeyAuthType = exports.OAuthAuthType = exports.MicrosoftEntraAuthType = exports.TelemetryProperty = exports.lifecycleExecutionEvent = exports.component = exports.SummaryConstant = void 0;
6
6
  /**
7
7
  * @author yefuwang@microsoft.com
8
8
  */
@@ -23,4 +23,7 @@ var TelemetryProperty;
23
23
  TelemetryProperty["UnresolvedPlaceholders"] = "unresolved";
24
24
  TelemetryProperty["FailedAction"] = "failed-action";
25
25
  })(TelemetryProperty = exports.TelemetryProperty || (exports.TelemetryProperty = {}));
26
+ exports.MicrosoftEntraAuthType = "MicrosoftEntra";
27
+ exports.OAuthAuthType = "OAuthPluginVault";
28
+ exports.APIKeyAuthType = "ApiKeyPluginVault";
26
29
  //# sourceMappingURL=constant.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/component/configManager/constant.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AAEH,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,+CAAuB,CAAA;IACvB,6CAAqB,CAAA;IACrB,+CAA4B,CAAA;IAC5B,2CAAwB,CAAA;AAC1B,CAAC,EALW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAK1B;AAEY,QAAA,SAAS,GAAG,eAAe,CAAC;AAE5B,QAAA,uBAAuB,GAAG,qBAAqB,CAAC;AAE7D,IAAY,iBAMX;AAND,WAAY,iBAAiB;IAC3B,4CAAuB,CAAA;IACvB,wCAAmB,CAAA;IACnB,sDAAiC,CAAA;IACjC,0DAAqC,CAAA;IACrC,mDAA8B,CAAA;AAChC,CAAC,EANW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAM5B"}
1
+ {"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/component/configManager/constant.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AAEH,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,+CAAuB,CAAA;IACvB,6CAAqB,CAAA;IACrB,+CAA4B,CAAA;IAC5B,2CAAwB,CAAA;AAC1B,CAAC,EALW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAK1B;AAEY,QAAA,SAAS,GAAG,eAAe,CAAC;AAE5B,QAAA,uBAAuB,GAAG,qBAAqB,CAAC;AAE7D,IAAY,iBAMX;AAND,WAAY,iBAAiB;IAC3B,4CAAuB,CAAA;IACvB,wCAAmB,CAAA;IACnB,sDAAiC,CAAA;IACjC,0DAAqC,CAAA;IACrC,mDAA8B,CAAA;AAChC,CAAC,EANW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAM5B;AAEY,QAAA,sBAAsB,GAAG,gBAAgB,CAAC;AAC1C,QAAA,aAAa,GAAG,kBAAkB,CAAC;AACnC,QAAA,cAAc,GAAG,mBAAmB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/lifecycle.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAW,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI/E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,UAAU,EACV,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,eAAe,EAChB,MAAM,aAAa,CAAC;AA6DrB,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,oBAAoB,EAC9B,UAAU,EAAE,sBAAsB,GACjC,MAAM,CAyBR;AAED,qBAAa,SAAU,YAAW,UAAU;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,gBAAgB,EAAE,CAAC;gBACnB,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM;IAMhF,mBAAmB,IAAI,sBAAsB;IAK7C,OAAO,CAAC,MAAM,CAAC,eAAe;IAcxB,OAAO,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAyErD,WAAW,CACf,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,oBAAoB,EAC9B,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,eAAe,CAAC;IAwF3B,OAAO,CAAC,kBAAkB;IAOnB,sBAAsB,CAAC,GAAG,EAAE,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC;CAanF"}
1
+ {"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/lifecycle.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAW,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI/E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,UAAU,EACV,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,eAAe,EAChB,MAAM,aAAa,CAAC;AA8DrB,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,oBAAoB,EAC9B,UAAU,EAAE,sBAAsB,GACjC,MAAM,CAmCR;AAED,qBAAa,SAAU,YAAW,UAAU;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,gBAAgB,EAAE,CAAC;gBACnB,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM;IAMhF,mBAAmB,IAAI,sBAAsB;IAK7C,OAAO,CAAC,MAAM,CAAC,eAAe;IAcxB,OAAO,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAyErD,WAAW,CACf,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,oBAAoB,EAC9B,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,eAAe,CAAC;IAwF3B,OAAO,CAAC,kBAAkB;IAOnB,sBAAsB,CAAC,GAAG,EAAE,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC;CAanF"}
@@ -15,6 +15,7 @@ const teamsFxTelemetryReporter_1 = require("../utils/teamsFxTelemetryReporter");
15
15
  const constant_1 = require("./constant");
16
16
  const error_1 = require("../../error");
17
17
  const globalVars_1 = require("../../common/globalVars");
18
+ const constants_1 = require("../constants");
18
19
  function resolveDriverDef(def, resolved, unresolved) {
19
20
  const args = def.with;
20
21
  for (const k in args) {
@@ -79,6 +80,15 @@ function resolveString(val, resolved, unresolved) {
79
80
  newVal = newVal.replace(matches[0], envVal);
80
81
  }
81
82
  }
83
+ else if (envVar === constants_1.OpenAIEnvironmentVariables.SECRET_AZURE_OPENAI_API_KEY ||
84
+ envVar === constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_ENDPOINT ||
85
+ envVar === constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_DEPLOYMENT_NAME ||
86
+ envVar === constants_1.OpenAIEnvironmentVariables.SECRET_OPENAI_API_KEY) {
87
+ if (envVal) {
88
+ resolved.push(envVar);
89
+ newVal = newVal.replace(matches[0], envVal);
90
+ }
91
+ }
82
92
  else {
83
93
  if (!envVal) {
84
94
  unresolved.push(envVar);