Make oas.prepareSecurity() work for && and || cases

https://github.com/readmeio/api-explorer/issues/44

packages/api-explorer-ui/__tests__/fixtures/multiple-securities/oas.json

@@ -14,6 +14,25 @@
         }]
       }
     },
+    "/and-security": {
+      "post": {
+        "security": [{
+          "oauth": ["write:things"],
+          "apiKey": []
+        }]
+      }
+    },
+    "/and-or-security": {
+      "post": {
+        "security": [{
+          "oauth": ["write:things"],
+          "apiKey": []
+        },
+        {
+          "oauthDiff": ["write:things"]
+        }]
+      }
+    },
     "/single-auth": {
       "post": {
         "security": [{

packages/api-explorer-ui/__tests__/lib/Oas.test.js

@@ -139,12 +139,25 @@ describe('operation.prepareSecurity()', () => {
     expect(operation.prepareSecurity()).toMatchSnapshot();
   });
 
-  test('should work for multiple securities', () => {
+  test('should work for multiple securities (||)', () => {
     const operation = new Oas(multipleSecurities).operation('/things', 'post');
 
     expect(Object.keys(operation.prepareSecurity()).length).toBe(2);
   });
 
+  test('should work for multiple securities (&&)', () => {
+    const operation = new Oas(multipleSecurities).operation('/and-security', 'post');
+
+    expect(Object.keys(operation.prepareSecurity()).length).toBe(2);
+  });
+
+  test('should work for multiple securities (&& and ||)', () => {
+    const operation = new Oas(multipleSecurities).operation('/and-or-security', 'post');
+
+    expect(operation.prepareSecurity().OAuth2.length).toBe(2);
+    expect(operation.prepareSecurity().Header.length).toBe(1);
+  });
+
   test('should set a `key` property');
 
   // TODO We dont currently support cookies?

packages/api-explorer-ui/src/lib/Oas.js

@@ -22,34 +22,44 @@ class Operation {
 
     return securityRequirements
       .map(requirement => {
-        let security;
-        let key;
+        let keys;
         try {
-          key = Object.keys(requirement)[0];
-          security = this.oas.components.securitySchemes[key];
+          keys = Object.keys(requirement);
         } catch (e) {
           return false;
         }
 
-        if (!security) return false;
-        let type = security.type;
-        if (security.type === 'http' && security.scheme === 'basic') {
-          type = 'Basic';
-        } else if (security.type === 'oauth2') {
-          type = 'OAuth2';
-        } else if (security.type === 'apiKey' && security.in === 'query') {
-          type = 'Query';
-        } else if (security.type === 'apiKey' && security.in === 'header') {
-          type = 'Header';
-        }
+        return keys.map((key) => {
+          let security;
+          try {
+            security = this.oas.components.securitySchemes[key];
+          } catch (e) {
+            return false;
+          }
+
+          if (!security) return false;
+          let type = security.type;
+          if (security.type === 'http' && security.scheme === 'basic') {
+            type = 'Basic';
+          } else if (security.type === 'oauth2') {
+            type = 'OAuth2';
+          } else if (security.type === 'apiKey' && security.in === 'query') {
+            type = 'Query';
+          } else if (security.type === 'apiKey' && security.in === 'header') {
+            type = 'Header';
+          }
+
+          security._key = key;
 
-        security._key = key;
-        return { type, security };
+          return { type, security };
+        });
       })
       .filter(Boolean)
-      .reduce((prev, next) => {
-        if (!prev[next.type]) prev[next.type] = [];
-        prev[next.type].push(next.security);
+      .reduce((prev, securities) => {
+        securities.forEach((security) => {
+          if (!prev[security.type]) prev[security.type] = [];
+          prev[security.type].push(security.security);
+        });
         return prev;
       }, {});
   }