From 56dda06c0d81aa3c2cfcb391fbb9f98d43d0d5d1 Mon Sep 17 00:00:00 2001 From: David Luecke Date: Fri, 7 Jun 2019 11:57:02 -0700 Subject: [PATCH] Upgrade to Feathers v4 using upgrade command --- config/default.json | 12 +- package-lock.json | 622 ++++++++++++++++++++---------- package.json | 15 +- public/jquery/index.html | 2 +- public/vanilla/index.html | 2 +- src/authentication.js | 32 +- src/services/users/users.hooks.js | 6 +- 7 files changed, 453 insertions(+), 238 deletions(-) diff --git a/config/default.json b/config/default.json index ebc46f88..e1f60de4 100644 --- a/config/default.json +++ b/config/default.json @@ -8,25 +8,23 @@ }, "nedb": "../data", "authentication": { - "secret": "72d5461502f978d28c44dec474ff08359386df227269f34a17fc7d160f275a7dc8366087f72e3e3246e5d3dcb5a3505c2248d0f977d79dd1ca874c0cb4e9bd75f4ce1ccfc4604040afb37633f0e76cb3a254e974ff1872ee7edccecf2cac84b652d5f9a12e0bc4ae75ae5d628102f663681e716b9c0e6f262541f186ec9ca004604491fe05882206692f8e8653d578eac161d69cd14f51986ace729695fd2e551597f599eb54816c6e706dc4af478a826c890ad90e03105bf0c2d36461799888481104d3ee274cdfe87728ff5692699d143af078ed890e6d9971097088884f6d616b8c2abaf06671ad12746bb2353ca354c41c1427b76353dc72c9e47d45e2f6", - "strategies": [ + "entity": "user", + "service": "users", + "secret": "x6T4kaQHQE3/0s4qyMppajQGYAk=", + "authStrategies": [ "jwt", "local" ], - "path": "/authentication", - "service": "users", - "jwt": { + "jwtOptions": { "header": { "typ": "access" }, "audience": "https://yourdomain.com", - "subject": "anonymous", "issuer": "feathers", "algorithm": "HS256", "expiresIn": "1d" }, "local": { - "entity": "user", "usernameField": "email", "passwordField": "password" } diff --git a/package-lock.json b/package-lock.json index 2999bff3..be8c8894 100644 --- a/package-lock.json +++ b/package-lock.json @@ -118,26 +118,28 @@ "requires": { "@feathersjs/commons": "^4.0.0", "@feathersjs/errors": "^3.3.6" + }, + "dependencies": { + "@feathersjs/errors": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@feathersjs/errors/-/errors-3.3.6.tgz", + "integrity": "sha512-VCohY/AQU13xYyZGl6rfdUgE+2bjaI76a4aEb6reIphHKgb4mnjYlg2PzS1/hcU1qUNi515kY9yQa5HsE7J1dQ==", + "requires": { + "debug": "^4.0.0" + } + } } }, "@feathersjs/authentication": { - "version": "2.1.16", - "resolved": "https://registry.npmjs.org/@feathersjs/authentication/-/authentication-2.1.16.tgz", - "integrity": "sha512-TZ9rUySi8/aatHPuL1e9GUHFT/VXz14UInE9aJ1lOShTKG1OkfTaYLxjZ8i0glZkNJXkf2jwGPqXahVbGdCsFQ==", + "version": "4.0.0-pre.3", + "resolved": "https://registry.npmjs.org/@feathersjs/authentication/-/authentication-4.0.0-pre.3.tgz", + "integrity": "sha512-ttH7CAF1I5/J3ICPTHkb8th3mNvNkbQSrWPeT+PlgPCOQY9HrJOaYrs+K60VhP4ccD9sN2IgKpbKwbT64MBEgw==", "requires": { - "@feathersjs/commons": "^4.0.0", - "@feathersjs/errors": "^3.3.6", - "@feathersjs/socket-commons": "^3.1.2", - "debug": "^4.0.0", - "jsonwebtoken": "^8.0.0", - "lodash.clone": "^4.5.0", - "lodash.merge": "^4.6.0", - "lodash.omit": "^4.5.0", - "lodash.pick": "^4.4.0", - "long-timeout": "^0.1.1", - "ms": "^2.0.0", - "passport": "^0.4.0", - "uuid": "^3.1.0" + "@feathersjs/errors": "^4.0.0-pre.3", + "debug": "^4.1.1", + "jsonwebtoken": "^8.5.1", + "lodash": "^4.17.11", + "uuid": "^3.3.2" } }, "@feathersjs/authentication-jwt": { @@ -151,18 +153,42 @@ "lodash.omit": "^4.5.0", "lodash.pick": "^4.4.0", "passport-jwt": "^4.0.0" + }, + "dependencies": { + "@feathersjs/errors": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@feathersjs/errors/-/errors-3.3.6.tgz", + "integrity": "sha512-VCohY/AQU13xYyZGl6rfdUgE+2bjaI76a4aEb6reIphHKgb4mnjYlg2PzS1/hcU1qUNi515kY9yQa5HsE7J1dQ==", + "requires": { + "debug": "^4.0.0" + } + } } }, "@feathersjs/authentication-local": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/@feathersjs/authentication-local/-/authentication-local-1.2.9.tgz", - "integrity": "sha512-EqUuUgiULpfe46oprIeHkY4CjlWIT+abtMnVOOeRmaJTPRDnPe72wJoQ3jomSTJpr7KARkWog6sAUZa+NMC3UA==", + "version": "4.0.0-pre.3", + "resolved": "https://registry.npmjs.org/@feathersjs/authentication-local/-/authentication-local-4.0.0-pre.3.tgz", + "integrity": "sha512-PyByUqW5Qf1/qAk7DrsVEYwHSzLoYLzz5dRwfZNjnb3m60pcG3wwX75J1qiu/5+NS4nJH75fiAtcBhMnVTCQmw==", "requires": { - "@feathersjs/errors": "^3.3.6", - "bcryptjs": "^2.3.0", - "debug": "^4.0.0", - "lodash": "^4.17.5", - "passport-local": "^1.0.0" + "@feathersjs/errors": "^4.0.0-pre.3", + "bcryptjs": "^2.4.3", + "debug": "^4.1.1", + "lodash": "^4.17.11" + } + }, + "@feathersjs/authentication-oauth": { + "version": "4.0.0-pre.3", + "resolved": "https://registry.npmjs.org/@feathersjs/authentication-oauth/-/authentication-oauth-4.0.0-pre.3.tgz", + "integrity": "sha512-5PdSEZQHuC58VUTR/PdO1G/D5ra++1JpHtOHBjbJRIUc/rRK1SMQnX6qy6HOtKocPC3NDjXvmVt5M8HZkG2s4g==", + "requires": { + "@feathersjs/authentication": "^4.0.0-pre.3", + "@feathersjs/errors": "^4.0.0-pre.3", + "@feathersjs/express": "^4.0.0-pre.3", + "debug": "^4.1.1", + "express-session": "^1.16.1", + "grant": "^4.5.2", + "grant-profile": "^0.0.3", + "lodash": "^4.17.11" } }, "@feathersjs/commons": { @@ -171,75 +197,56 @@ "integrity": "sha512-hyCLse4RiNt7WLPQ0KSudjoVnwiRykhYzIZdtDon9i2usPaoYkFw/fEYZrkE5HVB+sUTwphZoZ1oOntRk1MShg==" }, "@feathersjs/configuration": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@feathersjs/configuration/-/configuration-2.0.6.tgz", - "integrity": "sha512-0MnbvbmCqr5o7cijCDejO2QsJybnGZmnQMNVZ05c50fQl35mldNex512Pt1qDqLY7oLfJZOLySJS0rbrkm4lIg==", + "version": "4.0.0-pre.3", + "resolved": "https://registry.npmjs.org/@feathersjs/configuration/-/configuration-4.0.0-pre.3.tgz", + "integrity": "sha512-N6uLp3R8cYjOpKo7pc/XSR2g4e04nAkjIo9QSKQQiYuYf6zNarWEKfDKidrtDq8xSmJjQu2ZIVRVCHYD7CmNcA==", "requires": { - "config": "^3.0.0", - "debug": "^4.0.0" + "config": "^3.1.0", + "debug": "^4.1.1" } }, "@feathersjs/errors": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/@feathersjs/errors/-/errors-3.3.6.tgz", - "integrity": "sha512-VCohY/AQU13xYyZGl6rfdUgE+2bjaI76a4aEb6reIphHKgb4mnjYlg2PzS1/hcU1qUNi515kY9yQa5HsE7J1dQ==", + "version": "4.0.0-pre.3", + "resolved": "https://registry.npmjs.org/@feathersjs/errors/-/errors-4.0.0-pre.3.tgz", + "integrity": "sha512-G3PphkTfr4u0nflE7+kh0cwYaoiz7lSl6t06jQPlZTTqyx8ahonQfUB4Q3fcLrjEBQnP0MS11IeLobJhz1I8GQ==", "requires": { - "debug": "^4.0.0" + "debug": "^4.1.1" } }, "@feathersjs/express": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@feathersjs/express/-/express-1.3.1.tgz", - "integrity": "sha512-7Bj3pWj0/p2G5bpK9+0b4D9SR6LnpDxkWQcrkFQrHuMuiuPMZlnxfVgNogUUj5CaKNAKiRpXe+g/qwQGw60J6A==", + "version": "4.0.0-pre.3", + "resolved": "https://registry.npmjs.org/@feathersjs/express/-/express-4.0.0-pre.3.tgz", + "integrity": "sha512-nLQOlSMn2816MVuiPSGyX66/RhdVgWPBm1a7plWITOzdc4KworlxYz9MuV9H3GzZHmVX1W6cmlbejBE0ZuhLZg==", "requires": { - "@feathersjs/commons": "^4.0.0", - "@feathersjs/errors": "^3.3.6", - "debug": "^4.0.0", - "express": "^4.16.2", - "uberproto": "^2.0.0" + "@feathersjs/commons": "^4.0.0-pre.3", + "@feathersjs/errors": "^4.0.0-pre.3", + "@types/express": "^4.16.1", + "debug": "^4.1.1", + "express": "^4.17.1", + "uberproto": "^2.0.4" } }, "@feathersjs/feathers": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@feathersjs/feathers/-/feathers-3.3.1.tgz", - "integrity": "sha512-Mb7Maz03TIIksomXeInmXNb5ykxgsAyBCuJDQHK+oIDrDRR9m+ZbUrslCkMk/s0nr6cW5DmVbWz9s11SCXFW5A==", + "version": "4.0.0-pre.3", + "resolved": "https://registry.npmjs.org/@feathersjs/feathers/-/feathers-4.0.0-pre.3.tgz", + "integrity": "sha512-ljy8sso93m3ULOZwW38mp+fkx5XtIWb5qFsZEsmdNikTr8UL8G5wOGtCH7EpMMfhGWAobUC2YwN94j8E8SwV5Q==", "requires": { - "@feathersjs/commons": "^4.0.0", - "debug": "^4.0.0", + "@feathersjs/commons": "^4.0.0-pre.3", + "debug": "^4.1.1", "events": "^3.0.0", - "uberproto": "^2.0.2" - } - }, - "@feathersjs/socket-commons": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@feathersjs/socket-commons/-/socket-commons-3.1.5.tgz", - "integrity": "sha512-cnMqVNGR0fOM00UqRmslmPiUZ2UKToTxesoGwZvhvq4unF032KzS4gz8bZ7qYsin9HmAP/E2gs2v0119CR7LKQ==", - "requires": { - "@feathersjs/errors": "^3.0.0", - "debug": "^3.1.0", - "lodash": "^4.17.4", - "url-pattern": "^1.0.3" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - } + "uberproto": "^2.0.4" } }, "@feathersjs/socketio": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/@feathersjs/socketio/-/socketio-3.2.9.tgz", - "integrity": "sha512-p2TeRedG6mnwYuoah3xiOFOaTLCmLtZQo6K8H4S75NbKMGP66XVaQEAGCRlCSRD+JlBmIin9G/bgaqNhU7mZ/g==", + "version": "4.0.0-pre.3", + "resolved": "https://registry.npmjs.org/@feathersjs/socketio/-/socketio-4.0.0-pre.3.tgz", + "integrity": "sha512-XLhjcguu++me1rAxLiZdsmQZypd1KjB45jjNdwBypagWbuNqRevg6QjDVTWKFYApENuPvfdRU0aF0E19dgvNHw==", "requires": { "@feathersjs/transport-commons": "^4.2.1", - "debug": "^4.0.0", - "socket.io": "^2.1.0", - "uberproto": "^2.0.1" + "@types/socket.io": "^2.1.2", + "debug": "^4.1.1", + "socket.io": "^2.2.0", + "uberproto": "^2.0.4" } }, "@feathersjs/transport-commons": { @@ -252,6 +259,84 @@ "debug": "^4.0.0", "lodash": "^4.17.10", "radix-router": "^3.0.1" + }, + "dependencies": { + "@feathersjs/errors": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@feathersjs/errors/-/errors-3.3.6.tgz", + "integrity": "sha512-VCohY/AQU13xYyZGl6rfdUgE+2bjaI76a4aEb6reIphHKgb4mnjYlg2PzS1/hcU1qUNi515kY9yQa5HsE7J1dQ==", + "requires": { + "debug": "^4.0.0" + } + } + } + }, + "@types/body-parser": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz", + "integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==", + "requires": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "@types/connect": { + "version": "3.4.32", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz", + "integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==", + "requires": { + "@types/node": "*" + } + }, + "@types/express": { + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.0.tgz", + "integrity": "sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==", + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/serve-static": "*" + } + }, + "@types/express-serve-static-core": { + "version": "4.16.7", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz", + "integrity": "sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==", + "requires": { + "@types/node": "*", + "@types/range-parser": "*" + } + }, + "@types/mime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz", + "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==" + }, + "@types/node": { + "version": "12.0.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.7.tgz", + "integrity": "sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==" + }, + "@types/range-parser": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", + "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" + }, + "@types/serve-static": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz", + "integrity": "sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==", + "requires": { + "@types/express-serve-static-core": "*", + "@types/mime": "*" + } + }, + "@types/socket.io": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.2.tgz", + "integrity": "sha512-Ind+4qMNfQ62llyB4IMs1D8znMEBsMKohZBPqfBUIXqLQ9bdtWIbNTBWwtdcBWJKnokMZGcmWOOKslatni5vtA==", + "requires": { + "@types/node": "*" } }, "accepts": { @@ -465,22 +550,27 @@ "dev": true }, "body-parser": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", - "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", "requires": { - "bytes": "3.0.0", + "bytes": "3.1.0", "content-type": "~1.0.4", "debug": "2.6.9", "depd": "~1.1.2", - "http-errors": "~1.6.3", - "iconv-lite": "0.4.23", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", "on-finished": "~2.3.0", - "qs": "6.5.2", - "raw-body": "2.3.3", - "type-is": "~1.6.16" + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" }, "dependencies": { + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -493,6 +583,11 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" } } }, @@ -750,9 +845,12 @@ } }, "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "requires": { + "safe-buffer": "5.1.2" + } }, "content-security-policy-builder": { "version": "2.0.0", @@ -774,9 +872,9 @@ } }, "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" }, "cookie-signature": { "version": "1.0.6", @@ -990,6 +1088,11 @@ "ws": "~6.1.0" }, "dependencies": { + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" + }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -1264,42 +1367,51 @@ "integrity": "sha512-ngXzTfoRGG7fYens3/RMb6yYoVLvLMfmsSllP/mZPxNHgFq41TmPSLF/nLY7fwoclI2vElvAmILFWGUYqdjfCg==" }, "express": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz", - "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", "requires": { - "accepts": "~1.3.5", + "accepts": "~1.3.7", "array-flatten": "1.1.1", - "body-parser": "1.18.3", - "content-disposition": "0.5.2", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", "content-type": "~1.0.4", - "cookie": "0.3.1", + "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "~1.1.2", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.1.1", + "finalhandler": "~1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", "methods": "~1.1.2", "on-finished": "~2.3.0", - "parseurl": "~1.3.2", + "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.4", - "qs": "6.5.2", - "range-parser": "~1.2.0", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", "safe-buffer": "5.1.2", - "send": "0.16.2", - "serve-static": "1.13.2", - "setprototypeof": "1.1.0", - "statuses": "~1.4.0", - "type-is": "~1.6.16", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" }, "dependencies": { + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -1308,6 +1420,56 @@ "ms": "2.0.0" } }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + } + } + }, + "express-session": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.16.1.tgz", + "integrity": "sha512-pWvUL8Tl5jUy1MLH7DhgUlpoKeVPUTe+y6WQD9YhcN0C5qAhsh4a8feVjiUXo3TFhIy191YGZ4tewW9edbl2xQ==", + "requires": { + "cookie": "0.3.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~2.0.0", + "on-headers": "~1.0.2", + "parseurl": "~1.3.2", + "safe-buffer": "5.1.2", + "uid-safe": "~2.1.5" + }, + "dependencies": { + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" + }, + "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" + } + }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -1382,6 +1544,17 @@ "@feathersjs/commons": "^4.0.0", "@feathersjs/errors": "^3.3.6", "sift": "^7.0.1" + }, + "dependencies": { + "@feathersjs/errors": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@feathersjs/errors/-/errors-3.3.6.tgz", + "integrity": "sha512-VCohY/AQU13xYyZGl6rfdUgE+2bjaI76a4aEb6reIphHKgb4mnjYlg2PzS1/hcU1qUNi515kY9yQa5HsE7J1dQ==", + "dev": true, + "requires": { + "debug": "^4.0.0" + } + } } }, "feathers-nedb": { @@ -1392,6 +1565,16 @@ "@feathersjs/adapter-commons": "^2.0.0", "@feathersjs/commons": "^4.0.0", "@feathersjs/errors": "^3.3.4" + }, + "dependencies": { + "@feathersjs/errors": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@feathersjs/errors/-/errors-3.3.6.tgz", + "integrity": "sha512-VCohY/AQU13xYyZGl6rfdUgE+2bjaI76a4aEb6reIphHKgb4mnjYlg2PzS1/hcU1qUNi515kY9yQa5HsE7J1dQ==", + "requires": { + "debug": "^4.0.0" + } + } } }, "feature-policy": { @@ -1423,16 +1606,16 @@ } }, "finalhandler": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", - "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", "requires": { "debug": "2.6.9", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.4.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", "unpipe": "~1.0.0" }, "dependencies": { @@ -1619,6 +1802,40 @@ "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", "dev": true }, + "grant": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/grant/-/grant-4.5.2.tgz", + "integrity": "sha512-96hyS0ouJ5CaO30YWLb9zatc2r23aLKvaM+81qnZWCpmL3l4/KTdaRoNG4X/e93vlmryyJr5jus/jrqctT6iFw==", + "requires": { + "qs": "^6.7.0", + "request-compose": "^1.2.0", + "request-oauth": "0.0.3" + }, + "dependencies": { + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + } + } + }, + "grant-profile": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/grant-profile/-/grant-profile-0.0.3.tgz", + "integrity": "sha512-U79+WESxuaJkPaF/lETHQ8MHqKSao2o7LoleAblqp0/RwkZ0W03VsZ4Axt/1gEpoCirdoQehJeEP15bHy6A3+w==", + "requires": { + "qs": "^6.7.0", + "request-compose": "^1.2.0", + "request-oauth": "0.0.3" + }, + "dependencies": { + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + } + } + }, "growl": { "version": "1.10.5", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", @@ -1787,14 +2004,15 @@ } }, "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", "requires": { "depd": "~1.1.2", "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" } }, "http-signature": { @@ -1809,9 +2027,9 @@ } }, "iconv-lite": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -2286,11 +2504,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" }, - "lodash.clone": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz", - "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=" - }, "lodash.flattendeep": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", @@ -2368,11 +2581,6 @@ "triple-beam": "^1.3.0" } }, - "long-timeout": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz", - "integrity": "sha1-lyHXiLR+C8taJMLivuGg2lXatRQ=" - }, "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", @@ -2454,9 +2662,9 @@ "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==" + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { "version": "1.40.0", @@ -2918,15 +3126,6 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, - "passport": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz", - "integrity": "sha1-xQlWkTR71a07XhgCOMORTRbwWBE=", - "requires": { - "passport-strategy": "1.x.x", - "pause": "0.0.1" - } - }, "passport-jwt": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.0.tgz", @@ -2936,14 +3135,6 @@ "passport-strategy": "^1.0.0" } }, - "passport-local": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz", - "integrity": "sha1-H+YyaMkudWBmJkN+O5BmYsFbpu4=", - "requires": { - "passport-strategy": "1.x.x" - } - }, "passport-strategy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", @@ -3001,11 +3192,6 @@ } } }, - "pause": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", - "integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10=" - }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -3096,20 +3282,32 @@ "resolved": "https://registry.npmjs.org/radix-router/-/radix-router-3.0.1.tgz", "integrity": "sha512-jpHXHgP+ZmVzEfmZ7WVRSvc/EqMoAqYuMtBsHd9s47Hs9Iy8FDJhkweMrDH0wmdxanLzVIWhq0UpomLXNpW8tg==" }, + "random-bytes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", + "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=" + }, "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz", - "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.3", - "iconv-lite": "0.4.23", + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", "unpipe": "1.0.0" + }, + "dependencies": { + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + } } }, "read-pkg": { @@ -3200,6 +3398,28 @@ "uuid": "^3.3.2" } }, + "request-compose": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/request-compose/-/request-compose-1.2.0.tgz", + "integrity": "sha512-kvWsOZhYsoIJw6cLQHgcENHktD/dozkjvTFi30+OwAoaXcnTS0dGD1Pp2Auq3Kf54wVP7Sf4hUJCkzySKMe/vA==" + }, + "request-oauth": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/request-oauth/-/request-oauth-0.0.3.tgz", + "integrity": "sha512-q7WdJlpIcPaIDac0FZSy/yH37FO3UkUuPDIsiLALiLjuC6vzvuKIU14YIC3Lm0wtQRXS9GqvSo/fCYj8n75xSw==", + "requires": { + "oauth-sign": "^0.8.2", + "qs": "^6.5.1", + "uuid": "^3.2.1" + }, + "dependencies": { + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + } + } + }, "request-promise": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.4.tgz", @@ -3301,9 +3521,9 @@ "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" }, "send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", "requires": { "debug": "2.6.9", "depd": "~1.1.2", @@ -3312,12 +3532,12 @@ "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "~1.6.2", - "mime": "1.4.1", - "ms": "2.0.0", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.4.0" + "range-parser": "~1.2.1", + "statuses": "~1.5.0" }, "dependencies": { "debug": { @@ -3326,12 +3546,14 @@ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, @@ -3355,14 +3577,14 @@ } }, "serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "requires": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", - "parseurl": "~1.3.2", - "send": "0.16.2" + "parseurl": "~1.3.3", + "send": "0.17.1" } }, "set-blocking": { @@ -3372,9 +3594,9 @@ "dev": true }, "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, "shebang-command": { "version": "1.2.0", @@ -3604,9 +3826,9 @@ "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" }, "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, "stealthy-require": { "version": "1.1.1", @@ -3757,6 +3979,11 @@ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", "dev": true }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + }, "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", @@ -3817,12 +4044,12 @@ } }, "type-is": { - "version": "1.6.16", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", - "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "requires": { "media-typer": "0.3.0", - "mime-types": "~2.1.18" + "mime-types": "~2.1.24" } }, "uberproto": { @@ -3850,6 +4077,14 @@ } } }, + "uid-safe": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", + "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==", + "requires": { + "random-bytes": "~1.0.0" + } + }, "underscore": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", @@ -3869,11 +4104,6 @@ "punycode": "^2.1.0" } }, - "url-pattern": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/url-pattern/-/url-pattern-1.0.3.tgz", - "integrity": "sha1-BAkpJHGyTyPFDWWkeTF5PStaz8E=" - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/package.json b/package.json index b2079b8c..39aeb3ab 100644 --- a/package.json +++ b/package.json @@ -30,14 +30,15 @@ "mocha": "npm run clean && NODE_ENV=test mocha test/ --recursive --exit" }, "dependencies": { - "@feathersjs/authentication": "^2.1.14", + "@feathersjs/authentication": "^4.0.0-pre.3", "@feathersjs/authentication-jwt": "^2.0.8", - "@feathersjs/authentication-local": "^1.2.8", - "@feathersjs/configuration": "^2.0.5", - "@feathersjs/errors": "^3.3.5", - "@feathersjs/express": "^1.3.0", - "@feathersjs/feathers": "^3.3.0", - "@feathersjs/socketio": "^3.2.8", + "@feathersjs/authentication-local": "^4.0.0-pre.3", + "@feathersjs/authentication-oauth": "^4.0.0-pre.3", + "@feathersjs/configuration": "^4.0.0-pre.3", + "@feathersjs/errors": "^4.0.0-pre.3", + "@feathersjs/express": "^4.0.0-pre.3", + "@feathersjs/feathers": "^4.0.0-pre.3", + "@feathersjs/socketio": "^4.0.0-pre.3", "compression": "^1.7.3", "cors": "^2.8.5", "feathers-nedb": "^4.0.0", diff --git a/public/jquery/index.html b/public/jquery/index.html index c01e4125..17f8ca5b 100644 --- a/public/jquery/index.html +++ b/public/jquery/index.html @@ -13,7 +13,7 @@ - + diff --git a/public/vanilla/index.html b/public/vanilla/index.html index 59826a7f..1ef4f240 100644 --- a/public/vanilla/index.html +++ b/public/vanilla/index.html @@ -11,7 +11,7 @@
- + diff --git a/src/authentication.js b/src/authentication.js index 3312a463..3936187c 100644 --- a/src/authentication.js +++ b/src/authentication.js @@ -1,27 +1,13 @@ -const authentication = require('@feathersjs/authentication'); -const jwt = require('@feathersjs/authentication-jwt'); -const local = require('@feathersjs/authentication-local'); +const { AuthenticationService, JWTStrategy } = require('@feathersjs/authentication'); +const { LocalStrategy } = require('@feathersjs/authentication-local'); +const { expressOauth } = require('@feathersjs/authentication-oauth'); +module.exports = app => { + const authentication = new AuthenticationService(app); -module.exports = function (app) { - const config = app.get('authentication'); + authentication.register('jwt', new JWTStrategy()); + authentication.register('local', new LocalStrategy()); - // Set up authentication with the secret - app.configure(authentication(config)); - app.configure(jwt()); - app.configure(local()); - - // The `authentication` service is used to create a JWT. - // The before `create` hook registers strategies that can be used - // to create a new valid JWT (e.g. local or oauth2) - app.service('authentication').hooks({ - before: { - create: [ - authentication.hooks.authenticate(config.strategies) - ], - remove: [ - authentication.hooks.authenticate('jwt') - ] - } - }); + app.use('/authentication', authentication); + app.configure(expressOauth()); }; diff --git a/src/services/users/users.hooks.js b/src/services/users/users.hooks.js index a09c9f04..688ad722 100644 --- a/src/services/users/users.hooks.js +++ b/src/services/users/users.hooks.js @@ -9,9 +9,9 @@ module.exports = { all: [], find: [ authenticate('jwt') ], get: [ authenticate('jwt') ], - create: [ hashPassword(), gravatar() ], - update: [ hashPassword(), authenticate('jwt') ], - patch: [ hashPassword(), authenticate('jwt') ], + create: [ hashPassword('password'), gravatar() ], + update: [ hashPassword('password'), authenticate('jwt') ], + patch: [ hashPassword('password'), authenticate('jwt') ], remove: [ authenticate('jwt') ] },