From 57d4d614747a45be4d1f309b1b2b1fc1f8066e7f Mon Sep 17 00:00:00 2001 From: Vladimir Ignatov Date: Mon, 14 Jun 2021 13:22:38 -0400 Subject: [PATCH] Clean up #51 --- package-lock.json | 101 ---------------------------------------------- package.json | 1 - src/ScopeSet.js | 10 ++--- src/smart-auth.js | 27 ------------- 4 files changed, 5 insertions(+), 134 deletions(-) delete mode 100644 src/smart-auth.js diff --git a/package-lock.json b/package-lock.json index 3dade6a1..c0b84dca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,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", @@ -818,17 +817,6 @@ "node": ">=6.0.0" } }, - "node_modules/basic-auth": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", - "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "dependencies": { - "safe-buffer": "5.1.2" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", @@ -1764,14 +1752,6 @@ "node": ">=0.4.0" } }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", @@ -4454,34 +4434,6 @@ "node": ">=10" } }, - "node_modules/morgan": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", - "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", - "dependencies": { - "basic-auth": "~2.0.1", - "debug": "2.6.9", - "depd": "~2.0.0", - "on-finished": "~2.3.0", - "on-headers": "~1.0.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/morgan/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/morgan/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, "node_modules/ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -5173,14 +5125,6 @@ "node": ">= 0.8" } }, - "node_modules/on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -8025,14 +7969,6 @@ "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz", "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==" }, - "basic-auth": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", - "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "requires": { - "safe-buffer": "5.1.2" - } - }, "bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", @@ -8769,11 +8705,6 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" - }, "destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", @@ -10900,33 +10831,6 @@ } } }, - "morgan": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", - "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", - "requires": { - "basic-auth": "~2.0.1", - "debug": "2.6.9", - "depd": "~2.0.0", - "on-finished": "~2.3.0", - "on-headers": "~1.0.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -11471,11 +11375,6 @@ "ee-first": "1.1.1" } }, - "on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" - }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", diff --git a/package.json b/package.json index 4f8d56dd..a78ba73e 100644 --- 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 index c458dad7..8bbdc8d0 100644 --- 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 deleted file mode 100644 index 5b1b9950..00000000 --- a/src/smart-auth.js +++ /dev/null @@ -1,27 +0,0 @@ -// @ts-check -const bodyParser = require("body-parser"); -const router = require("express").Router({ mergeParams: true }); -const AuthorizeHandler = require("./AuthorizeHandler"); -const RegistrationHandler = require("./RegistrationHandler"); -const TokenHandler = require("./TokenHandler"); - - -router.get( - "/authorize", - AuthorizeHandler.handleRequest -); - -router.post( - "/token", - bodyParser.urlencoded({ extended: false }), - TokenHandler.handleRequest -); - -// This should handle the client registration used by the back-end services. -router.post( - "/register", - bodyParser.urlencoded({ extended: false }), - RegistrationHandler.handleRequest -); - -module.exports = router; \ No newline at end of file