Clean up #51

smart-on-fhir · Jun 14, 2021 · 57d4d61 · 57d4d61
1 parent 101eaca
commit 57d4d61
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 134 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,7 +34,6 @@
     "express": "^4.17.1",
     "jsonwebtoken": "^8.5.1",
     "jwk-to-pem": "^1.2.6",
-    "morgan": "^1.10.0",
     "node-jose": "^2.0.0",
     "pem": "^1.14.4",
     "pem-jwk": "^1.5.1",

diff --git a/src/ScopeSet.js b/src/ScopeSet.js
@@ -1,3 +1,5 @@
+const config = require("./config");
+
 /**
  * This class tries to make it easier and cleaner to work with scopes (mostly by
  * using the two major methods - "has" and "matches").
@@ -24,7 +26,7 @@ class ScopeSet
 
     /**
      * Checks if there is a scope that matches by RegExp the given string
-     * @param {RegExp} scope The pattern to look for
+     * @param {RegExp} scopeRegExp The pattern to look for
      * @returns {Boolean} 
      */
     matches(scopeRegExp) {
@@ -90,10 +92,8 @@ class ScopeSet
         if (!scopes) {
             return config.errors.missing_scope;
         }
-
-        scopes = scopes.split(/\s+/);
-
-        return scopes.find(s => !(
+
+        return scopes.split(/\s+/).find(s => !(
             /^system\/(\*|[A-Z][a-zA-Z]+)(\.(read|write|\*))?$/.test(s)
         )) || "";
     }

diff --git a/src/smart-auth.js b/src/smart-auth.js