@microsoft/teamsfx-core 3.1.3 → 3.1.4-alpha.564122f4e1.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 (133) hide show
  1. package/build/common/templates-config.json +4 -4
  2. package/build/component/configManager/actionInjector.d.ts +4 -2
  3. package/build/component/configManager/actionInjector.d.ts.map +1 -1
  4. package/build/component/configManager/actionInjector.js +50 -3
  5. package/build/component/configManager/actionInjector.js.map +1 -1
  6. package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
  7. package/build/component/driver/teamsApp/utils/utils.js +1 -18
  8. package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
  9. package/build/component/generator/openApiSpec/helper.d.ts +1 -1
  10. package/build/component/generator/openApiSpec/helper.d.ts.map +1 -1
  11. package/build/component/generator/openApiSpec/helper.js +23 -3
  12. package/build/component/generator/openApiSpec/helper.js.map +1 -1
  13. package/build/component/generator/openPlugin/authResolver.d.ts +2 -2
  14. package/build/component/generator/openPlugin/authResolver.d.ts.map +1 -1
  15. package/build/component/generator/openPlugin/authResolver.js +17 -7
  16. package/build/component/generator/openPlugin/authResolver.js.map +1 -1
  17. package/build/component/generator/openPlugin/errors.d.ts +4 -0
  18. package/build/component/generator/openPlugin/errors.d.ts.map +1 -0
  19. package/build/component/generator/openPlugin/errors.js +13 -0
  20. package/build/component/generator/openPlugin/errors.js.map +1 -0
  21. package/build/component/generator/openPlugin/exporter.d.ts +9 -6
  22. package/build/component/generator/openPlugin/exporter.d.ts.map +1 -1
  23. package/build/component/generator/openPlugin/exporter.js +502 -53
  24. package/build/component/generator/openPlugin/exporter.js.map +1 -1
  25. package/build/component/generator/openPlugin/fileSystem.d.ts +28 -0
  26. package/build/component/generator/openPlugin/fileSystem.d.ts.map +1 -0
  27. package/build/component/generator/openPlugin/fileSystem.js +181 -0
  28. package/build/component/generator/openPlugin/fileSystem.js.map +1 -0
  29. package/build/component/generator/openPlugin/iconStrategy.d.ts.map +1 -1
  30. package/build/component/generator/openPlugin/iconStrategy.js +30 -14
  31. package/build/component/generator/openPlugin/iconStrategy.js.map +1 -1
  32. package/build/component/generator/openPlugin/importer.d.ts.map +1 -1
  33. package/build/component/generator/openPlugin/importer.js +75 -12
  34. package/build/component/generator/openPlugin/importer.js.map +1 -1
  35. package/build/component/generator/openPlugin/mapper.d.ts +3 -2
  36. package/build/component/generator/openPlugin/mapper.d.ts.map +1 -1
  37. package/build/component/generator/openPlugin/mapper.js +188 -29
  38. package/build/component/generator/openPlugin/mapper.js.map +1 -1
  39. package/build/component/generator/openPlugin/parser.d.ts.map +1 -1
  40. package/build/component/generator/openPlugin/parser.js +264 -70
  41. package/build/component/generator/openPlugin/parser.js.map +1 -1
  42. package/build/component/generator/openPlugin/skillValidation.d.ts +2 -0
  43. package/build/component/generator/openPlugin/skillValidation.d.ts.map +1 -0
  44. package/build/component/generator/openPlugin/skillValidation.js +63 -0
  45. package/build/component/generator/openPlugin/skillValidation.js.map +1 -0
  46. package/build/component/generator/openPlugin/spec.d.ts +67 -0
  47. package/build/component/generator/openPlugin/spec.d.ts.map +1 -0
  48. package/build/component/generator/openPlugin/spec.js +157 -0
  49. package/build/component/generator/openPlugin/spec.js.map +1 -0
  50. package/build/component/generator/openPlugin/textUtils.d.ts +1 -1
  51. package/build/component/generator/openPlugin/textUtils.d.ts.map +1 -1
  52. package/build/component/generator/openPlugin/textUtils.js +8 -7
  53. package/build/component/generator/openPlugin/textUtils.js.map +1 -1
  54. package/build/component/generator/openPlugin/types.d.ts +76 -14
  55. package/build/component/generator/openPlugin/types.d.ts.map +1 -1
  56. package/build/component/generator/openPlugin/validation.d.ts +17 -0
  57. package/build/component/generator/openPlugin/validation.d.ts.map +1 -0
  58. package/build/component/generator/openPlugin/validation.js +563 -0
  59. package/build/component/generator/openPlugin/validation.js.map +1 -0
  60. package/build/component/utils/common.d.ts +1 -9
  61. package/build/component/utils/common.d.ts.map +1 -1
  62. package/build/component/utils/common.js +7 -37
  63. package/build/component/utils/common.js.map +1 -1
  64. package/build/component/utils/envFunctionUtils.d.ts +3 -8
  65. package/build/component/utils/envFunctionUtils.d.ts.map +1 -1
  66. package/build/component/utils/envFunctionUtils.js +46 -131
  67. package/build/component/utils/envFunctionUtils.js.map +1 -1
  68. package/build/component/utils/mcpAuthScaffolder.d.ts +5 -0
  69. package/build/component/utils/mcpAuthScaffolder.d.ts.map +1 -1
  70. package/build/component/utils/mcpAuthScaffolder.js +14 -2
  71. package/build/component/utils/mcpAuthScaffolder.js.map +1 -1
  72. package/build/core/FxCore.d.ts +1 -1
  73. package/build/core/FxCore.d.ts.map +1 -1
  74. package/build/core/FxCore.declarativeAgent.d.ts +2 -1
  75. package/build/core/FxCore.declarativeAgent.d.ts.map +1 -1
  76. package/build/core/FxCore.declarativeAgent.js +17 -6
  77. package/build/core/FxCore.declarativeAgent.js.map +1 -1
  78. package/build/core/FxCore.js +3 -3
  79. package/build/core/FxCore.js.map +1 -1
  80. package/build/core/FxCore.openPlugin.d.ts +7 -6
  81. package/build/core/FxCore.openPlugin.d.ts.map +1 -1
  82. package/build/core/FxCore.openPlugin.js +7 -6
  83. package/build/core/FxCore.openPlugin.js.map +1 -1
  84. package/build/question/inputs/AddAuthActionInputs.d.ts +2 -0
  85. package/build/question/inputs/AddAuthActionInputs.d.ts.map +1 -1
  86. package/build/question/inputs/AddPluginInputs.d.ts +5 -1
  87. package/build/question/inputs/AddPluginInputs.d.ts.map +1 -1
  88. package/build/question/options/AddAuthActionOptions.d.ts.map +1 -1
  89. package/build/question/options/AddAuthActionOptions.js +7 -0
  90. package/build/question/options/AddAuthActionOptions.js.map +1 -1
  91. package/build/question/options/AddPluginOptions.d.ts.map +1 -1
  92. package/build/question/options/AddPluginOptions.js +14 -1
  93. package/build/question/options/AddPluginOptions.js.map +1 -1
  94. package/build/question/options/ExportOpenPluginOptions.js +2 -2
  95. package/build/question/options/ExportOpenPluginOptions.js.map +1 -1
  96. package/build/question/options/ImportOpenPluginOptions.js +4 -4
  97. package/build/question/options/ImportOpenPluginOptions.js.map +1 -1
  98. package/build/question/other.d.ts +1 -0
  99. package/build/question/other.d.ts.map +1 -1
  100. package/build/question/other.js +49 -9
  101. package/build/question/other.js.map +1 -1
  102. package/build/question/questionNames.d.ts +1 -0
  103. package/build/question/questionNames.d.ts.map +1 -1
  104. package/build/question/questionNames.js +1 -0
  105. package/build/question/questionNames.js.map +1 -1
  106. package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts +2 -0
  107. package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map +1 -1
  108. package/build/question/scaffold/vsc/teamsProjectTypeNode.js +24 -1
  109. package/build/question/scaffold/vsc/teamsProjectTypeNode.js.map +1 -1
  110. package/build/v4/mcp/mcpAuthAction.d.ts +2 -1
  111. package/build/v4/mcp/mcpAuthAction.d.ts.map +1 -1
  112. package/build/v4/mcp/mcpAuthAction.js +32 -5
  113. package/build/v4/mcp/mcpAuthAction.js.map +1 -1
  114. package/build/v4/mcp/mcpAuthScaffold.d.ts +3 -0
  115. package/build/v4/mcp/mcpAuthScaffold.d.ts.map +1 -1
  116. package/build/v4/mcp/mcpAuthScaffold.js +57 -30
  117. package/build/v4/mcp/mcpAuthScaffold.js.map +1 -1
  118. package/build/v4/runtime/steps/mcpAuth.d.ts.map +1 -1
  119. package/build/v4/runtime/steps/mcpAuth.js +13 -0
  120. package/build/v4/runtime/steps/mcpAuth.js.map +1 -1
  121. package/package.json +37 -37
  122. package/resource/package.nls.json +20 -0
  123. package/templates/configs/local/typescript/.gitignore +1 -0
  124. package/templates/configs/playground/typescript/.gitignore +4 -0
  125. package/templates/fallback/common.zip +0 -0
  126. package/templates/fallback/csharp.zip +0 -0
  127. package/templates/fallback/js.zip +0 -0
  128. package/templates/fallback/python.zip +0 -0
  129. package/templates/fallback/ts.zip +0 -0
  130. package/templates/metadata.zip +0 -0
  131. package/templates/v4/floor.json +1 -1
  132. package/templates/v4/templates-metadata.zip +0 -0
  133. package/templates/v4/templates.zip +0 -0
@@ -2,6 +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.getEnvironmentVariables = exports.expandEnvironmentVariable = void 0;
5
6
  exports.checkMissingArgs = checkMissingArgs;
6
7
  exports.asOptional = asOptional;
7
8
  exports.asBoolean = asBoolean;
@@ -10,8 +11,6 @@ exports.asFactory = asFactory;
10
11
  exports.wrapRun = wrapRun;
11
12
  exports.errorHandle = errorHandle;
12
13
  exports.wrapSummary = wrapSummary;
13
- exports.expandEnvironmentVariable = expandEnvironmentVariable;
14
- exports.getEnvironmentVariables = getEnvironmentVariables;
15
14
  exports.getAbsolutePath = getAbsolutePath;
16
15
  exports.outputScaffoldingWarningMessage = outputScaffoldingWarningMessage;
17
16
  const tslib_1 = require("tslib");
@@ -21,7 +20,6 @@ const path_1 = tslib_1.__importDefault(require("path"));
21
20
  const localizeUtils_1 = require("../../common/localizeUtils");
22
21
  const constant_1 = require("../configManager/constant");
23
22
  const os_1 = require("os");
24
- const placeholderRegex = /\${{ *[a-zA-Z_][a-zA-Z0-9_]* *}}/g;
25
23
  /**
26
24
  * check parameter, throw error if value is null or undefined
27
25
  * @param name parameter name
@@ -103,40 +101,12 @@ async function wrapSummary(exec, summary) {
103
101
  return { result, summaries };
104
102
  }
105
103
  }
106
- // Expand environment variables in content. The format of referencing environment variable is: ${{ENV_NAME}}
107
- function expandEnvironmentVariable(content, envs) {
108
- const placeholders = content.match(placeholderRegex);
109
- if (placeholders) {
110
- for (const placeholder of placeholders) {
111
- const envName = placeholder.slice(3, -2).trim(); // removes `${{` and `}}`
112
- const envValue = envs ? envs[envName] : process.env[envName];
113
- if (envName === "APP_NAME_SUFFIX") {
114
- if (envValue !== undefined && envValue !== null) {
115
- content = content.replace(placeholder, envValue);
116
- }
117
- }
118
- else {
119
- if (envValue) {
120
- content = content.replace(placeholder, envValue);
121
- }
122
- }
123
- }
124
- }
125
- return content;
126
- }
127
- /**
128
- * Expand environment variables in content. The format of referencing environment variable is: ${{ENV_NAME}}
129
- * @return An array of environment variables
130
- */
131
- function getEnvironmentVariables(content) {
132
- const placeholders = content.match(placeholderRegex);
133
- if (placeholders) {
134
- const variables = placeholders.map((placeholder) => placeholder.slice(3, -2).trim()); // removes `${{` and `}}`)
135
- // remove duplicates
136
- return [...new Set(variables)];
137
- }
138
- return [];
139
- }
104
+ // Manifest env-variable (`${{ENV_NAME}}`) expansion lives in @microsoft/app-manifest
105
+ // (re-exported via @microsoft/teamsfx-api) so hosts can resolve manifests without
106
+ // fx-core. Re-exported here to keep the existing import path for fx-core call sites.
107
+ var teamsfx_api_2 = require("@microsoft/teamsfx-api");
108
+ Object.defineProperty(exports, "expandEnvironmentVariable", { enumerable: true, get: function () { return teamsfx_api_2.expandEnvironmentVariable; } });
109
+ Object.defineProperty(exports, "getEnvironmentVariables", { enumerable: true, get: function () { return teamsfx_api_2.getEnvironmentVariables; } });
140
110
  function getAbsolutePath(relativeOrAbsolutePath, projectPath) {
141
111
  relativeOrAbsolutePath = relativeOrAbsolutePath || "";
142
112
  projectPath = projectPath || "";
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AA0BlC,4CAKC;AAED,gCAOC;AAED,8BAOC;AAED,4BAKC;AAMD,8BAiBC;AAED,0BAWC;AAED,kCAmBC;AAED,kCAYC;AAGD,8DAsBC;AAMD,0DAQC;AAED,0CAMC;AAED,0EAQC;;AAtLD,4DAAqF;AACrF,wDASgC;AAChC,wDAAwB;AAExB,8DAAgE;AAChE,wDAA4D;AAC5D,2BAAyB;AAEzB,MAAM,gBAAgB,GAAG,mCAAmC,CAAC;AAE7D;;;;GAIG;AACH,SAAgB,gBAAgB,CAAI,IAAY,EAAE,KAA2B;IAC3E,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,UAAU,CAAI,EAAqD;IACjF,OAAO,UAAU,CAAU,EAAE,GAAW,EAAE,QAAiB;QACzD,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAClC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,SAAS,CAAC,CAAU,EAAE,GAAW,EAAE,QAAiB;IAClE,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,CAAC,CAAC;IACX,CAAC;SAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,CAAC,KAAK,MAAM,CAAC;IACtB,CAAC;IACD,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AACpE,CAAC;AAED,SAAgB,QAAQ,CAAC,CAAU,EAAE,GAAW,EAAE,QAAiB;IACjE,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AACpE,CAAC;AAMD,SAAgB,SAAS,CAAI,aAA+B;IAC1D,OAAO,UAAU,IAAa,EAAE,QAAiB;QAC/C,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,IAAoB,CAAC;YACpC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAmB,EAAE,CAAC;gBAC/D,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC9D,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,kCAAiB,CAAC,gBAAgB,CACtC,QAAQ,EACR,MAAM,EACN,yBAAyB,EACzB,SAAS,EACT,QAAQ,CACT,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,OAAO,CAC3B,IAAwC,EACxC,WAAmB,EACnB,YAAkC,EAClC,WAAyB;IAEzB,IAAI,CAAC;QACH,OAAO,IAAA,gBAAE,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,MAAM,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,WAAW,CAC/B,KAAc,EACd,WAAmB,EACnB,WAAyB,EACzB,YAAkC;IAElC,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,YAAY,EAAE,CAAC;IACvB,CAAC;IACD,IAAI,KAAK,YAAY,wCAAuB,EAAE,CAAC;QAC7C,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,WAAW,EAAE,KAAK,CAAC,mBAAmB,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,IAAA,iBAAG,EAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IAChC,CAAC;SAAM,IAAI,KAAK,YAAY,uBAAS,IAAI,KAAK,YAAY,yBAAW,EAAE,CAAC;QACtE,OAAO,IAAA,iBAAG,EAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IACD,qCAAqC;IACrC,OAAO,IAAA,iBAAG,EAAC,wCAAuB,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;AACnF,CAAC;AAEM,KAAK,UAAU,WAAW,CAC/B,IAAyD,EACzD,OAAiB;IAEjB,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;IAC5B,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QAClB,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kCAAkB,EAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;AACH,CAAC;AAED,4GAA4G;AAC5G,SAAgB,yBAAyB,CACvC,OAAe,EACf,IAAkC;IAElC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACrD,IAAI,YAAY,EAAE,CAAC;QACjB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,yBAAyB;YAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC7D,IAAI,OAAO,KAAK,iBAAiB,EAAE,CAAC;gBAClC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;oBAChD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;GAGG;AACH,SAAgB,uBAAuB,CAAC,OAAe;IACrD,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACrD,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,0BAA0B;QAChH,oBAAoB;QACpB,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,eAAe,CAAC,sBAA8B,EAAE,WAAmB;IACjF,sBAAsB,GAAG,sBAAsB,IAAI,EAAE,CAAC;IACtD,WAAW,GAAG,WAAW,IAAI,EAAE,CAAC;IAChC,OAAO,cAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC;QAC5C,CAAC,CAAC,sBAAsB;QACxB,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;AACrD,CAAC;AAED,SAAgB,+BAA+B,CAAC,QAAmB;IACjE,MAAM,sBAAsB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACnD,OAAO,GAAG,0BAAe,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,OAAO,sBAAsB,CAAC,MAAM,GAAG,CAAC;QACtC,CAAC,CAAC,IAAA,kCAAkB,EAAC,+BAA+B,EAAE,sBAAsB,CAAC,IAAI,CAAC,QAAG,CAAC,CAAC;QACvF,CAAC,CAAC,EAAE,CAAC;AACT,CAAC"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,8 @@
1
- import { FxError, Result } from "@microsoft/teamsfx-api";
1
+ import { FxError, Result, ManifestType } from "@microsoft/teamsfx-api";
2
2
  import { DriverContext } from "../driver/interface/commonArgs";
3
- export declare enum ManifestType {
4
- TeamsManifest = "teams-manifest",
5
- PluginManifest = "plugin-manifest",
6
- DeclarativeCopilotManifest = "declarative-copilot-manifest",
7
- ApiSpec = "api-spec",
8
- EmbeddedKnowledgeFile = "embedded-knowledge-file"
9
- }
3
+ export { ManifestType };
10
4
  export declare function expandVariableWithFunction(content: string, ctx: DriverContext, envs: {
11
5
  [key in string]: string;
12
6
  } | undefined, isJson: boolean, manifestType: ManifestType, fromPath: string): Promise<Result<string, FxError>>;
7
+ export declare function resolveManifestWithContext(content: string, ctx: DriverContext, manifestType: ManifestType, fromPath: string): Promise<Result<string, FxError>>;
13
8
  //# sourceMappingURL=envFunctionUtils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"envFunctionUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAGP,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAOhC,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAW/D,oBAAY,YAAY;IACtB,aAAa,mBAAmB;IAChC,cAAc,oBAAoB;IAClC,0BAA0B,iCAAiC;IAC3D,OAAO,aAAa;IACpB,qBAAqB,4BAA4B;CAClD;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE;KAAG,GAAG,IAAI,MAAM,GAAG,MAAM;CAAE,GAAG,SAAS,EAC7C,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAmClC"}
1
+ {"version":3,"file":"envFunctionUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAGP,MAAM,EAGN,YAAY,EAWb,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAY/D,OAAO,EAAE,YAAY,EAAE,CAAC;AA+ExB,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE;KAAG,GAAG,IAAI,MAAM,GAAG,MAAM;CAAE,GAAG,SAAS,EAC7C,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC;AAID,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC"}
@@ -2,15 +2,12 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ManifestType = void 0;
4
4
  exports.expandVariableWithFunction = expandVariableWithFunction;
5
- const tslib_1 = require("tslib");
5
+ exports.resolveManifestWithContext = resolveManifestWithContext;
6
6
  // Copyright (c) Microsoft Corporation.
7
7
  // Licensed under the MIT license.
8
8
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
9
- const path_1 = tslib_1.__importDefault(require("path"));
10
- const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
11
- const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
9
+ Object.defineProperty(exports, "ManifestType", { enumerable: true, get: function () { return teamsfx_api_1.ManifestType; } });
12
10
  const error_1 = require("../../error");
13
- const common_1 = require("./common");
14
11
  const localizeUtils_1 = require("../../common/localizeUtils");
15
12
  const source = "ResolveManifestFunction";
16
13
  const telemetryEvent = "manifest-with-function";
@@ -20,146 +17,64 @@ var TelemetryPropertyKey;
20
17
  TelemetryPropertyKey["manifestType"] = "manifest-type";
21
18
  TelemetryPropertyKey["functionCount"] = "function-count";
22
19
  })(TelemetryPropertyKey || (TelemetryPropertyKey = {}));
23
- var ManifestType;
24
- (function (ManifestType) {
25
- ManifestType["TeamsManifest"] = "teams-manifest";
26
- ManifestType["PluginManifest"] = "plugin-manifest";
27
- ManifestType["DeclarativeCopilotManifest"] = "declarative-copilot-manifest";
28
- ManifestType["ApiSpec"] = "api-spec";
29
- ManifestType["EmbeddedKnowledgeFile"] = "embedded-knowledge-file";
30
- })(ManifestType || (exports.ManifestType = ManifestType = {}));
31
- async function expandVariableWithFunction(content, ctx, envs, isJson, manifestType, fromPath) {
32
- const regex = /\$\[ *[a-zA-Z][a-zA-Z]*\([^\]]*\) *\]/g;
33
- const matches = content.match(regex);
34
- if (!matches) {
35
- return (0, teamsfx_api_1.ok)(content); // no function
36
- }
37
- let count = 0;
38
- for (const placeholder of matches) {
39
- const processedRes = await processFunction(placeholder.slice(2, -1).trim(), ctx, envs, fromPath);
40
- if (processedRes.isErr()) {
41
- return (0, teamsfx_api_1.err)(processedRes.error);
42
- }
43
- let value = processedRes.value;
44
- if (isJson && value) {
45
- value = JSON.stringify(value).slice(1, -1);
46
- }
47
- if (value) {
48
- count += 1;
49
- content = content.replace(placeholder, value);
50
- }
20
+ // Map a plain error thrown by @microsoft/app-manifest's resolver to the localized
21
+ // FxError surface fx-core drivers expect, emitting the same diagnostic logs as before.
22
+ function toFxError(e, ctx) {
23
+ if (e instanceof teamsfx_api_1.UnsupportedFileFormatError) {
24
+ ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFile.errorLog", e.filePath, "txt"));
25
+ return new UnsupportedFileFormatError(ctx.platform);
51
26
  }
52
- if (count > 0) {
53
- ctx.telemetryReporter?.sendTelemetryEvent(telemetryEvent, {
54
- [TelemetryPropertyKey.manifestType]: manifestType.toString(),
55
- [TelemetryPropertyKey.functionCount]: count.toString(),
56
- });
27
+ if (e instanceof teamsfx_api_1.InvalidFunctionError) {
28
+ ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFunction.errorLog", e.token, "file"));
29
+ return new InvalidFunctionError(ctx.platform);
57
30
  }
58
- return (0, teamsfx_api_1.ok)(content);
59
- }
60
- async function processFunction(content, ctx, envs, path) {
61
- const firstTrimmedContent = content.trim();
62
- if (!firstTrimmedContent.startsWith("file(") || !firstTrimmedContent.endsWith(")")) {
63
- ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFunction.errorLog", firstTrimmedContent, "file"));
64
- return (0, teamsfx_api_1.err)(new InvalidFunctionError(ctx.platform));
31
+ if (e instanceof teamsfx_api_1.InvalidFunctionParameterError) {
32
+ ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.invalidFunctionParameter.errorLog", e.token, "file"));
33
+ return new InvalidFunctionParameter(ctx.platform);
65
34
  }
66
- // file()
67
- const trimmedParameter = content.slice(5, -1).trim();
68
- if (trimmedParameter[0] === "'" && trimmedParameter[trimmedParameter.length - 1] === "'") {
69
- // static string as function parameter
70
- const res = await readFileContent(trimmedParameter.substring(1, trimmedParameter.length - 1), ctx, envs, path);
71
- return res;
35
+ if (e instanceof teamsfx_api_1.ReadFileError) {
36
+ ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorLog", e.filePath, e.cause?.toString()));
37
+ return new ReadFileError(ctx.platform, e.filePath);
72
38
  }
73
- else if (trimmedParameter.startsWith("${{") && trimmedParameter.endsWith("}}")) {
74
- // env variable inside
75
- const resolvedParameter = (0, common_1.expandEnvironmentVariable)(trimmedParameter, envs);
76
- const res = readFileContent(resolvedParameter, ctx, envs, path);
77
- return res;
39
+ if (e instanceof teamsfx_api_1.FileNotFoundError) {
40
+ return new error_1.FileNotFoundError(source, e.filePath);
78
41
  }
79
- else if (trimmedParameter.startsWith("file(") && trimmedParameter.endsWith(")")) {
80
- // nested function inside
81
- const processsedRes = await processFunction(trimmedParameter, ctx, envs, path);
82
- if (processsedRes.isErr()) {
83
- return (0, teamsfx_api_1.err)(processsedRes.error);
84
- }
85
- const readFileRes = await readFileContent(processsedRes.value, ctx, envs, path);
86
- return readFileRes;
42
+ if (e instanceof teamsfx_api_1.FileReferenceOutsideManifestDirectoryError) {
43
+ ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.fileReferenceOutsideManifestDirectory.errorLog.local", e.fileReference, e.resolvedPath, e.manifestDirectory, "$[file()]"));
44
+ return new FileReferenceOutsideManifestDirectoryError(e.fileReference, e.resolvedPath, e.manifestDirectory);
87
45
  }
88
- else {
89
- // invalid content inside function
90
- ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.invalidFunctionParameter.errorLog", trimmedParameter, "file"));
91
- return (0, teamsfx_api_1.err)(new InvalidFunctionParameter(ctx.platform));
46
+ if (e instanceof teamsfx_api_1.MissingEnvironmentVariablesError) {
47
+ return new error_1.MissingEnvironmentVariablesError("manifest", e.names, e.fromPath);
92
48
  }
49
+ // Anything else is unexpected; wrap it so the Result<T, FxError> contract holds.
50
+ return (0, error_1.assembleError)(e, source);
93
51
  }
94
- async function readFileContent(filePath, ctx, envs, fromPath) {
95
- const manifestDirectory = path_1.default.resolve(path_1.default.dirname(fromPath));
96
- const absolutePath = path_1.default.resolve(manifestDirectory, filePath);
97
- const safeFileReference = path_1.default.isAbsolute(filePath) ? path_1.default.basename(filePath) : filePath;
98
- if (!isPathContained(manifestDirectory, absolutePath)) {
99
- return fileReferenceOutsideManifestDirectory(ctx, filePath, absolutePath, manifestDirectory);
100
- }
101
- if (!isSupportedFileFormat(filePath)) {
102
- ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFile.errorLog", safeFileReference, "txt"));
103
- return (0, teamsfx_api_1.err)(new UnsupportedFileFormatError(ctx.platform));
104
- }
105
- let realManifestDirectory;
106
- let realFilePath;
52
+ // Run a resolver that yields { content, functionCount }, mapping thrown
53
+ // ManifestTemplateErrors to localized FxError and emitting function-count telemetry.
54
+ async function runManifestResolver(resolve, ctx, manifestType) {
55
+ let resolved;
107
56
  try {
108
- realManifestDirectory = await fs_extra_1.default.realpath(manifestDirectory);
109
- realFilePath = await fs_extra_1.default.realpath(absolutePath);
110
- }
111
- catch (error) {
112
- if (isFileNotFoundError(error)) {
113
- return (0, teamsfx_api_1.err)(new error_1.FileNotFoundError(source, safeFileReference));
114
- }
115
- ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorLog", safeFileReference, getFileSystemErrorCode(error)));
116
- return (0, teamsfx_api_1.err)(new ReadFileError(ctx.platform, safeFileReference));
117
- }
118
- if (!isPathContained(realManifestDirectory, realFilePath)) {
119
- return fileReferenceOutsideManifestDirectory(ctx, filePath, realFilePath, manifestDirectory);
57
+ resolved = await resolve();
120
58
  }
121
- if (!isSupportedFileFormat(realFilePath)) {
122
- ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFile.errorLog", safeFileReference, "txt"));
123
- return (0, teamsfx_api_1.err)(new UnsupportedFileFormatError(ctx.platform));
59
+ catch (e) {
60
+ return (0, teamsfx_api_1.err)(toFxError(e, ctx));
124
61
  }
125
- try {
126
- let fileContent = await fs_extra_1.default.readFile(realFilePath, "utf8");
127
- fileContent = (0, strip_bom_1.default)(fileContent);
128
- let processedFileContent = (0, common_1.expandEnvironmentVariable)(fileContent, envs);
129
- processedFileContent = processedFileContent.replace(/\r\n/g, "\n");
130
- return (0, teamsfx_api_1.ok)(processedFileContent);
131
- }
132
- catch (error) {
133
- ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorLog", safeFileReference, getFileSystemErrorCode(error)));
134
- return (0, teamsfx_api_1.err)(new ReadFileError(ctx.platform, safeFileReference));
62
+ if (resolved.functionCount > 0) {
63
+ ctx.telemetryReporter?.sendTelemetryEvent(telemetryEvent, {
64
+ [TelemetryPropertyKey.manifestType]: manifestType.toString(),
65
+ [TelemetryPropertyKey.functionCount]: resolved.functionCount.toString(),
66
+ });
135
67
  }
68
+ return (0, teamsfx_api_1.ok)(resolved.content);
136
69
  }
137
- function isPathContained(directory, filePath) {
138
- const relativePath = path_1.default.relative(directory, filePath);
139
- return (relativePath === "" ||
140
- (relativePath !== ".." &&
141
- !relativePath.startsWith(`..${path_1.default.sep}`) &&
142
- !path_1.default.isAbsolute(relativePath)));
143
- }
144
- function isSupportedFileFormat(filePath) {
145
- const extension = path_1.default.extname(filePath).toLowerCase();
146
- return extension === ".txt" || extension === ".md";
147
- }
148
- function isFileNotFoundError(error) {
149
- return getFileSystemErrorCode(error) === "ENOENT";
150
- }
151
- function getFileSystemErrorCode(error) {
152
- return typeof error === "object" &&
153
- error !== null &&
154
- "code" in error &&
155
- typeof error.code === "string"
156
- ? error.code
157
- : "UNKNOWN";
70
+ // Expand only `$[file()]` macros, leaving `${{ENV}}` substitution to the caller.
71
+ async function expandVariableWithFunction(content, ctx, envs, isJson, manifestType, fromPath) {
72
+ return runManifestResolver(() => (0, teamsfx_api_1.expandFileFunctionMacros)(content, isJson, { envs, fromPath }), ctx, manifestType);
158
73
  }
159
- function fileReferenceOutsideManifestDirectory(ctx, fileReference, resolvedPath, manifestDirectory) {
160
- const errorLog = (0, localizeUtils_1.getLocalizedString)("core.envFunc.fileReferenceOutsideManifestDirectory.errorLog.local", fileReference, resolvedPath, manifestDirectory, "$[file()]");
161
- ctx.logProvider.error(errorLog);
162
- return (0, teamsfx_api_1.err)(new FileReferenceOutsideManifestDirectoryError(fileReference, resolvedPath, manifestDirectory));
74
+ // Fully resolve a manifest via @microsoft/app-manifest's resolveManifest (shared
75
+ // file()+env logic), adding the fx-core concerns it is agnostic to.
76
+ async function resolveManifestWithContext(content, ctx, manifestType, fromPath) {
77
+ return runManifestResolver(() => (0, teamsfx_api_1.resolveManifest)(content, { manifestType, fromPath }), ctx, manifestType);
163
78
  }
164
79
  class UnsupportedFileFormatError extends teamsfx_api_1.UserError {
165
80
  constructor(platform) {
@@ -1 +1 @@
1
- {"version":3,"file":"envFunctionUtils.js","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"envFunctionUtils.js","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"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"}
@@ -31,6 +31,9 @@ export interface ResolvedMCPAuthEndpoints {
31
31
  export declare function deriveMCPManifestOAuth(authType: string | undefined, registrationId: string | undefined): {
32
32
  type: "OAuthPluginVault";
33
33
  reference_id: string;
34
+ } | {
35
+ type: "ApiKeyPluginVault";
36
+ reference_id: string;
34
37
  } | undefined;
35
38
  /**
36
39
  * Resolve OAuth endpoints based on the user's `mcp-da-auth-type` choice.
@@ -110,6 +113,7 @@ export declare function injectMCPAuthActionToYml(args: {
110
113
  persistCredentialEnvRefs?: boolean;
111
114
  serverName?: string;
112
115
  scopes?: string;
116
+ apiKey?: string;
113
117
  }): Promise<InjectMCPAuthActionResult>;
114
118
  /**
115
119
  * Persist user-provided MCP OAuth credentials into env files so the
@@ -133,5 +137,6 @@ export declare function persistMCPAuthCredentialEnvVars(args: {
133
137
  clientId?: string;
134
138
  clientSecret?: string;
135
139
  scopes?: string;
140
+ apiKey?: string;
136
141
  }): Promise<void>;
137
142
  //# sourceMappingURL=mcpAuthScaffolder.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"mcpAuthScaffolder.d.ts","sourceRoot":"","sources":["../../../src/component/utils/mcpAuthScaffolder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAKhD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;;;GAKG;AAEH;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;CAEjC,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,GACjC;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAQhE;AAED;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,wBAAwB,CAAC,CAenC;AAED;;;;;GAKG;AACH,eAAO,MAAM,kCAAkC,yDACS,CAAC;AAEzD;;;;;;GAMG;AACH,eAAO,MAAM,uCAAuC,uCAAuC,CAAC;AAC5F,eAAO,MAAM,+BAA+B,+BAA+B,CAAC;AAE5E;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAEvE;AAED;;;;GAIG;AACH,eAAO,MAAM,kCAAkC,UAG9C,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC;+CAC2C;IAC3C,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC;wDACoD;IACpD,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,wBAAwB,CAAC;IACpC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAqDrC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,+BAA+B,CAAC,IAAI,EAAE;IAC1D,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBhB"}
1
+ {"version":3,"file":"mcpAuthScaffolder.d.ts","sourceRoot":"","sources":["../../../src/component/utils/mcpAuthScaffolder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAKhD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;;;GAKG;AAEH;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;CAEjC,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,GAEhC;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACnD,SAAS,CAQZ;AAED;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,wBAAwB,CAAC,CAenC;AAED;;;;;GAKG;AACH,eAAO,MAAM,kCAAkC,yDACS,CAAC;AAEzD;;;;;;GAMG;AACH,eAAO,MAAM,uCAAuC,uCAAuC,CAAC;AAC5F,eAAO,MAAM,+BAA+B,+BAA+B,CAAC;AAE5E;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAEvE;AAED;;;;GAIG;AACH,eAAO,MAAM,kCAAkC,UAG9C,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC;+CAC2C;IAC3C,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC;wDACoD;IACpD,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,wBAAwB,CAAC;IACpC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAkErC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,+BAA+B,CAAC,IAAI,EAAE;IAC1D,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BhB"}
@@ -37,7 +37,7 @@ exports.mcpAuthScaffolderDeps = {
37
37
  function deriveMCPManifestOAuth(authType, registrationId) {
38
38
  if (authType && authType !== "none" && registrationId) {
39
39
  return {
40
- type: "OAuthPluginVault",
40
+ type: authType === "bearer-token" ? "ApiKeyPluginVault" : "OAuthPluginVault",
41
41
  reference_id: `\${{${registrationId}}}`,
42
42
  };
43
43
  }
@@ -120,6 +120,13 @@ exports.MCP_AUTH_PLACEHOLDER_WARNING_TYPES = [
120
120
  async function injectMCPAuthActionToYml(args) {
121
121
  if (args.authType === "none")
122
122
  return {};
123
+ if (args.authType === "bearer-token") {
124
+ const normalizedApiKey = args.apiKey?.trim();
125
+ await actionInjector_1.ActionInjector.injectCreateAPIKeyActionForMCP(args.ymlPath, args.authName, args.registrationId, args.mcpServerUrl, args.persistCredentialEnvRefs && args.serverName && normalizedApiKey
126
+ ? `SECRET_MCP_DA_API_KEY_${args.serverName}`
127
+ : undefined);
128
+ return {};
129
+ }
123
130
  if (args.authType === "oauth-dynamic") {
124
131
  const placeholderUsed = !args.endpoints.wellKnownUrl;
125
132
  const wellKnownUrl = args.endpoints.wellKnownUrl ?? exports.MCP_DCR_WELL_KNOWN_URL_PLACEHOLDER;
@@ -171,7 +178,9 @@ async function injectMCPAuthActionToYml(args) {
171
178
  * `dev` for fresh scaffolds; multiple envs for existing projects).
172
179
  */
173
180
  async function persistMCPAuthCredentialEnvVars(args) {
174
- if (args.authType !== "oauth" && args.authType !== "entra-sso")
181
+ if (args.authType !== "oauth" &&
182
+ args.authType !== "entra-sso" &&
183
+ args.authType !== "bearer-token")
175
184
  return;
176
185
  const envs = {};
177
186
  if (args.clientId) {
@@ -185,6 +194,9 @@ async function persistMCPAuthCredentialEnvVars(args) {
185
194
  envs[`MCP_DA_OAUTH_SCOPE_${args.serverName}`] = args.scopes;
186
195
  }
187
196
  }
197
+ else if (args.authType === "bearer-token" && args.apiKey?.trim()) {
198
+ envs[`SECRET_MCP_DA_API_KEY_${args.serverName}`] = args.apiKey.trim();
199
+ }
188
200
  if (Object.keys(envs).length === 0)
189
201
  return;
190
202
  const listRes = await envUtil_1.envUtil.listEnv(args.projectPath);
@@ -1 +1 @@
1
- {"version":3,"file":"mcpAuthScaffolder.js","sourceRoot":"","sources":["../../../src/component/utils/mcpAuthScaffolder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mcpAuthScaffolder.js","sourceRoot":"","sources":["../../../src/component/utils/mcpAuthScaffolder.ts"],"names":[],"mappings":"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"}
@@ -284,7 +284,7 @@ export declare class FxCore extends FxCoreOpenPluginPart {
284
284
  * generate config files
285
285
  */
286
286
  generateConfigFiles(inputs: Inputs): Promise<Result<undefined, FxError>>;
287
- protected updateAuthActionInYaml(authName: string | undefined, authScheme: AuthType | undefined, projectPath: string, apSpecPath: string, pluginManifestPath: string, forceToAddNew?: boolean): Promise<void>;
287
+ protected updateAuthActionInYaml(authName: string | undefined, authScheme: AuthType | undefined, projectPath: string, apSpecPath: string, pluginManifestPath: string, forceToAddNew?: boolean, apiKey?: string): Promise<void>;
288
288
  protected parseAuthNameAndScheme(listResult: ListAPIResult, inputs: Inputs): {
289
289
  authName: string;
290
290
  authScheme: AuthType;
@@ -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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"}
@@ -13,6 +13,7 @@ export interface ScaffoldAddMcpServerFromV4Options {
13
13
  appName: string;
14
14
  mcpServerUrl: string;
15
15
  authType: string;
16
+ apiKey?: string;
16
17
  resolvedPackage?: ResolvedV4ChannelPackage;
17
18
  }
18
19
  declare function scaffoldAddMcpServerFromV4(options: ScaffoldAddMcpServerFromV4Options): Promise<Result<undefined, FxError>>;
@@ -33,7 +34,7 @@ export declare class FxCoreDeclarativeAgentPart {
33
34
  authName: string;
34
35
  authScheme: AuthType;
35
36
  }[];
36
- protected updateAuthActionInYaml(_authName: string | undefined, _authScheme: AuthType | undefined, _projectPath: string, _apSpecPath: string, _pluginManifestPath: string, _forceToAddNew?: boolean): Promise<void>;
37
+ protected updateAuthActionInYaml(_authName: string | undefined, _authScheme: AuthType | undefined, _projectPath: string, _apSpecPath: string, _pluginManifestPath: string, _forceToAddNew?: boolean, _apiKey?: string): Promise<void>;
37
38
  /**
38
39
  * Add plugin
39
40
  */
@@ -1 +1 @@
1
- {"version":3,"file":"FxCore.declarativeAgent.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.declarativeAgent.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAA2B,MAAM,6BAA6B,CAAC;AAC/F,OAAO,EAGL,OAAO,EACP,MAAM,EAEN,QAAQ,EACR,MAAM,EAOP,MAAM,wBAAwB,CAAC;AAiBhC,OAAO,KAAK,4BAA4B,MAAM,gDAAgD,CAAC;AAQ/F,OAAO,KAAK,uBAAuB,MAAM,2CAA2C,CAAC;AAErF,OAAO,EACL,wBAAwB,EAEzB,MAAM,yCAAyC,CAAC;AAiBjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sBAAsB,CAAC;AAEzE,MAAM,WAAW,iCAAiC;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,wBAAwB,CAAC;CAC5C;AAOD,iBAAe,0BAA0B,CACvC,OAAO,EAAE,iCAAiC,GACzC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAsCrC;AAMD,eAAO,MAAM,0BAA0B;;;;;;;;;CAStC,CAAC;AACF,qBAAa,0BAA0B;IAO/B,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAgQxE,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAKlE,SAAS,CAAC,sBAAsB,CAC9B,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,MAAM,GACd;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,QAAQ,CAAA;KAAE,EAAE;cAK/B,sBAAsB,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,WAAW,EAAE,QAAQ,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,MAAM,EAC3B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,IAAI,CAAC;IAIhB;;OAEG;IAOG,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE,OAAO,CAAC,CAAC;IAmvB1E;;;;;OAKG;YACW,gBAAgB;CA+D/B"}
1
+ {"version":3,"file":"FxCore.declarativeAgent.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.declarativeAgent.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAA2B,MAAM,6BAA6B,CAAC;AAC/F,OAAO,EAGL,OAAO,EACP,MAAM,EAEN,QAAQ,EACR,MAAM,EAOP,MAAM,wBAAwB,CAAC;AAiBhC,OAAO,KAAK,4BAA4B,MAAM,gDAAgD,CAAC;AAQ/F,OAAO,KAAK,uBAAuB,MAAM,2CAA2C,CAAC;AAErF,OAAO,EACL,wBAAwB,EAEzB,MAAM,yCAAyC,CAAC;AAiBjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sBAAsB,CAAC;AAEzE,MAAM,WAAW,iCAAiC;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,wBAAwB,CAAC;CAC5C;AAOD,iBAAe,0BAA0B,CACvC,OAAO,EAAE,iCAAiC,GACzC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAyCrC;AAMD,eAAO,MAAM,0BAA0B;;;;;;;;;CAStC,CAAC;AACF,qBAAa,0BAA0B;IAO/B,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAgQxE,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAKlE,SAAS,CAAC,sBAAsB,CAC9B,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,MAAM,GACd;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,QAAQ,CAAA;KAAE,EAAE;cAK/B,sBAAsB,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,WAAW,EAAE,QAAQ,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,MAAM,EAC3B,cAAc,CAAC,EAAE,OAAO,EACxB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAIhB;;OAEG;IAOG,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE,OAAO,CAAC,CAAC;IA6vB1E;;;;;OAKG;YACW,gBAAgB;CA+D/B"}