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

package/dist/index.node.cjs.js

@@ -9,6 +9,7 @@ var fs = require('fs-extra');
 var path = require('path');
 var teamsManifest = require('@microsoft/teams-manifest');
 var crypto = require('crypto');
+var jsonSchemaRefParser = require('@apidevtools/json-schema-ref-parser');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -168,6 +169,7 @@ ConstantString.ResponseCodeFor20X = [
     "207",
     "208",
     "226",
+    "2XX",
     "default",
 ];
 ConstantString.AllOperationMethods = [
@@ -245,6 +247,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 &&
@@ -260,7 +265,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;
                 }
             }
@@ -1881,7 +1887,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;
                                     }
@@ -2146,6 +2153,7 @@ class SpecParser {
         };
         this.pathOrSpec = pathOrDoc;
         this.parser = new SwaggerParser__default['default']();
+        this.refParser = new jsonSchemaRefParser.$RefParser();
         this.options = Object.assign(Object.assign({}, this.defaultOptions), (options !== null && options !== void 0 ? options : {}));
     }
     /**
@@ -2159,12 +2167,15 @@ class SpecParser {
                 let hash = "";
                 try {
                     yield this.loadSpec();
-                    if (!this.parser.$refs.circular) {
+                    if (!this.refParser.$refs.circular) {
                         yield 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));
-                        yield this.parser.validate(clonedUnResolveSpec);
+                        await this.parser.validate(clonedUnResolveSpec);
+                        */
                     }
                 }
                 catch (e) {
@@ -2192,7 +2203,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({
@@ -2327,7 +2338,7 @@ class SpecParser {
                     throw new SpecParserError(ConstantString.CancelledMessage, exports.ErrorType.Cancelled);
                 }
                 const clonedUnResolveSpec = JSON.parse(JSON.stringify(newUnResolvedSpec));
-                const newSpec = (yield this.parser.dereference(clonedUnResolveSpec));
+                const newSpec = yield this.deReferenceSpec(clonedUnResolveSpec);
                 return [newUnResolvedSpec, newSpec];
             }
             catch (err) {
@@ -2338,6 +2349,12 @@ class SpecParser {
             }
         });
     }
+    deReferenceSpec(spec) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield 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.
@@ -2483,7 +2500,7 @@ class SpecParser {
                     this.isSwaggerFile = true;
                 }
                 const clonedUnResolveSpec = JSON.parse(JSON.stringify(this.unResolveSpec));
-                this.spec = (yield this.parser.dereference(clonedUnResolveSpec));
+                this.spec = yield this.deReferenceSpec(clonedUnResolveSpec);
             }
         });
     }