@microsoft/m365-spec-parser 0.2.4-alpha.ad0d7aa1a.0 → 0.2.4-alpha.db2563b3b.0

package/dist/index.esm2017.mjs

@@ -114,12 +114,7 @@ ConstantString.AdaptiveCardType = "AdaptiveCard";
 ConstantString.TextBlockType = "TextBlock";
 ConstantString.ImageType = "Image";
 ConstantString.ContainerType = "Container";
-ConstantString.RegistrationIdPostfix = {
-    apiKey: "REGISTRATION_ID",
-    oauth2: "CONFIGURATION_ID",
-    http: "REGISTRATION_ID",
-    openIdConnect: "REGISTRATION_ID",
-};
+ConstantString.RegistrationIdPostfix = "REGISTRATION_ID";
 ConstantString.ResponseCodeFor20X = [
     "200",
     "201",
@@ -254,6 +249,20 @@ class Utils {
         result.sort((a, b) => a[0].name.localeCompare(b[0].name));
         return result;
     }
+    static getAuthMap(spec) {
+        const authMap = {};
+        for (const url in spec.paths) {
+            for (const method in spec.paths[url]) {
+                const operation = spec.paths[url][method];
+                const authArray = Utils.getAuthArray(operation.security, spec);
+                if (authArray && authArray.length > 0) {
+                    const currentAuth = authArray[0][0];
+                    authMap[operation.operationId] = currentAuth;
+                }
+            }
+        }
+        return authMap;
+    }
     static getAuthInfo(spec) {
         let authInfo = undefined;
         for (const url in spec.paths) {
@@ -1678,7 +1687,7 @@ function inferProperties(card) {
 
 // Copyright (c) Microsoft Corporation.
 class ManifestUpdater {
-    static async updateManifestWithAiPlugin(manifestPath, outputSpecPath, apiPluginFilePath, spec, options, authInfo, existingPluginManifestInfo) {
+    static async updateManifestWithAiPlugin(manifestPath, outputSpecPath, apiPluginFilePath, spec, options, authMap, existingPluginManifestInfo) {
         const manifest = await fs.readJSON(manifestPath);
         const apiPluginRelativePath = ManifestUpdater.getRelativePath(manifestPath, apiPluginFilePath);
         const useCopilotExtensionsInSchema = await ManifestUtil.useCopilotExtensionsInSchema(manifest);
@@ -1708,7 +1717,7 @@ class ManifestUpdater {
         }
         const appName = this.removeEnvs(manifest.name.short);
         const specRelativePath = ManifestUpdater.getRelativePath(manifestPath, outputSpecPath);
-        const [apiPlugin, warnings] = await ManifestUpdater.generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authInfo, options, existingPluginManifestInfo);
+        const [apiPlugin, warnings] = await ManifestUpdater.generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authMap, options, existingPluginManifestInfo);
         return [manifest, apiPlugin, warnings];
     }
     static updateManifestDescription(manifest, spec) {
@@ -1730,28 +1739,13 @@ class ManifestUpdater {
             throw new SpecParserError(Utils.format(ConstantString.UnsupportedSchema, method, pathUrl, JSON.stringify(schema)), ErrorType.UpdateManifestFailed);
         }
     }
-    static async generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authInfo, options, existingPluginManifestInfo) {
+    static async generatePluginManifestSchema(spec, specRelativePath, apiPluginFilePath, appName, authMap, options, existingPluginManifestInfo) {
         var _a, _b, _c, _d;
         const warnings = [];
         const functions = [];
-        const functionNames = [];
+        const functionNamesMap = {};
         const conversationStarters = [];
         const paths = spec.paths;
-        const pluginAuthObj = {
-            type: "None",
-        };
-        if (authInfo) {
-            if (Utils.isOAuthWithAuthCodeFlow(authInfo.authScheme)) {
-                pluginAuthObj.type = "OAuthPluginVault";
-            }
-            else if (Utils.isBearerTokenAuth(authInfo.authScheme)) {
-                pluginAuthObj.type = "ApiKeyPluginVault";
-            }
-            if (pluginAuthObj.type !== "None") {
-                const safeRegistrationIdName = Utils.getSafeRegistrationIdEnvName(`${authInfo.name}_${ConstantString.RegistrationIdPostfix[authInfo.authScheme.type]}`);
-                pluginAuthObj.reference_id = `\${{${safeRegistrationIdName}}}`;
-            }
-        }
         for (const pathUrl in paths) {
             const pathItem = paths[pathUrl];
             if (pathItem) {
@@ -1834,7 +1828,28 @@ class ManifestUpdater {
                                 }
                             }
                             functions.push(funcObj);
-                            functionNames.push(safeFunctionName);
+                            const authInfo = authMap[operationId];
+                            let key = "None";
+                            let authName = "None";
+                            if (authInfo) {
+                                if (Utils.isOAuthWithAuthCodeFlow(authInfo.authScheme)) {
+                                    key = "OAuthPluginVault";
+                                    authName = authInfo.name;
+                                }
+                                else if (Utils.isBearerTokenAuth(authInfo.authScheme)) {
+                                    key = "ApiKeyPluginVault";
+                                    authName = authInfo.name;
+                                }
+                            }
+                            if (functionNamesMap[key]) {
+                                functionNamesMap[key].functionNames.push(safeFunctionName);
+                            }
+                            else {
+                                functionNamesMap[key] = {
+                                    functionNames: [safeFunctionName],
+                                    authName: authName,
+                                };
+                            }
                             const conversationStarterStr = (summary !== null && summary !== void 0 ? summary : description).slice(0, ConstantString.ConversationStarterMaxLens);
                             if (conversationStarterStr) {
                                 conversationStarters.push(conversationStarterStr);
@@ -1844,6 +1859,12 @@ class ManifestUpdater {
                 }
             }
         }
+        if (Object.keys(functionNamesMap).length === 0) {
+            functionNamesMap["None"] = {
+                functionNames: [],
+                authName: "None",
+            };
+        }
         let apiPlugin;
         if (await fs.pathExists(apiPluginFilePath)) {
             apiPlugin = await fs.readJSON(apiPluginFilePath);
@@ -1879,24 +1900,35 @@ class ManifestUpdater {
             const relativePath = ManifestUpdater.getRelativePath(existingPluginManifestInfo.manifestPath, existingPluginManifestInfo.specPath);
             apiPlugin.runtimes = apiPlugin.runtimes.filter((runtime) => runtime.spec.url !== relativePath);
         }
-        const index = apiPlugin.runtimes.findIndex((runtime) => {
-            var _a, _b;
-            return runtime.spec.url === specRelativePath &&
-                runtime.type === "OpenApi" &&
-                ((_b = (_a = runtime.auth) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : "None") === pluginAuthObj.type;
-        });
-        if (index === -1) {
-            apiPlugin.runtimes.push({
-                type: "OpenApi",
-                auth: pluginAuthObj,
-                spec: {
-                    url: specRelativePath,
-                },
-                run_for_functions: functionNames,
+        for (const authType in functionNamesMap) {
+            const pluginAuthObj = {
+                type: authType,
+            };
+            const authName = functionNamesMap[authType].authName;
+            if (pluginAuthObj.type !== "None") {
+                const safeRegistrationIdName = Utils.getSafeRegistrationIdEnvName(`${authName}_${ConstantString.RegistrationIdPostfix}`);
+                pluginAuthObj.reference_id = `\${{${safeRegistrationIdName}}}`;
+            }
+            const functionNamesInfo = functionNamesMap[authType];
+            const index = apiPlugin.runtimes.findIndex((runtime) => {
+                var _a, _b;
+                return runtime.spec.url === specRelativePath &&
+                    runtime.type === "OpenApi" &&
+                    ((_b = (_a = runtime.auth) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : "None") === authType;
             });
-        }
-        else {
-            apiPlugin.runtimes[index].run_for_functions = functionNames;
+            if (index === -1) {
+                apiPlugin.runtimes.push({
+                    type: "OpenApi",
+                    auth: pluginAuthObj,
+                    spec: {
+                        url: specRelativePath,
+                    },
+                    run_for_functions: functionNamesInfo.functionNames,
+                });
+            }
+            else {
+                apiPlugin.runtimes[index].run_for_functions = functionNamesInfo.functionNames;
+            }
         }
         if (!apiPlugin.name_for_human) {
             apiPlugin.name_for_human = appName;
@@ -1937,7 +1969,7 @@ class ManifestUpdater {
                 };
                 if (authInfo) {
                     const auth = authInfo.authScheme;
-                    const safeRegistrationIdName = Utils.getSafeRegistrationIdEnvName(`${authInfo.name}_${ConstantString.RegistrationIdPostfix[authInfo.authScheme.type]}`);
+                    const safeRegistrationIdName = Utils.getSafeRegistrationIdEnvName(`${authInfo.name}_${ConstantString.RegistrationIdPostfix}`);
                     if (Utils.isAPIKeyAuth(auth) || Utils.isBearerTokenAuth(auth)) {
                         composeExtension.authorization = {
                             authType: "apiSecretServiceAuth",
@@ -2264,13 +2296,21 @@ class SpecParser {
             const newSpecs = await this.getFilteredSpecs(filter, signal);
             const newUnResolvedSpec = newSpecs[0];
             const newSpec = newSpecs[1];
-            const authInfo = Utils.getAuthInfo(newSpec);
             const paths = newUnResolvedSpec.paths;
             for (const pathUrl in paths) {
                 const operations = paths[pathUrl];
                 for (const method in operations) {
                     const operationItem = operations[method];
                     const operationId = operationItem.operationId;
+                    const containsSpecialCharacters = /[^a-zA-Z0-9_]/.test(operationId);
+                    if (containsSpecialCharacters) {
+                        operationItem.operationId = operationId.replace(/[^a-zA-Z0-9]/g, "_");
+                        result.warnings.push({
+                            type: WarningType.OperationIdContainsSpecialCharacters,
+                            content: Utils.format(ConstantString.OperationIdContainsSpecialCharacters, operationId, operationItem.operationId),
+                            data: operationId,
+                        });
+                    }
                     const authArray = Utils.getAuthArray(operationItem.security, newSpec);
                     if (Utils.isNotSupportedAuth(authArray)) {
                         result.warnings.push({
@@ -2279,16 +2319,6 @@ class SpecParser {
                             data: operationId,
                         });
                     }
-                    const containsSpecialCharacters = /[^a-zA-Z0-9_]/.test(operationId);
-                    if (!containsSpecialCharacters) {
-                        continue;
-                    }
-                    operationItem.operationId = operationId.replace(/[^a-zA-Z0-9]/g, "_");
-                    result.warnings.push({
-                        type: WarningType.OperationIdContainsSpecialCharacters,
-                        content: Utils.format(ConstantString.OperationIdContainsSpecialCharacters, operationId, operationItem.operationId),
-                        data: operationId,
-                    });
                 }
             }
             await this.saveFilterSpec(outputSpecPath, newUnResolvedSpec);
@@ -2301,7 +2331,8 @@ class SpecParser {
                     specPath: this.pathOrSpec,
                 }
                 : undefined;
-            const [updatedManifest, apiPlugin, warnings] = await ManifestUpdater.updateManifestWithAiPlugin(manifestPath, outputSpecPath, pluginFilePath, newSpec, this.options, authInfo, existingPluginManifestInfo);
+            const authMap = Utils.getAuthMap(newSpec);
+            const [updatedManifest, apiPlugin, warnings] = await ManifestUpdater.updateManifestWithAiPlugin(manifestPath, outputSpecPath, pluginFilePath, newSpec, this.options, authMap, existingPluginManifestInfo);
             result.warnings.push(...warnings);
             await fs.outputJSON(manifestPath, updatedManifest, { spaces: 4 });
             await fs.outputJSON(pluginFilePath, apiPlugin, { spaces: 4 });