From cca8ddb5d583825b65841b058155001f372921a0 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Mon, 6 Nov 2017 14:39:21 -0800
Subject: [PATCH 1/9] Add nyc coverage reporting

---
 .gitignore   | 1 +
 package.json | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8c713860..48fbe5ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ node_modules
 .idea
 .deps_check
 .DS_Store
+.nyc_output
 npm-debug.log*
 .eslintcache
 package-lock.json
diff --git a/package.json b/package.json
index b406256c..396f219c 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "test-in-node": "npm run lint-errors && npm run just-test-in-node",
     "just-test": "karma start --config karma.conf.js",
     "just-test-in-node": "mocha --recursive --compilers js:babel-core/register test/core test/components test/bugs test/swagger-ui-dist-package test/xss",
+    "just-check-coverage": "nyc npm run just-test-in-node",
     "test-e2e": "sleep 3 && nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json",
     "e2e-initial-render": "nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json --group initial-render",
     "mock-api": "json-server --watch test/e2e/db.json --port 3204",
@@ -152,5 +153,9 @@
   ],
   "optionalDependencies": {
     "webpack-dev-server": "2.5.0"
+  },
+  "nyc": {
+    "all": true,
+    "include": ["**/src/core/plugins/**.js"]
   }
 }

From 21bf5919a91041f48825c309e6a491e18c38b1c7 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Mon, 6 Nov 2017 20:42:47 -0800
Subject: [PATCH 2/9] Rewire AuthorizeOperationBtn; create new selector for
 filtering definitions

---
 .../auth/authorize-operation-btn.jsx          | 28 +++++++------------
 src/core/components/operation.jsx             | 11 ++++++--
 src/core/plugins/auth/selectors.js            |  7 +++++
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/core/components/auth/authorize-operation-btn.jsx b/src/core/components/auth/authorize-operation-btn.jsx
index 7c2f2448..760bac2a 100644
--- a/src/core/components/auth/authorize-operation-btn.jsx
+++ b/src/core/components/auth/authorize-operation-btn.jsx
@@ -1,25 +1,23 @@
 import React from "react"
 import PropTypes from "prop-types"
-import ImPropTypes from "react-immutable-proptypes"
 
 export default class AuthorizeOperationBtn extends React.Component {
+    static propTypes = {
+      isAuthorized: PropTypes.bool.isRequired,
+      onClick: PropTypes.func
+    }
+
   onClick =(e) => {
     e.stopPropagation()
+    let { onClick } = this.props
 
-    let { security, authActions, authSelectors } = this.props
-    let definitions = authSelectors.getDefinitionsByNames(security)
-
-    authActions.showDefinitions(definitions)
+    if(onClick) {
+      onClick()
+    }
   }
 
   render() {
-    let { security, authSelectors } = this.props
-
-    let isAuthorized = authSelectors.isAuthorized(security)
-
-    if(isAuthorized === null) {
-      return null
-    }
+    let { isAuthorized } = this.props
 
     return (
       <button className={isAuthorized ? "authorization__btn locked" : "authorization__btn unlocked"} onClick={ this.onClick }>
@@ -30,10 +28,4 @@ export default class AuthorizeOperationBtn extends React.Component {
 
     )
   }
-
-  static propTypes = {
-    authSelectors: PropTypes.object.isRequired,
-    authActions: PropTypes.object.isRequired,
-    security: ImPropTypes.iterable.isRequired
-  }
 }
diff --git a/src/core/components/operation.jsx b/src/core/components/operation.jsx
index c3210ddf..23ec2108 100644
--- a/src/core/components/operation.jsx
+++ b/src/core/components/operation.jsx
@@ -1,4 +1,5 @@
 import React, { PureComponent } from "react"
+import { List } from "immutable"
 import PropTypes from "prop-types"
 import { getList } from "core/utils"
 import * as CustomPropTypes from "core/proptypes"
@@ -183,9 +184,13 @@ export default class Operation extends PureComponent {
 
             {
               (!security || !security.count()) ? null :
-                <AuthorizeOperationBtn authActions={ authActions }
-                  security={ security }
-                  authSelectors={ authSelectors }/>
+                <AuthorizeOperationBtn
+                  isAuthorized={ authSelectors.isAuthorized(security) }
+                  onClick={() => {
+                    const applicableDefinitions = authSelectors.definitionsForRequirements(security)
+                    authActions.showDefinitions(applicableDefinitions)
+                  }}
+                />
             }
           </div>
 
diff --git a/src/core/plugins/auth/selectors.js b/src/core/plugins/auth/selectors.js
index 6e3b17b0..5da2dc95 100644
--- a/src/core/plugins/auth/selectors.js
+++ b/src/core/plugins/auth/selectors.js
@@ -58,6 +58,13 @@ export const getDefinitionsByNames = ( state, securities ) => ( { specSelectors
   return result
 }
 
+export const definitionsForRequirements = (state, securities) => ({ authSelectors }) => {
+  const allDefinitions = authSelectors.definitionsToAuthorize()
+  return allDefinitions.filter((def, name) => {
+    return securities.has(name)
+  })
+}
+
 export const authorized = createSelector(
     state,
     auth => auth.get("authorized") || Map()

From 86db21515e42d67b3c35cb42b67cdb8283124103 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Mon, 6 Nov 2017 21:01:46 -0800
Subject: [PATCH 3/9] Save `nyc` as a devDependency

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 396f219c..dd30067d 100644
--- a/package.json
+++ b/package.json
@@ -128,6 +128,7 @@
     "node-sass": "^4.5.0",
     "npm-run-all": "4.0.2",
     "null-loader": "0.1.1",
+    "nyc": "^11.3.0",
     "open": "0.0.5",
     "postcss-loader": "2.0.6",
     "raw-loader": "0.5.1",
@@ -156,6 +157,8 @@
   },
   "nyc": {
     "all": true,
-    "include": ["**/src/core/plugins/**.js"]
+    "include": [
+      "**/src/core/plugins/**.js"
+    ]
   }
 }

From cfc030d07d4d10bc775f9198ca32625bbb21c230 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Mon, 6 Nov 2017 21:10:30 -0800
Subject: [PATCH 4/9] Rework filtering logic for definitionsForRequirements

---
 src/core/plugins/auth/selectors.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/plugins/auth/selectors.js b/src/core/plugins/auth/selectors.js
index 5da2dc95..9a91d3c1 100644
--- a/src/core/plugins/auth/selectors.js
+++ b/src/core/plugins/auth/selectors.js
@@ -58,10 +58,10 @@ export const getDefinitionsByNames = ( state, securities ) => ( { specSelectors
   return result
 }
 
-export const definitionsForRequirements = (state, securities) => ({ authSelectors }) => {
-  const allDefinitions = authSelectors.definitionsToAuthorize()
-  return allDefinitions.filter((def, name) => {
-    return securities.has(name)
+export const definitionsForRequirements = (state, securities = List()) => ({ authSelectors }) => {
+  const allDefinitions = authSelectors.definitionsToAuthorize() || List()
+  return allDefinitions.filter((def) => {
+    return securities.some(sec => sec.get(def.keySeq().first()))
   })
 }
 

From ed34a8dae9b9302eb4e7ba3505960c3bb2e46e80 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Mon, 6 Nov 2017 21:24:16 -0800
Subject: [PATCH 5/9] Linter: Remove unused import

---
 src/core/components/operation.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/components/operation.jsx b/src/core/components/operation.jsx
index 23ec2108..d1cc6786 100644
--- a/src/core/components/operation.jsx
+++ b/src/core/components/operation.jsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from "react"
-import { List } from "immutable"
 import PropTypes from "prop-types"
 import { getList } from "core/utils"
 import * as CustomPropTypes from "core/proptypes"

From 533fd75501cb2a90b69fb78e3fdffbdfe5b5256e Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Mon, 6 Nov 2017 21:53:57 -0800
Subject: [PATCH 6/9] Deprecate authSelectors.getDefinitionsByNames

---
 src/core/plugins/auth/selectors.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/plugins/auth/selectors.js b/src/core/plugins/auth/selectors.js
index 9a91d3c1..a8bd0ce1 100644
--- a/src/core/plugins/auth/selectors.js
+++ b/src/core/plugins/auth/selectors.js
@@ -28,6 +28,7 @@ export const definitionsToAuthorize = createSelector(
 
 
 export const getDefinitionsByNames = ( state, securities ) => ( { specSelectors } ) => {
+  console.warn("WARNING: getDefinitionsByNames is deprecated and will be removed in the next major version.")
   let securityDefinitions = specSelectors.securityDefinitions()
   let result = List()
 

From 3536f2d51824b6e0887dc677aff7a91ea16903ae Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Mon, 6 Nov 2017 22:08:42 -0800
Subject: [PATCH 7/9] Add tests for modified selectors

---
 test/core/plugins/auth/selectors.js | 133 ++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 test/core/plugins/auth/selectors.js

diff --git a/test/core/plugins/auth/selectors.js b/test/core/plugins/auth/selectors.js
new file mode 100644
index 00000000..99ad9c50
--- /dev/null
+++ b/test/core/plugins/auth/selectors.js
@@ -0,0 +1,133 @@
+/* eslint-env mocha */
+import expect from "expect"
+import { fromJS } from "immutable"
+import { definitionsToAuthorize, definitionsForRequirements } from "corePlugins/auth/selectors"
+
+describe.only("auth plugin - selectors", () => {
+  describe("definitionsToAuthorize", () => {
+    it("should return securityDefinitions as a List", () => {
+      const securityDefinitions = {
+        "petstore_auth": {
+          "type": "oauth2",
+          "authorizationUrl": "http://petstore.swagger.io/oauth/dialog",
+          "flow": "implicit",
+          "scopes": {
+            "write:pets": "modify pets in your account",
+            "read:pets": "read your pets"
+          }
+        },
+        "api_key": {
+          "type": "apiKey",
+          "name": "api_key",
+          "in": "header"
+        }
+      }
+
+      const system = {
+        specSelectors: {
+          securityDefinitions() {
+            return fromJS(securityDefinitions)
+          }
+        }
+      }
+
+      const res = definitionsToAuthorize({})(system)
+
+      expect(res.toJS()).toEqual([
+        {
+          "petstore_auth": securityDefinitions["petstore_auth"]
+        },
+        {
+          "api_key": securityDefinitions["api_key"]
+        },
+      ])
+    })
+
+    it("should fail gracefully with bad data", () => {
+      const securityDefinitions = null
+
+      const system = {
+        specSelectors: {
+          securityDefinitions() {
+            return fromJS(securityDefinitions)
+          }
+        }
+      }
+
+      const res = definitionsToAuthorize({})(system)
+
+      expect(res.toJS()).toEqual([])
+    })
+  })
+
+  describe("definitionsForRequirements", () => {
+    it("should return applicable securityDefinitions as a List", () => {
+      const securityDefinitions = {
+        "petstore_auth": {
+          "type": "oauth2",
+          "authorizationUrl": "http://petstore.swagger.io/oauth/dialog",
+          "flow": "implicit",
+          "scopes": {
+            "write:pets": "modify pets in your account",
+            "read:pets": "read your pets"
+          }
+        },
+        "api_key": {
+          "type": "apiKey",
+          "name": "api_key",
+          "in": "header"
+        }
+      }
+
+      const system = {
+        authSelectors: {
+          definitionsToAuthorize() {
+            return fromJS([
+              {
+                "petstore_auth": securityDefinitions["petstore_auth"]
+              },
+              {
+                "api_key": securityDefinitions["api_key"]
+              },
+            ])
+          }
+        }
+      }
+
+      const securities = fromJS([
+        {
+          "petstore_auth": [
+            "write:pets",
+            "read:pets"
+          ]
+        }
+      ])
+
+      const res = definitionsForRequirements({}, securities)(system)
+
+      expect(res.toJS()).toEqual([
+        {
+          "petstore_auth": securityDefinitions["petstore_auth"]
+        }
+      ])
+    })
+
+    it("should fail gracefully with bad data", () => {
+      const securityDefinitions = null
+
+      const system = {
+        authSelectors: {
+          definitionsToAuthorize() {
+            return null
+          }
+        }
+      }
+
+      const securities = null
+
+      const res = definitionsForRequirements({}, securities)(system)
+
+      expect(res.toJS()).toEqual([])
+    })
+  })
+})

From 8f7b582f958e54e5abaae2b545a0ea06c2c5e774 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Mon, 6 Nov 2017 22:09:20 -0800
Subject: [PATCH 8/9] Improve junk data handling

---
 src/core/plugins/auth/selectors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/plugins/auth/selectors.js b/src/core/plugins/auth/selectors.js
index a8bd0ce1..53729449 100644
--- a/src/core/plugins/auth/selectors.js
+++ b/src/core/plugins/auth/selectors.js
@@ -11,7 +11,7 @@ export const shownDefinitions = createSelector(
 export const definitionsToAuthorize = createSelector(
     state,
     () => ( { specSelectors } ) => {
-      let definitions = specSelectors.securityDefinitions()
+      let definitions = specSelectors.securityDefinitions() || Map({})
       let list = List()
 
       //todo refactor

From 531d0337acae6a5bb89dff2b3731893cc385e899 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Mon, 6 Nov 2017 22:13:29 -0800
Subject: [PATCH 9/9] Remove describe.only

---
 test/core/plugins/auth/selectors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/core/plugins/auth/selectors.js b/test/core/plugins/auth/selectors.js
index 99ad9c50..a8234a19 100644
--- a/test/core/plugins/auth/selectors.js
+++ b/test/core/plugins/auth/selectors.js
@@ -3,7 +3,7 @@ import expect from "expect"
 import { fromJS } from "immutable"
 import { definitionsToAuthorize, definitionsForRequirements } from "corePlugins/auth/selectors"
 
-describe.only("auth plugin - selectors", () => {
+describe("auth plugin - selectors", () => {
   describe("definitionsToAuthorize", () => {
     it("should return securityDefinitions as a List", () => {
       const securityDefinitions = {