@microsoft/m365-spec-parser 0.1.1-alpha.8d8f5a0bb.0 → 0.1.1-alpha.a372ccf67.0

package/dist/index.node.cjs.js

@@ -61,7 +61,7 @@ exports.ErrorType = void 0;
     ErrorType["NoExtraAPICanBeAdded"] = "no-extra-api-can-be-added";
     ErrorType["ResolveServerUrlFailed"] = "resolve-server-url-failed";
     ErrorType["SwaggerNotSupported"] = "swagger-not-supported";
-    ErrorType["MultipleAPIKeyNotSupported"] = "multiple-api-key-not-supported";
+    ErrorType["MultipleAuthNotSupported"] = "multiple-auth-not-supported";
     ErrorType["ListFailed"] = "list-failed";
     ErrorType["listSupportedAPIInfoFailed"] = "list-supported-api-info-failed";
     ErrorType["FilterSpecFailed"] = "filter-spec-failed";
@@ -92,7 +92,13 @@ exports.ValidationStatus = void 0;
     ValidationStatus[ValidationStatus["Valid"] = 0] = "Valid";
     ValidationStatus[ValidationStatus["Warning"] = 1] = "Warning";
     ValidationStatus[ValidationStatus["Error"] = 2] = "Error";
-})(exports.ValidationStatus || (exports.ValidationStatus = {}));
+})(exports.ValidationStatus || (exports.ValidationStatus = {}));
+exports.ProjectType = void 0;
+(function (ProjectType) {
+    ProjectType[ProjectType["Copilot"] = 0] = "Copilot";
+    ProjectType[ProjectType["SME"] = 1] = "SME";
+    ProjectType[ProjectType["TeamsAi"] = 2] = "TeamsAi";
+})(exports.ProjectType || (exports.ProjectType = {}));
 
 // Copyright (c) Microsoft Corporation.
 class ConstantString {
@@ -111,7 +117,7 @@ ConstantString.ResolveServerUrlFailed = "Unable to resolve the server URL: pleas
 ConstantString.OperationOnlyContainsOptionalParam = "Operation %s contains multiple optional parameters. The first optional parameter is used for this command.";
 ConstantString.ConvertSwaggerToOpenAPI = "The Swagger 2.0 file has been converted to OpenAPI 3.0.";
 ConstantString.SwaggerNotSupported = "Swagger 2.0 is not supported. Please convert to OpenAPI 3.0 manually before proceeding.";
-ConstantString.MultipleAPIKeyNotSupported = "Multiple API keys are not supported. Please make sure that all selected APIs use the same API key.";
+ConstantString.MultipleAuthNotSupported = "Multiple authentication methods are unsupported. Ensure all selected APIs use identical authentication.";
 ConstantString.UnsupportedSchema = "Unsupported schema in %s %s: %s";
 ConstantString.WrappedCardVersion = "devPreview";
 ConstantString.WrappedCardSchema = "https://developer.microsoft.com/json-schemas/teams/vDevPreview/MicrosoftTeams.ResponseRenderingTemplate.schema.json";
@@ -124,6 +130,7 @@ ConstantString.AdaptiveCardType = "AdaptiveCard";
 ConstantString.TextBlockType = "TextBlock";
 ConstantString.ContainerType = "Container";
 ConstantString.RegistrationIdPostfix = "REGISTRATION_ID";
+ConstantString.OAuthRegistrationIdPostFix = "OAUTH_REGISTRATION_ID";
 ConstantString.ResponseCodeFor20X = [
     "200",
     "201",
@@ -183,7 +190,8 @@ ConstantString.FullDescriptionMaxLens = 4000;
 ConstantString.CommandDescriptionMaxLens = 128;
 ConstantString.ParameterDescriptionMaxLens = 128;
 ConstantString.CommandTitleMaxLens = 32;
-ConstantString.ParameterTitleMaxLens = 32;
+ConstantString.ParameterTitleMaxLens = 32;
+ConstantString.SMERequiredParamsMaxNum = 5;
 
 // Copyright (c) Microsoft Corporation.
 class SpecParserError extends Error {
@@ -304,6 +312,9 @@ class Utils {
         }
         return paramResult;
     }
+    static containMultipleMediaTypes(bodyObject) {
+        return Object.keys((bodyObject === null || bodyObject === void 0 ? void 0 : bodyObject.content) || {}).length > 1;
+    }
     /**
      * Checks if the given API is supported.
      * @param {string} method - The HTTP method of the API.
@@ -318,32 +329,40 @@ class Utils {
      * 5. response body should be “application/json” and not empty, and response code should be 20X
      * 6. only support request body with “application/json” content type
      */
-    static isSupportedApi(method, path, spec, allowMissingId, allowAPIKeyAuth, allowMultipleParameters, allowOauth2, isCopilot) {
+    static isSupportedApi(method, path, spec, options) {
+        var _a;
         const pathObj = spec.paths[path];
         method = method.toLocaleLowerCase();
         if (pathObj) {
-            if ((method === ConstantString.PostMethod || method === ConstantString.GetMethod) &&
-                pathObj[method]) {
+            if (((_a = options.allowMethods) === null || _a === void 0 ? void 0 : _a.includes(method)) && pathObj[method]) {
                 const securities = pathObj[method].security;
-                const authArray = Utils.getAuthArray(securities, spec);
-                if (!Utils.isSupportedAuth(authArray, allowAPIKeyAuth, allowOauth2)) {
-                    return false;
+                const isTeamsAi = options.projectType === exports.ProjectType.TeamsAi;
+                const isCopilot = options.projectType === exports.ProjectType.Copilot;
+                // Teams AI project doesn't care about auth, it will use authProvider for user to implement
+                if (!isTeamsAi) {
+                    const authArray = Utils.getAuthArray(securities, spec);
+                    if (!Utils.isSupportedAuth(authArray, options)) {
+                        return false;
+                    }
                 }
                 const operationObject = pathObj[method];
-                if (!allowMissingId && !operationObject.operationId) {
+                if (!options.allowMissingId && !operationObject.operationId) {
                     return false;
                 }
                 const paramObject = operationObject.parameters;
                 const requestBody = operationObject.requestBody;
                 const requestJsonBody = requestBody === null || requestBody === void 0 ? void 0 : requestBody.content["application/json"];
-                const mediaTypesCount = Object.keys((requestBody === null || requestBody === void 0 ? void 0 : requestBody.content) || {}).length;
-                if (mediaTypesCount > 1) {
+                if (!isTeamsAi && Utils.containMultipleMediaTypes(requestBody)) {
                     return false;
                 }
-                const responseJson = Utils.getResponseJson(operationObject);
+                const responseJson = Utils.getResponseJson(operationObject, isTeamsAi);
                 if (Object.keys(responseJson).length === 0) {
                     return false;
                 }
+                // Teams AI project doesn't care about request parameters/body
+                if (isTeamsAi) {
+                    return true;
+                }
                 let requestBodyParamResult = {
                     requiredNum: 0,
                     optionalNum: 0,
@@ -368,8 +387,9 @@ class Utils {
                     return true;
                 }
                 if (requestBodyParamResult.requiredNum + paramResult.requiredNum > 1) {
-                    if (allowMultipleParameters &&
-                        requestBodyParamResult.requiredNum + paramResult.requiredNum <= 5) {
+                    if (options.allowMultipleParameters &&
+                        requestBodyParamResult.requiredNum + paramResult.requiredNum <=
+                            ConstantString.SMERequiredParamsMaxNum) {
                         return true;
                     }
                     return false;
@@ -388,29 +408,31 @@ class Utils {
         }
         return false;
     }
-    static isSupportedAuth(authSchemaArray, allowAPIKeyAuth, allowOauth2) {
+    static isSupportedAuth(authSchemaArray, options) {
         if (authSchemaArray.length === 0) {
             return true;
         }
-        if (allowAPIKeyAuth || allowOauth2) {
+        if (options.allowAPIKeyAuth || options.allowOauth2) {
             // Currently we don't support multiple auth in one operation
             if (authSchemaArray.length > 0 && authSchemaArray.every((auths) => auths.length > 1)) {
                 return false;
             }
             for (const auths of authSchemaArray) {
                 if (auths.length === 1) {
-                    if (!allowOauth2 && allowAPIKeyAuth && Utils.isAPIKeyAuth(auths[0].authSchema)) {
+                    if (!options.allowOauth2 &&
+                        options.allowAPIKeyAuth &&
+                        Utils.isAPIKeyAuth(auths[0].authSchema)) {
                         return true;
                     }
-                    else if (!allowAPIKeyAuth &&
-                        allowOauth2 &&
-                        Utils.isBearerTokenAuth(auths[0].authSchema)) {
+                    else if (!options.allowAPIKeyAuth &&
+                        options.allowOauth2 &&
+                        Utils.isOAuthWithAuthCodeFlow(auths[0].authSchema)) {
                         return true;
                     }
-                    else if (allowAPIKeyAuth &&
-                        allowOauth2 &&
+                    else if (options.allowAPIKeyAuth &&
+                        options.allowOauth2 &&
                         (Utils.isAPIKeyAuth(auths[0].authSchema) ||
-                            Utils.isBearerTokenAuth(auths[0].authSchema))) {
+                            Utils.isOAuthWithAuthCodeFlow(auths[0].authSchema))) {
                         return true;
                     }
                 }
@@ -421,10 +443,11 @@ class Utils {
     static isAPIKeyAuth(authSchema) {
         return authSchema.type === "apiKey";
     }
-    static isBearerTokenAuth(authSchema) {
-        return (authSchema.type === "oauth2" ||
-            authSchema.type === "openIdConnect" ||
-            (authSchema.type === "http" && authSchema.scheme === "bearer"));
+    static isOAuthWithAuthCodeFlow(authSchema) {
+        if (authSchema.type === "oauth2" && authSchema.flows && authSchema.flows.authorizationCode) {
+            return true;
+        }
+        return false;
     }
     static getAuthArray(securities, spec) {
         var _a;
@@ -452,18 +475,19 @@ class Utils {
     static updateFirstLetter(str) {
         return str.charAt(0).toUpperCase() + str.slice(1);
     }
-    static getResponseJson(operationObject) {
+    static getResponseJson(operationObject, isTeamsAiProject = false) {
         var _a, _b;
         let json = {};
         for (const code of ConstantString.ResponseCodeFor20X) {
             const responseObject = (_a = operationObject === null || operationObject === void 0 ? void 0 : operationObject.responses) === null || _a === void 0 ? void 0 : _a[code];
-            const mediaTypesCount = Object.keys((responseObject === null || responseObject === void 0 ? void 0 : responseObject.content) || {}).length;
-            if (mediaTypesCount > 1) {
-                return {};
-            }
             if ((_b = responseObject === null || responseObject === void 0 ? void 0 : responseObject.content) === null || _b === void 0 ? void 0 : _b["application/json"]) {
                 json = responseObject.content["application/json"];
-                break;
+                if (!isTeamsAiProject && Utils.containMultipleMediaTypes(responseObject)) {
+                    json = {};
+                }
+                else {
+                    break;
+                }
             }
         }
         return json;
@@ -537,7 +561,7 @@ class Utils {
         }
         return errors;
     }
-    static validateServer(spec, allowMissingId, allowAPIKeyAuth, allowMultipleParameters, allowOauth2, isCopilot) {
+    static validateServer(spec, options) {
         const errors = [];
         let hasTopLevelServers = false;
         let hasPathLevelServers = false;
@@ -558,7 +582,7 @@ class Utils {
             }
             for (const method in methods) {
                 const operationObject = methods[method];
-                if (Utils.isSupportedApi(method, path, spec, allowMissingId, allowAPIKeyAuth, allowMultipleParameters, allowOauth2, isCopilot)) {
+                if (Utils.isSupportedApi(method, path, spec, options)) {
                     if ((operationObject === null || operationObject === void 0 ? void 0 : operationObject.servers) && operationObject.servers.length >= 1) {
                         hasOperationLevelServers = true;
                         const serverErrors = Utils.checkServerUrl(operationObject.servers);
@@ -645,7 +669,7 @@ class Utils {
             param.value = schema.default;
         }
     }
-    static parseApiInfo(operationItem, allowMultipleParameters) {
+    static parseApiInfo(operationItem, options) {
         var _a, _b;
         const requiredParams = [];
         const optionalParams = [];
@@ -659,7 +683,7 @@ class Utils {
                     description: ((_a = param.description) !== null && _a !== void 0 ? _a : "").slice(0, ConstantString.ParameterDescriptionMaxLens),
                 };
                 const schema = param.schema;
-                if (allowMultipleParameters && schema) {
+                if (options.allowMultipleParameters && schema) {
                     Utils.updateParameterWithInputType(schema, parameter);
                 }
                 if (param.in !== "header" && param.in !== "cookie") {
@@ -677,7 +701,7 @@ class Utils {
             const requestJson = requestBody.content["application/json"];
             if (Object.keys(requestJson).length !== 0) {
                 const schema = requestJson.schema;
-                const [requiredP, optionalP] = Utils.generateParametersFromSchema(schema, "requestBody", allowMultipleParameters, requestBody.required);
+                const [requiredP, optionalP] = Utils.generateParametersFromSchema(schema, "requestBody", !!options.allowMultipleParameters, requestBody.required);
                 requiredParams.push(...requiredP);
                 optionalParams.push(...optionalP);
             }
@@ -708,14 +732,13 @@ class Utils {
         }
         return [command, warning];
     }
-    static listSupportedAPIs(spec, allowMissingId, allowAPIKeyAuth, allowMultipleParameters, allowOauth2, isCopilot) {
+    static listSupportedAPIs(spec, options) {
         const paths = spec.paths;
         const result = {};
         for (const path in paths) {
             const methods = paths[path];
             for (const method in methods) {
-                // For developer preview, only support GET operation with only 1 parameter without auth
-                if (Utils.isSupportedApi(method, path, spec, allowMissingId, allowAPIKeyAuth, allowMultipleParameters, allowOauth2, isCopilot)) {
+                if (Utils.isSupportedApi(method, path, spec, options)) {
                     const operationObject = methods[method];
                     result[`${method.toUpperCase()} ${path}`] = operationObject;
                 }
@@ -723,7 +746,7 @@ class Utils {
         }
         return result;
     }
-    static validateSpec(spec, parser, isSwaggerFile, allowMissingId, allowAPIKeyAuth, allowMultipleParameters, allowOauth2, isCopilot) {
+    static validateSpec(spec, parser, isSwaggerFile, options) {
         const errors = [];
         const warnings = [];
         if (isSwaggerFile) {
@@ -733,7 +756,7 @@ class Utils {
             });
         }
         // Server validation
-        const serverErrors = Utils.validateServer(spec, allowMissingId, allowAPIKeyAuth, allowMultipleParameters, allowOauth2, isCopilot);
+        const serverErrors = Utils.validateServer(spec, options);
         errors.push(...serverErrors);
         // Remote reference not supported
         const refPaths = parser.$refs.paths();
@@ -746,7 +769,7 @@ class Utils {
             });
         }
         // No supported API
-        const apiMap = Utils.listSupportedAPIs(spec, allowMissingId, allowAPIKeyAuth, allowMultipleParameters, allowOauth2, isCopilot);
+        const apiMap = Utils.listSupportedAPIs(spec, options);
         if (Object.keys(apiMap).length === 0) {
             errors.push({
                 type: exports.ErrorType.NoSupportedApi,
@@ -802,14 +825,14 @@ class Utils {
 
 // Copyright (c) Microsoft Corporation.
 class SpecFilter {
-    static specFilter(filter, unResolveSpec, resolvedSpec, allowMissingId, allowAPIKeyAuth, allowMultipleParameters, allowOauth2, isCopilot) {
+    static specFilter(filter, unResolveSpec, resolvedSpec, options) {
         try {
             const newSpec = Object.assign({}, unResolveSpec);
             const newPaths = {};
             for (const filterItem of filter) {
                 const [method, path] = filterItem.split(" ");
                 const methodName = method.toLowerCase();
-                if (!Utils.isSupportedApi(methodName, path, resolvedSpec, allowMissingId, allowAPIKeyAuth, allowMultipleParameters, allowOauth2, isCopilot)) {
+                if (!Utils.isSupportedApi(methodName, path, resolvedSpec, options)) {
                     continue;
                 }
                 if (!newPaths[path]) {
@@ -835,7 +858,7 @@ class SpecFilter {
 
 // Copyright (c) Microsoft Corporation.
 class ManifestUpdater {
-    static updateManifestWithAiPlugin(manifestPath, outputSpecPath, apiPluginFilePath, spec) {
+    static updateManifestWithAiPlugin(manifestPath, outputSpecPath, apiPluginFilePath, spec, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const manifest = yield fs__default['default'].readJSON(manifestPath);
             const apiPluginRelativePath = ManifestUpdater.getRelativePath(manifestPath, apiPluginFilePath);
@@ -846,7 +869,7 @@ class ManifestUpdater {
             ];
             ManifestUpdater.updateManifestDescription(manifest, spec);
             const specRelativePath = ManifestUpdater.getRelativePath(manifestPath, outputSpecPath);
-            const apiPlugin = ManifestUpdater.generatePluginManifestSchema(spec, specRelativePath);
+            const apiPlugin = ManifestUpdater.generatePluginManifestSchema(spec, specRelativePath, options);
             return [manifest, apiPlugin];
         });
     }
@@ -871,7 +894,7 @@ class ManifestUpdater {
         }
         return parameter;
     }
-    static generatePluginManifestSchema(spec, specRelativePath) {
+    static generatePluginManifestSchema(spec, specRelativePath, options) {
         var _a, _b, _c;
         const functions = [];
         const functionNames = [];
@@ -881,7 +904,7 @@ class ManifestUpdater {
             if (pathItem) {
                 const operations = pathItem;
                 for (const method in operations) {
-                    if (ConstantString.AllOperationMethods.includes(method)) {
+                    if (options.allowMethods.includes(method)) {
                         const operationItem = operations[method];
                         if (operationItem) {
                             const operationId = operationItem.operationId;
@@ -954,44 +977,52 @@ class ManifestUpdater {
         };
         return apiPlugin;
     }
-    static updateManifest(manifestPath, outputSpecPath, adaptiveCardFolder, spec, allowMultipleParameters, auth, isMe) {
+    static updateManifest(manifestPath, outputSpecPath, spec, options, adaptiveCardFolder, authInfo) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const originalManifest = yield fs__default['default'].readJSON(manifestPath);
                 const updatedPart = {};
-                const [commands, warnings] = yield ManifestUpdater.generateCommands(spec, adaptiveCardFolder, manifestPath, allowMultipleParameters);
-                const composeExtension = {
-                    composeExtensionType: "apiBased",
-                    apiSpecificationFile: ManifestUpdater.getRelativePath(manifestPath, outputSpecPath),
-                    commands: commands,
-                };
-                if (auth) {
-                    if (Utils.isAPIKeyAuth(auth)) {
-                        auth = auth;
-                        const safeApiSecretRegistrationId = Utils.getSafeRegistrationIdEnvName(`${auth.name}_${ConstantString.RegistrationIdPostfix}`);
-                        composeExtension.authorization = {
-                            authType: "apiSecretServiceAuth",
-                            apiSecretServiceAuthConfiguration: {
-                                apiSecretRegistrationId: `\${{${safeApiSecretRegistrationId}}}`,
-                            },
-                        };
-                    }
-                    else if (Utils.isBearerTokenAuth(auth)) {
-                        composeExtension.authorization = {
-                            authType: "microsoftEntra",
-                            microsoftEntraConfiguration: {
-                                supportsSingleSignOn: true,
-                            },
-                        };
-                        updatedPart.webApplicationInfo = {
-                            id: "${{AAD_APP_CLIENT_ID}}",
-                            resource: "api://${{DOMAIN}}/${{AAD_APP_CLIENT_ID}}",
-                        };
+                updatedPart.composeExtensions = [];
+                let warnings = [];
+                if (options.projectType === exports.ProjectType.SME) {
+                    const updateResult = yield ManifestUpdater.generateCommands(spec, manifestPath, options, adaptiveCardFolder);
+                    const commands = updateResult[0];
+                    warnings = updateResult[1];
+                    const composeExtension = {
+                        composeExtensionType: "apiBased",
+                        apiSpecificationFile: ManifestUpdater.getRelativePath(manifestPath, outputSpecPath),
+                        commands: commands,
+                    };
+                    if (authInfo) {
+                        let auth = authInfo.authSchema;
+                        if (Utils.isAPIKeyAuth(auth)) {
+                            auth = auth;
+                            const safeApiSecretRegistrationId = Utils.getSafeRegistrationIdEnvName(`${authInfo.name}_${ConstantString.RegistrationIdPostfix}`);
+                            composeExtension.authorization = {
+                                authType: "apiSecretServiceAuth",
+                                apiSecretServiceAuthConfiguration: {
+                                    apiSecretRegistrationId: `\${{${safeApiSecretRegistrationId}}}`,
+                                },
+                            };
+                        }
+                        else if (Utils.isOAuthWithAuthCodeFlow(auth)) {
+                            const safeOAuth2RegistrationId = Utils.getSafeRegistrationIdEnvName(`${authInfo.name}_${ConstantString.OAuthRegistrationIdPostFix}`);
+                            composeExtension.authorization = {
+                                authType: "oAuth2.0",
+                                oAuthConfiguration: {
+                                    oauthConfigurationId: `\${{${safeOAuth2RegistrationId}}}`,
+                                },
+                            };
+                            updatedPart.webApplicationInfo = {
+                                id: "${{AAD_APP_CLIENT_ID}}",
+                                resource: "api://${{DOMAIN}}/${{AAD_APP_CLIENT_ID}}",
+                            };
+                        }
                     }
+                    updatedPart.composeExtensions = [composeExtension];
                 }
                 updatedPart.description = originalManifest.description;
                 ManifestUpdater.updateManifestDescription(updatedPart, spec);
-                updatedPart.composeExtensions = isMe === undefined || isMe === true ? [composeExtension] : [];
                 const updatedManifest = Object.assign(Object.assign({}, originalManifest), updatedPart);
                 return [updatedManifest, warnings];
             }
@@ -1000,7 +1031,8 @@ class ManifestUpdater {
             }
         });
     }
-    static generateCommands(spec, adaptiveCardFolder, manifestPath, allowMultipleParameters) {
+    static generateCommands(spec, manifestPath, options, adaptiveCardFolder) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const paths = spec.paths;
             const commands = [];
@@ -1012,14 +1044,16 @@ class ManifestUpdater {
                         const operations = pathItem;
                         // Currently only support GET and POST method
                         for (const method in operations) {
-                            if (method === ConstantString.PostMethod || method === ConstantString.GetMethod) {
+                            if ((_a = options.allowMethods) === null || _a === void 0 ? void 0 : _a.includes(method)) {
                                 const operationItem = operations[method];
                                 if (operationItem) {
-                                    const [command, warning] = Utils.parseApiInfo(operationItem, allowMultipleParameters);
-                                    const adaptiveCardPath = path__default['default'].join(adaptiveCardFolder, command.id + ".json");
-                                    command.apiResponseRenderingTemplateFile = (yield fs__default['default'].pathExists(adaptiveCardPath))
-                                        ? ManifestUpdater.getRelativePath(manifestPath, adaptiveCardPath)
-                                        : "";
+                                    const [command, warning] = Utils.parseApiInfo(operationItem, options);
+                                    if (adaptiveCardFolder) {
+                                        const adaptiveCardPath = path__default['default'].join(adaptiveCardFolder, command.id + ".json");
+                                        command.apiResponseRenderingTemplateFile = (yield fs__default['default'].pathExists(adaptiveCardPath))
+                                            ? ManifestUpdater.getRelativePath(manifestPath, adaptiveCardPath)
+                                            : "";
+                                    }
                                     if (warning) {
                                         warnings.push(warning);
                                     }
@@ -1305,7 +1339,8 @@ class SpecParser {
             allowAPIKeyAuth: false,
             allowMultipleParameters: false,
             allowOauth2: false,
-            isCopilot: false,
+            allowMethods: ["get", "post"],
+            projectType: exports.ProjectType.SME,
         };
         this.pathOrSpec = pathOrDoc;
         this.parser = new SwaggerParser__default['default']();
@@ -1339,7 +1374,7 @@ class SpecParser {
                         ],
                     };
                 }
-                return Utils.validateSpec(this.spec, this.parser, !!this.isSwaggerFile, this.options.allowMissingId, this.options.allowAPIKeyAuth, this.options.allowMultipleParameters, this.options.allowOauth2, this.options.isCopilot);
+                return Utils.validateSpec(this.spec, this.parser, !!this.isSwaggerFile, this.options);
             }
             catch (err) {
                 throw new SpecParserError(err.toString(), exports.ErrorType.ValidateFailed);
@@ -1420,7 +1455,7 @@ class SpecParser {
                 if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                     throw new SpecParserError(ConstantString.CancelledMessage, exports.ErrorType.Cancelled);
                 }
-                const newUnResolvedSpec = SpecFilter.specFilter(filter, this.unResolveSpec, this.spec, this.options.allowMissingId, this.options.allowAPIKeyAuth, this.options.allowMultipleParameters, this.options.allowOauth2, this.options.isCopilot);
+                const newUnResolvedSpec = SpecFilter.specFilter(filter, this.unResolveSpec, this.spec, this.options);
                 if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                     throw new SpecParserError(ConstantString.CancelledMessage, exports.ErrorType.Cancelled);
                 }
@@ -1463,7 +1498,7 @@ class SpecParser {
                 if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                     throw new SpecParserError(ConstantString.CancelledMessage, exports.ErrorType.Cancelled);
                 }
-                const [updatedManifest, apiPlugin] = yield ManifestUpdater.updateManifestWithAiPlugin(manifestPath, outputSpecPath, pluginFilePath, newSpec);
+                const [updatedManifest, apiPlugin] = yield ManifestUpdater.updateManifestWithAiPlugin(manifestPath, outputSpecPath, pluginFilePath, newSpec, this.options);
                 yield fs__default['default'].outputJSON(manifestPath, updatedManifest, { spaces: 2 });
                 yield fs__default['default'].outputJSON(pluginFilePath, apiPlugin, { spaces: 2 });
             }
@@ -1482,9 +1517,8 @@ class SpecParser {
      * @param filter An array of strings that represent the filters to apply when generating the artifacts. If filter is empty, it would process nothing.
      * @param outputSpecPath File path of the new OpenAPI specification file to generate. If not specified or empty, no spec file will be generated.
      * @param adaptiveCardFolder Folder path where the Adaptive Card files will be generated. If not specified or empty, Adaptive Card files will not be generated.
-     * @param isMe Boolean that indicates whether the project is an Messaging Extension. For Messaging Extension, composeExtensions will be added in Teams app manifest.
      */
-    generate(manifestPath, filter, outputSpecPath, adaptiveCardFolder, signal, isMe) {
+    generate(manifestPath, filter, outputSpecPath, adaptiveCardFolder, signal) {
         return __awaiter(this, void 0, void 0, function* () {
             const result = {
                 allSuccess: true,
@@ -1494,23 +1528,23 @@ class SpecParser {
                 const newSpecs = yield this.getFilteredSpecs(filter, signal);
                 const newUnResolvedSpec = newSpecs[0];
                 const newSpec = newSpecs[1];
-                const AuthSet = new Set();
-                let hasMultipleAPIKeyAuth = false;
+                const authSet = new Set();
+                let hasMultipleAuth = false;
                 for (const url in newSpec.paths) {
                     for (const method in newSpec.paths[url]) {
                         const operation = newSpec.paths[url][method];
                         const authArray = Utils.getAuthArray(operation.security, newSpec);
                         if (authArray && authArray.length > 0) {
-                            AuthSet.add(authArray[0][0].authSchema);
-                            if (AuthSet.size > 1) {
-                                hasMultipleAPIKeyAuth = true;
+                            authSet.add(authArray[0][0]);
+                            if (authSet.size > 1) {
+                                hasMultipleAuth = true;
                                 break;
                             }
                         }
                     }
                 }
-                if (hasMultipleAPIKeyAuth) {
-                    throw new SpecParserError(ConstantString.MultipleAPIKeyNotSupported, exports.ErrorType.MultipleAPIKeyNotSupported);
+                if (hasMultipleAuth && this.options.projectType !== exports.ProjectType.TeamsAi) {
+                    throw new SpecParserError(ConstantString.MultipleAuthNotSupported, exports.ErrorType.MultipleAuthNotSupported);
                 }
                 let resultStr;
                 if (outputSpecPath.endsWith(".yaml") || outputSpecPath.endsWith(".yml")) {
@@ -1520,12 +1554,11 @@ class SpecParser {
                     resultStr = JSON.stringify(newUnResolvedSpec, null, 2);
                 }
                 yield fs__default['default'].outputFile(outputSpecPath, resultStr);
-                if (isMe === undefined || isMe === true) {
-                    // Only generate adaptive card for Messaging Extension
+                if (adaptiveCardFolder) {
                     for (const url in newSpec.paths) {
                         for (const method in newSpec.paths[url]) {
-                            // paths object may contain description/summary, so we need to check if it is a operation object
-                            if (method === ConstantString.PostMethod || method === ConstantString.GetMethod) {
+                            // paths object may contain description/summary which is not a http method, so we need to check if it is a operation object
+                            if (this.options.allowMethods.includes(method)) {
                                 const operation = newSpec.paths[url][method];
                                 try {
                                     const [card, jsonPath] = AdaptiveCardGenerator.generateAdaptiveCard(operation);
@@ -1550,8 +1583,8 @@ class SpecParser {
                 if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                     throw new SpecParserError(ConstantString.CancelledMessage, exports.ErrorType.Cancelled);
                 }
-                const auth = Array.from(AuthSet)[0];
-                const [updatedManifest, warnings] = yield ManifestUpdater.updateManifest(manifestPath, outputSpecPath, adaptiveCardFolder, newSpec, this.options.allowMultipleParameters, auth, isMe);
+                const authInfo = Array.from(authSet)[0];
+                const [updatedManifest, warnings] = yield ManifestUpdater.updateManifest(manifestPath, outputSpecPath, newSpec, this.options, adaptiveCardFolder, authInfo);
                 yield fs__default['default'].outputJSON(manifestPath, updatedManifest, { spaces: 2 });
                 result.warnings.push(...warnings);
             }
@@ -1583,7 +1616,7 @@ class SpecParser {
         if (this.apiMap !== undefined) {
             return this.apiMap;
         }
-        const result = Utils.listSupportedAPIs(spec, this.options.allowMissingId, this.options.allowAPIKeyAuth, this.options.allowMultipleParameters, this.options.allowOauth2, this.options.isCopilot);
+        const result = Utils.listSupportedAPIs(spec, this.options);
         this.apiMap = result;
         return result;
     }