@microsoft/m365-spec-parser 0.2.4-alpha.5577464e2.0 → 0.2.4-alpha.59a7e76c4.0

package/dist/index.esm2017.mjs

@@ -5,6 +5,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import { ManifestUtil } from '@microsoft/teams-manifest';
 import { createHash } from 'crypto';
+import { $RefParser } from '@apidevtools/json-schema-ref-parser';
 
 // Copyright (c) Microsoft Corporation.
 /**
@@ -126,6 +127,7 @@ ConstantString.ResponseCodeFor20X = [
     "207",
     "208",
     "226",
+    "2XX",
     "default",
 ];
 ConstantString.AllOperationMethods = [
@@ -203,6 +205,9 @@ class Utils {
     static isAPIKeyAuth(authScheme) {
         return authScheme.type === "apiKey";
     }
+    static isAPIKeyAuthButNotInCookie(authScheme) {
+        return authScheme.type === "apiKey" && authScheme.in !== "cookie";
+    }
     static isOAuthWithAuthCodeFlow(authScheme) {
         return !!(authScheme.type === "oauth2" &&
             authScheme.flows &&
@@ -218,7 +223,8 @@ class Utils {
         for (const auths of authSchemeArray) {
             if (auths.length === 1) {
                 if (Utils.isOAuthWithAuthCodeFlow(auths[0].authScheme) ||
-                    Utils.isBearerTokenAuth(auths[0].authScheme)) {
+                    Utils.isBearerTokenAuth(auths[0].authScheme) ||
+                    Utils.isAPIKeyAuthButNotInCookie(auths[0].authScheme)) {
                     return false;
                 }
             }
@@ -1836,7 +1842,8 @@ class ManifestUpdater {
                                     key = "OAuthPluginVault";
                                     authName = authInfo.name;
                                 }
-                                else if (Utils.isBearerTokenAuth(authInfo.authScheme)) {
+                                else if (Utils.isBearerTokenAuth(authInfo.authScheme) ||
+                                    Utils.isAPIKeyAuthButNotInCookie(authInfo.authScheme)) {
                                     key = "ApiKeyPluginVault";
                                     authName = authInfo.name;
                                 }
@@ -2096,6 +2103,7 @@ class SpecParser {
         };
         this.pathOrSpec = pathOrDoc;
         this.parser = new SwaggerParser();
+        this.refParser = new $RefParser();
         this.options = Object.assign(Object.assign({}, this.defaultOptions), (options !== null && options !== void 0 ? options : {}));
     }
     /**
@@ -2108,12 +2116,15 @@ class SpecParser {
             let hash = "";
             try {
                 await this.loadSpec();
-                if (!this.parser.$refs.circular) {
+                if (!this.refParser.$refs.circular) {
                     await this.parser.validate(this.spec);
                 }
                 else {
+                    // The following code hangs for Graph API, support will be added when SwaggerParser is updated.
+                    /*
                     const clonedUnResolveSpec = JSON.parse(JSON.stringify(this.unResolveSpec));
                     await this.parser.validate(clonedUnResolveSpec);
+                    */
                 }
             }
             catch (e) {
@@ -2141,7 +2152,7 @@ class SpecParser {
                 };
             }
             // Remote reference not supported
-            const refPaths = this.parser.$refs.paths();
+            const refPaths = this.refParser.$refs.paths();
             // refPaths [0] is the current spec file path
             if (refPaths.length > 1) {
                 errors.push({
@@ -2270,7 +2281,7 @@ class SpecParser {
                 throw new SpecParserError(ConstantString.CancelledMessage, ErrorType.Cancelled);
             }
             const clonedUnResolveSpec = JSON.parse(JSON.stringify(newUnResolvedSpec));
-            const newSpec = (await this.parser.dereference(clonedUnResolveSpec));
+            const newSpec = await this.deReferenceSpec(clonedUnResolveSpec);
             return [newUnResolvedSpec, newSpec];
         }
         catch (err) {
@@ -2280,6 +2291,10 @@ class SpecParser {
             throw new SpecParserError(err.toString(), ErrorType.GetSpecFailed);
         }
     }
+    async deReferenceSpec(spec) {
+        const result = await this.refParser.dereference(spec);
+        return result;
+    }
     /**
      * Generates and update artifacts from the OpenAPI specification file. Generate Adaptive Cards, update Teams app manifest, and generate a new OpenAPI specification file.
      * @param manifestPath A file path of the Teams app manifest file to update.
@@ -2420,7 +2435,7 @@ class SpecParser {
                 this.isSwaggerFile = true;
             }
             const clonedUnResolveSpec = JSON.parse(JSON.stringify(this.unResolveSpec));
-            this.spec = (await this.parser.dereference(clonedUnResolveSpec));
+            this.spec = await this.deReferenceSpec(clonedUnResolveSpec);
         }
     }
     getAPIs(spec) {