@feathersjs/authentication-local 5.0.0-pre.1 → 5.0.0-pre.15

package/CHANGELOG.md

@@ -3,6 +3,165 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-pre.15](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.14...v5.0.0-pre.15) (2021-11-27)
+
+
+### Bug Fixes
+
+* **typescript:** Overall typing improvements ([#2478](https://github.com/feathersjs/feathers/issues/2478)) ([b8eb804](https://github.com/feathersjs/feathers/commit/b8eb804158556d9651a8607e3c3fda15e0bfd110))
+
+
+
+
+
+# [5.0.0-pre.14](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.13...v5.0.0-pre.14) (2021-10-13)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-pre.13](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.12...v5.0.0-pre.13) (2021-10-13)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-pre.12](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.11...v5.0.0-pre.12) (2021-10-12)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-pre.11](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.10...v5.0.0-pre.11) (2021-10-06)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-pre.10](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.9...v5.0.0-pre.10) (2021-09-19)
+
+
+### Bug Fixes
+
+* **authentication-local:** adds error handling for undefined/null password field ([#2444](https://github.com/feathersjs/feathers/issues/2444)) ([4323f98](https://github.com/feathersjs/feathers/commit/4323f9859a66a7fe3f7f15d81476bd81b735c226))
+
+
+
+
+
+# [5.0.0-pre.9](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.8...v5.0.0-pre.9) (2021-08-09)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-pre.8](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.7...v5.0.0-pre.8) (2021-08-09)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-pre.7](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.6...v5.0.0-pre.7) (2021-08-09)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-pre.6](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.5...v5.0.0-pre.6) (2021-08-08)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-pre.5](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.4...v5.0.0-pre.5) (2021-06-23)
+
+
+### Bug Fixes
+
+* **hooks:** Migrate built-in hooks and allow backwards compatibility ([#2358](https://github.com/feathersjs/feathers/issues/2358)) ([759c5a1](https://github.com/feathersjs/feathers/commit/759c5a19327a731af965c3604119393b3d09a406))
+* **koa:** Use extended query parser for compatibility ([#2397](https://github.com/feathersjs/feathers/issues/2397)) ([b2944ba](https://github.com/feathersjs/feathers/commit/b2944bac3ec6d5ecc80dc518cd4e58093692db74))
+
+
+### Features
+
+* **adapter-commons:** Add support for params.adapter option and move memory adapter to @feathersjs/memory ([#2367](https://github.com/feathersjs/feathers/issues/2367)) ([a43e7da](https://github.com/feathersjs/feathers/commit/a43e7da22b6b981a96d1321736ea9a0cb924fb4f))
+
+
+
+
+
+# [5.0.0-pre.4](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.3...v5.0.0-pre.4) (2021-05-13)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-pre.3](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.2...v5.0.0-pre.3) (2021-04-21)
+
+
+### Bug Fixes
+
+* **typescript:** Improve TypeScript backwards compatibility ([#2310](https://github.com/feathersjs/feathers/issues/2310)) ([f33be73](https://github.com/feathersjs/feathers/commit/f33be73fc46a533efb15df9aab0658e3240d3897))
+
+
+### Features
+
+* **dependencies:** Remove direct debug dependency ([#2296](https://github.com/feathersjs/feathers/issues/2296)) ([501d416](https://github.com/feathersjs/feathers/commit/501d4164d30c6a126906dc640cdfdc82207ba34a))
+
+
+
+
+
+# [5.0.0-pre.2](https://github.com/feathersjs/feathers/compare/v5.0.0-beta.1...v5.0.0-pre.2) (2021-04-06)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-beta.1](https://github.com/feathersjs/feathers/compare/v5.0.0-beta.0...v5.0.0-beta.1) (2021-04-03)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
+# [5.0.0-beta.0](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.1...v5.0.0-beta.0) (2021-03-28)
+
+
+### Bug Fixes
+
+* Update Grant usage and other dependencies ([#2264](https://github.com/feathersjs/feathers/issues/2264)) ([7b0f8fa](https://github.com/feathersjs/feathers/commit/7b0f8fad252419ed0ad0bf259cdf3104d322ab60))
+
+
+### Features
+
+* Feathers v5 core refactoring and features ([#2255](https://github.com/feathersjs/feathers/issues/2255)) ([2dafb7c](https://github.com/feathersjs/feathers/commit/2dafb7ce14ba57406aeec13d10ca45b1e709bee9))
+
+
+
+
+
 # [5.0.0-pre.1](https://github.com/feathersjs/feathers/compare/v4.5.11...v5.0.0-pre.1) (2020-12-17)
 
 

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Feathers
+Copyright (c) 2021 Feathers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -18,6 +18,6 @@ Refer to the [Feathers local authentication API documentation](https://docs.feat
 
 ## License
 
-Copyright (c) 2019 [Feathers contributors](https://github.com/feathersjs/client/graphs/contributors)
+Copyright (c) 2021 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
 
 Licensed under the [MIT license](LICENSE).

package/lib/hooks/hash-password.d.ts

@@ -1,6 +1,6 @@
-import { HookContext } from '@feathersjs/feathers';
+import { HookContext, NextFunction } from '@feathersjs/feathers';
 export interface HashPasswordOptions {
     authentication?: string;
     strategy?: string;
 }
-export default function hashPassword(field: string, options?: HashPasswordOptions): (context: HookContext) => Promise<HookContext<any, import("@feathersjs/feathers/lib").Service<any>>>;
+export default function hashPassword(field: string, options?: HashPasswordOptions): (context: HookContext, next?: NextFunction) => Promise<void>;

package/lib/hooks/hash-password.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -16,43 +7,40 @@ const get_1 = __importDefault(require("lodash/get"));
 const set_1 = __importDefault(require("lodash/set"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const errors_1 = require("@feathersjs/errors");
-const debug_1 = __importDefault(require("debug"));
-const debug = debug_1.default('@feathersjs/authentication-local/hooks/hash-password');
+const commons_1 = require("@feathersjs/commons");
+const debug = (0, commons_1.createDebug)('@feathersjs/authentication-local/hooks/hash-password');
 function hashPassword(field, options = {}) {
     if (!field) {
         throw new Error('The hashPassword hook requires a field name option');
     }
-    return (context) => __awaiter(this, void 0, void 0, function* () {
-        if (context.type !== 'before') {
-            throw new Error('The \'hashPassword\' hook should only be used as a \'before\' hook');
-        }
+    return async (context, next) => {
         const { app, data, params } = context;
-        if (data === undefined) {
-            debug('hook.data is undefined. Skipping hashPassword hook.');
-            return context;
-        }
-        const authService = app.defaultAuthentication(options.authentication);
-        const { strategy = 'local' } = options;
-        if (!authService || typeof authService.getStrategies !== 'function') {
-            throw new errors_1.BadRequest('Could not find an authentication service to hash password');
+        if (data !== undefined) {
+            const authService = app.defaultAuthentication(options.authentication);
+            const { strategy = 'local' } = options;
+            if (!authService || typeof authService.getStrategies !== 'function') {
+                throw new errors_1.BadRequest('Could not find an authentication service to hash password');
+            }
+            const [localStrategy] = authService.getStrategies(strategy);
+            if (!localStrategy || typeof localStrategy.hashPassword !== 'function') {
+                throw new errors_1.BadRequest(`Could not find '${strategy}' strategy to hash password`);
+            }
+            const addHashedPassword = async (data) => {
+                const password = (0, get_1.default)(data, field);
+                if (password === undefined) {
+                    debug(`hook.data.${field} is undefined, not hashing password`);
+                    return data;
+                }
+                const hashedPassword = await localStrategy.hashPassword(password, params);
+                return (0, set_1.default)((0, cloneDeep_1.default)(data), field, hashedPassword);
+            };
+            context.data = Array.isArray(data) ? await Promise.all(data.map(addHashedPassword)) :
+                await addHashedPassword(data);
         }
-        const [localStrategy] = authService.getStrategies(strategy);
-        if (!localStrategy || typeof localStrategy.hashPassword !== 'function') {
-            throw new errors_1.BadRequest(`Could not find '${strategy}' strategy to hash password`);
+        if (typeof next === 'function') {
+            await next();
         }
-        const addHashedPassword = (data) => __awaiter(this, void 0, void 0, function* () {
-            const password = get_1.default(data, field);
-            if (password === undefined) {
-                debug(`hook.data.${field} is undefined, not hashing password`);
-                return data;
-            }
-            const hashedPassword = yield localStrategy.hashPassword(password, params);
-            return set_1.default(cloneDeep_1.default(data), field, hashedPassword);
-        });
-        context.data = Array.isArray(data) ? yield Promise.all(data.map(addHashedPassword)) :
-            yield addHashedPassword(data);
-        return context;
-    });
+    };
 }
 exports.default = hashPassword;
 //# sourceMappingURL=hash-password.js.map

package/lib/hooks/hash-password.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash-password.js","sourceRoot":"","sources":["../../src/hooks/hash-password.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qDAA6B;AAC7B,qDAA6B;AAC7B,iEAAyC;AACzC,+CAAgD;AAChD,kDAA0B;AAI1B,MAAM,KAAK,GAAG,eAAK,CAAC,sDAAsD,CAAC,CAAC;AAO5E,SAAwB,YAAY,CAAE,KAAa,EAAE,UAA+B,EAAE;IACpF,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACvE;IAED,OAAO,CAAO,OAAoB,EAAE,EAAE;QACpC,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;SACvF;QAED,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAEtC,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,KAAK,CAAC,qDAAqD,CAAC,CAAC;YAC7D,OAAO,OAAO,CAAC;SAChB;QAED,MAAM,WAAW,GAAG,GAAG,CAAC,qBAAqB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACtE,MAAM,EAAE,QAAQ,GAAG,OAAO,EAAE,GAAG,OAAO,CAAC;QAEvC,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,CAAC,aAAa,KAAK,UAAU,EAAE;YACnE,MAAM,IAAI,mBAAU,CAAC,2DAA2D,CAAC,CAAC;SACnF;QAED,MAAM,CAAE,aAAa,CAAE,GAAG,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAoB,CAAC;QAEjF,IAAI,CAAC,aAAa,IAAI,OAAO,aAAa,CAAC,YAAY,KAAK,UAAU,EAAE;YACtE,MAAM,IAAI,mBAAU,CAAC,mBAAmB,QAAQ,6BAA6B,CAAC,CAAC;SAChF;QAED,MAAM,iBAAiB,GAAG,CAAO,IAAS,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,aAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAElC,IAAI,QAAQ,KAAK,SAAS,EAAE;gBAC1B,KAAK,CAAC,aAAa,KAAK,qCAAqC,CAAC,CAAC;gBAC/D,OAAO,IAAI,CAAC;aACb;YAED,MAAM,cAAc,GAAW,MAAM,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAElF,OAAO,aAAG,CAAC,mBAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QACrD,CAAC,CAAA,CAAA;QAED,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YACnF,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAEhC,OAAO,OAAO,CAAC;IACjB,CAAC,CAAA,CAAC;AACJ,CAAC;AAhDD,+BAgDC"}
+{"version":3,"file":"hash-password.js","sourceRoot":"","sources":["../../src/hooks/hash-password.ts"],"names":[],"mappings":";;;;;AAAA,qDAA6B;AAC7B,qDAA6B;AAC7B,iEAAyC;AACzC,+CAAgD;AAChD,iDAAkD;AAIlD,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,sDAAsD,CAAC,CAAC;AAOlF,SAAwB,YAAY,CAAE,KAAa,EAAE,UAA+B,EAAE;IACpF,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACvE;IAED,OAAO,KAAK,EAAE,OAAoB,EAAE,IAAmB,EAAE,EAAE;QACzD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAEtC,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,MAAM,WAAW,GAAG,GAAG,CAAC,qBAAqB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACtE,MAAM,EAAE,QAAQ,GAAG,OAAO,EAAE,GAAG,OAAO,CAAC;YAEvC,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,CAAC,aAAa,KAAK,UAAU,EAAE;gBACnE,MAAM,IAAI,mBAAU,CAAC,2DAA2D,CAAC,CAAC;aACnF;YAED,MAAM,CAAE,aAAa,CAAE,GAAG,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAoB,CAAC;YAEjF,IAAI,CAAC,aAAa,IAAI,OAAO,aAAa,CAAC,YAAY,KAAK,UAAU,EAAE;gBACtE,MAAM,IAAI,mBAAU,CAAC,mBAAmB,QAAQ,6BAA6B,CAAC,CAAC;aAChF;YAED,MAAM,iBAAiB,GAAG,KAAK,EAAE,IAAS,EAAE,EAAE;gBAC5C,MAAM,QAAQ,GAAG,IAAA,aAAG,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAElC,IAAI,QAAQ,KAAK,SAAS,EAAE;oBAC1B,KAAK,CAAC,aAAa,KAAK,qCAAqC,CAAC,CAAC;oBAC/D,OAAO,IAAI,CAAC;iBACb;gBAED,MAAM,cAAc,GAAW,MAAM,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAElF,OAAO,IAAA,aAAG,EAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;YACrD,CAAC,CAAA;YAED,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBACnF,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;SACjC;QAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YAC9B,MAAM,IAAI,EAAE,CAAC;SACd;IACH,CAAC,CAAC;AACJ,CAAC;AA3CD,+BA2CC"}

package/lib/hooks/protect.d.ts

@@ -1,3 +1,3 @@
-import { HookContext } from '@feathersjs/feathers';
-declare const _default: (...fields: string[]) => (context: HookContext) => HookContext<any, import("@feathersjs/feathers/lib").Service<any>>;
+import { HookContext, NextFunction } from '@feathersjs/feathers';
+declare const _default: (...fields: string[]) => (context: HookContext, next?: NextFunction) => Promise<void>;
 export default _default;

package/lib/hooks/protect.js

@@ -4,33 +4,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const omit_1 = __importDefault(require("lodash/omit"));
-exports.default = (...fields) => (context) => {
-    const result = context.dispatch || context.result;
+exports.default = (...fields) => async (context, next) => {
     const o = (current) => {
         if (typeof current === 'object' && !Array.isArray(current)) {
             const data = typeof current.toJSON === 'function'
                 ? current.toJSON() : current;
-            return omit_1.default(data, fields);
+            return (0, omit_1.default)(data, fields);
         }
         return current;
     };
-    if (!result) {
-        return context;
-    }
-    if (Array.isArray(result)) {
-        context.dispatch = result.map(o);
-    }
-    else if (result.data && context.method === 'find') {
-        context.dispatch = Object.assign({}, result, {
-            data: result.data.map(o)
-        });
+    if (typeof next === 'function') {
+        await next();
     }
-    else {
-        context.dispatch = o(result);
-    }
-    if (context.params && context.params.provider) {
-        context.result = context.dispatch;
+    const result = context.dispatch || context.result;
+    if (result) {
+        if (Array.isArray(result)) {
+            context.dispatch = result.map(o);
+        }
+        else if (result.data && context.method === 'find') {
+            context.dispatch = Object.assign({}, result, {
+                data: result.data.map(o)
+            });
+        }
+        else {
+            context.dispatch = o(result);
+        }
+        if (context.params && context.params.provider) {
+            context.result = context.dispatch;
+        }
     }
-    return context;
 };
 //# sourceMappingURL=protect.js.map

package/lib/hooks/protect.js.map

@@ -1 +1 @@
-{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../src/hooks/protect.ts"],"names":[],"mappings":";;;;;AAAA,uDAA+B;AAG/B,kBAAe,CAAC,GAAG,MAAgB,EAAE,EAAE,CAAC,CAAC,OAAoB,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAClD,MAAM,CAAC,GAAG,CAAC,OAAY,EAAE,EAAE;QACzB,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1D,MAAM,IAAI,GAAG,OAAO,OAAO,CAAC,MAAM,KAAK,UAAU;gBAC/C,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAE/B,OAAO,cAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC3B;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,OAAO,CAAC;KAChB;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACzB,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAClC;SAAM,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;QACnD,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE;YAC3C,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACzB,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;KAC9B;IAED,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;QAC7C,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;KACnC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}
+{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../src/hooks/protect.ts"],"names":[],"mappings":";;;;;AAAA,uDAA+B;AAG/B,kBAAe,CAAC,GAAG,MAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,OAAoB,EAAE,IAAmB,EAAE,EAAE;IAC1F,MAAM,CAAC,GAAG,CAAC,OAAY,EAAE,EAAE;QACzB,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1D,MAAM,IAAI,GAAG,OAAO,OAAO,CAAC,MAAM,KAAK,UAAU;gBAC/C,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAE/B,OAAO,IAAA,cAAI,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC3B;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;QAC9B,MAAM,IAAI,EAAE,CAAC;KACd;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAElD,IAAI,MAAM,EAAE;QACV,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAClC;aAAM,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YACnD,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE;gBAC3C,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aACzB,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;SAC9B;QAED,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC7C,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;SACnC;KACF;AACH,CAAC,CAAC"}

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import hashPassword from './hooks/hash-password';
 export declare const hooks: {
     hashPassword: typeof hashPassword;
-    protect: (...fields: string[]) => (context: import("@feathersjs/feathers/lib").HookContext<any, import("@feathersjs/feathers/lib").Service<any>>) => import("@feathersjs/feathers/lib").HookContext<any, import("@feathersjs/feathers/lib").Service<any>>;
+    protect: (...fields: string[]) => (context: import("@feathersjs/feathers/lib").HookContext<import("@feathersjs/feathers/lib").Application<any, any>, any>, next?: import("@feathersjs/hooks/lib").NextFunction) => Promise<void>;
 };
 export { LocalStrategy } from './strategy';

package/lib/strategy.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,10 +8,10 @@ exports.LocalStrategy = void 0;
 const bcryptjs_1 = __importDefault(require("bcryptjs"));
 const get_1 = __importDefault(require("lodash/get"));
 const omit_1 = __importDefault(require("lodash/omit"));
-const debug_1 = __importDefault(require("debug"));
 const errors_1 = require("@feathersjs/errors");
 const authentication_1 = require("@feathersjs/authentication");
-const debug = debug_1.default('@feathersjs/authentication-local/strategy');
+const commons_1 = require("@feathersjs/commons");
+const debug = (0, commons_1.createDebug)('@feathersjs/authentication-local/strategy');
 class LocalStrategy extends authentication_1.AuthenticationBaseStrategy {
     verifyConfiguration() {
         const config = this.configuration;
@@ -33,82 +24,88 @@ class LocalStrategy extends authentication_1.AuthenticationBaseStrategy {
     get configuration() {
         const authConfig = this.authentication.configuration;
         const config = super.configuration || {};
-        return Object.assign({ hashSize: 10, service: authConfig.service, entity: authConfig.entity, entityId: authConfig.entityId, errorMessage: 'Invalid login', entityPasswordField: config.passwordField, entityUsernameField: config.usernameField }, config);
+        return {
+            hashSize: 10,
+            service: authConfig.service,
+            entity: authConfig.entity,
+            entityId: authConfig.entityId,
+            errorMessage: 'Invalid login',
+            entityPasswordField: config.passwordField,
+            entityUsernameField: config.usernameField,
+            ...config
+        };
     }
-    getEntityQuery(query, _params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return Object.assign({ $limit: 1 }, query);
-        });
+    async getEntityQuery(query, _params) {
+        return {
+            $limit: 1,
+            ...query
+        };
     }
-    findEntity(username, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { entityUsernameField, errorMessage } = this.configuration;
-            if (!username) { // don't query for users without any condition set.
-                throw new errors_1.NotAuthenticated(errorMessage);
-            }
-            const query = yield this.getEntityQuery({
-                [entityUsernameField]: username
-            }, params);
-            const findParams = Object.assign({}, params, { query });
-            const entityService = this.entityService;
-            debug('Finding entity with query', params.query);
-            const result = yield entityService.find(findParams);
-            const list = Array.isArray(result) ? result : result.data;
-            if (!Array.isArray(list) || list.length === 0) {
-                debug('No entity found');
-                throw new errors_1.NotAuthenticated(errorMessage);
-            }
-            const [entity] = list;
-            return entity;
-        });
+    async findEntity(username, params) {
+        const { entityUsernameField, errorMessage } = this.configuration;
+        if (!username) { // don't query for users without any condition set.
+            throw new errors_1.NotAuthenticated(errorMessage);
+        }
+        const query = await this.getEntityQuery({
+            [entityUsernameField]: username
+        }, params);
+        const findParams = Object.assign({}, params, { query });
+        const entityService = this.entityService;
+        debug('Finding entity with query', params.query);
+        const result = await entityService.find(findParams);
+        const list = Array.isArray(result) ? result : result.data;
+        if (!Array.isArray(list) || list.length === 0) {
+            debug('No entity found');
+            throw new errors_1.NotAuthenticated(errorMessage);
+        }
+        const [entity] = list;
+        return entity;
     }
-    getEntity(result, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const entityService = this.entityService;
-            const { entityId = entityService.id, entity } = this.configuration;
-            if (!entityId || result[entityId] === undefined) {
-                throw new errors_1.NotAuthenticated('Could not get local entity');
-            }
-            if (!params.provider) {
-                return result;
-            }
-            return entityService.get(result[entityId], Object.assign(Object.assign({}, params), { [entity]: result }));
+    async getEntity(result, params) {
+        const entityService = this.entityService;
+        const { entityId = entityService.id, entity } = this.configuration;
+        if (!entityId || result[entityId] === undefined) {
+            throw new errors_1.NotAuthenticated('Could not get local entity');
+        }
+        if (!params.provider) {
+            return result;
+        }
+        return entityService.get(result[entityId], {
+            ...params,
+            [entity]: result
         });
     }
-    comparePassword(entity, password) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { entityPasswordField, errorMessage } = this.configuration;
-            // find password in entity, this allows for dot notation
-            const hash = get_1.default(entity, entityPasswordField);
-            if (!hash) {
-                debug(`Record is missing the '${entityPasswordField}' password field`);
-                throw new errors_1.NotAuthenticated(errorMessage);
-            }
-            debug('Verifying password');
-            const result = yield bcryptjs_1.default.compare(password, hash);
-            if (result) {
-                return entity;
-            }
+    async comparePassword(entity, password) {
+        const { entityPasswordField, errorMessage } = this.configuration;
+        // find password in entity, this allows for dot notation
+        const hash = (0, get_1.default)(entity, entityPasswordField);
+        if (!hash) {
+            debug(`Record is missing the '${entityPasswordField}' password field`);
             throw new errors_1.NotAuthenticated(errorMessage);
-        });
+        }
+        debug('Verifying password');
+        const result = await bcryptjs_1.default.compare(password, hash);
+        if (result) {
+            return entity;
+        }
+        throw new errors_1.NotAuthenticated(errorMessage);
     }
-    hashPassword(password, _params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return bcryptjs_1.default.hash(password, this.configuration.hashSize);
-        });
+    async hashPassword(password, _params) {
+        return bcryptjs_1.default.hash(password, this.configuration.hashSize);
     }
-    authenticate(data, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { passwordField, usernameField, entity } = this.configuration;
-            const username = data[usernameField];
-            const password = data[passwordField];
-            const result = yield this.findEntity(username, omit_1.default(params, 'provider'));
-            yield this.comparePassword(result, password);
-            return {
-                authentication: { strategy: this.name },
-                [entity]: yield this.getEntity(result, params)
-            };
-        });
+    async authenticate(data, params) {
+        const { passwordField, usernameField, entity, errorMessage } = this.configuration;
+        const username = data[usernameField];
+        const password = data[passwordField];
+        if (!password) { // exit early if there is no password
+            throw new errors_1.NotAuthenticated(errorMessage);
+        }
+        const result = await this.findEntity(username, (0, omit_1.default)(params, 'provider'));
+        await this.comparePassword(result, password);
+        return {
+            authentication: { strategy: this.name },
+            [entity]: await this.getEntity(result, params)
+        };
     }
 }
 exports.LocalStrategy = LocalStrategy;

package/lib/strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/authentication-local",
   "description": "Local authentication strategy for @feathers/authentication",
-  "version": "5.0.0-pre.1",
+  "version": "5.0.0-pre.15",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -28,7 +28,7 @@
     "url": "https://github.com/feathersjs/feathers/issues"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">= 12"
   },
   "files": [
     "CHANGELOG.md",
@@ -52,24 +52,23 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.1",
-    "@feathersjs/errors": "^5.0.0-pre.1",
-    "@feathersjs/feathers": "^5.0.0-pre.1",
+    "@feathersjs/authentication": "^5.0.0-pre.15",
+    "@feathersjs/commons": "^5.0.0-pre.15",
+    "@feathersjs/errors": "^5.0.0-pre.15",
+    "@feathersjs/feathers": "^5.0.0-pre.15",
     "bcryptjs": "^2.4.3",
-    "debug": "^4.3.1",
-    "lodash": "^4.17.20"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@feathersjs/adapter-memory": "^5.0.0-pre.1",
+    "@feathersjs/memory": "^5.0.0-pre.15",
     "@types/bcryptjs": "^2.4.2",
-    "@types/debug": "^4.1.5",
-    "@types/lodash": "^4.14.165",
-    "@types/mocha": "^8.0.4",
-    "@types/node": "^14.14.10",
-    "mocha": "^8.2.1",
+    "@types/lodash": "^4.14.176",
+    "@types/mocha": "^9.0.0",
+    "@types/node": "^16.11.6",
+    "mocha": "^9.1.3",
     "shx": "^0.3.3",
-    "ts-node": "^9.1.0",
-    "typescript": "^4.1.2"
+    "ts-node": "^10.4.0",
+    "typescript": "^4.4.4"
   },
-  "gitHead": "3756506935c520fc50d4be416ff649c2158afdac"
+  "gitHead": "8008bf4f8529a2a40b6a2f976c1f43ae13675693"
 }

package/src/hooks/hash-password.ts

@@ -2,11 +2,11 @@ import get from 'lodash/get';
 import set from 'lodash/set';
 import cloneDeep from 'lodash/cloneDeep';
 import { BadRequest } from '@feathersjs/errors';
-import Debug from 'debug';
-import { HookContext } from '@feathersjs/feathers';
+import { createDebug } from '@feathersjs/commons';
+import { HookContext, NextFunction } from '@feathersjs/feathers';
 import { LocalStrategy } from '../strategy';
 
-const debug = Debug('@feathersjs/authentication-local/hooks/hash-password');
+const debug = createDebug('@feathersjs/authentication-local/hooks/hash-password');
 
 export interface HashPasswordOptions {
   authentication?: string;
@@ -18,47 +18,42 @@ export default function hashPassword (field: string, options: HashPasswordOption
     throw new Error('The hashPassword hook requires a field name option');
   }
 
-  return async (context: HookContext) => {
-    if (context.type !== 'before') {
-      throw new Error('The \'hashPassword\' hook should only be used as a \'before\' hook');
-    }
-
+  return async (context: HookContext, next?: NextFunction) => {
     const { app, data, params } = context;
 
-    if (data === undefined) {
-      debug('hook.data is undefined. Skipping hashPassword hook.');
-      return context;
-    }
+    if (data !== undefined) {
+      const authService = app.defaultAuthentication(options.authentication);
+      const { strategy = 'local' } = options;
 
-    const authService = app.defaultAuthentication(options.authentication);
-    const { strategy = 'local' } = options;
+      if (!authService || typeof authService.getStrategies !== 'function') {
+        throw new BadRequest('Could not find an authentication service to hash password');
+      }
 
-    if (!authService || typeof authService.getStrategies !== 'function') {
-      throw new BadRequest('Could not find an authentication service to hash password');
-    }
+      const [ localStrategy ] = authService.getStrategies(strategy) as LocalStrategy[];
 
-    const [ localStrategy ] = authService.getStrategies(strategy) as LocalStrategy[];
+      if (!localStrategy || typeof localStrategy.hashPassword !== 'function') {
+        throw new BadRequest(`Could not find '${strategy}' strategy to hash password`);
+      }
 
-    if (!localStrategy || typeof localStrategy.hashPassword !== 'function') {
-      throw new BadRequest(`Could not find '${strategy}' strategy to hash password`);
-    }
+      const addHashedPassword = async (data: any) => {
+        const password = get(data, field);
 
-    const addHashedPassword = async (data: any) => {
-      const password = get(data, field);
+        if (password === undefined) {
+          debug(`hook.data.${field} is undefined, not hashing password`);
+          return data;
+        }
 
-      if (password === undefined) {
-        debug(`hook.data.${field} is undefined, not hashing password`);
-        return data;
-      }
+        const hashedPassword: string = await localStrategy.hashPassword(password, params);
 
-      const hashedPassword: string = await localStrategy.hashPassword(password, params);
+        return set(cloneDeep(data), field, hashedPassword);
+      }
 
-      return set(cloneDeep(data), field, hashedPassword);
+      context.data = Array.isArray(data) ? await Promise.all(data.map(addHashedPassword)) :
+        await addHashedPassword(data);
     }
 
-    context.data = Array.isArray(data) ? await Promise.all(data.map(addHashedPassword)) :
-      await addHashedPassword(data);
-
-    return context;
+    if (typeof next === 'function') {
+      await next();
+    }
   };
 }

package/src/hooks/protect.ts

@@ -1,8 +1,7 @@
 import omit from 'lodash/omit';
-import { HookContext } from '@feathersjs/feathers';
+import { HookContext, NextFunction } from '@feathersjs/feathers';
 
-export default (...fields: string[]) => (context: HookContext) => {
-  const result = context.dispatch || context.result;
+export default (...fields: string[]) => async (context: HookContext, next?: NextFunction) => {
   const o = (current: any) => {
     if (typeof current === 'object' && !Array.isArray(current)) {
       const data = typeof current.toJSON === 'function'
@@ -14,23 +13,25 @@ export default (...fields: string[]) => (context: HookContext) => {
     return current;
   };
 
-  if (!result) {
-    return context;
+  if (typeof next === 'function') {
+    await next();
   }
 
-  if (Array.isArray(result)) {
-    context.dispatch = result.map(o);
-  } else if (result.data && context.method === 'find') {
-    context.dispatch = Object.assign({}, result, {
-      data: result.data.map(o)
-    });
-  } else {
-    context.dispatch = o(result);
-  }
+  const result = context.dispatch || context.result;
 
-  if (context.params && context.params.provider) {
-    context.result = context.dispatch;
-  }
+  if (result) {
+    if (Array.isArray(result)) {
+      context.dispatch = result.map(o);
+    } else if (result.data && context.method === 'find') {
+      context.dispatch = Object.assign({}, result, {
+        data: result.data.map(o)
+      });
+    } else {
+      context.dispatch = o(result);
+    }
 
-  return context;
+    if (context.params && context.params.provider) {
+      context.result = context.dispatch;
+    }
+  }
 };

package/src/strategy.ts

@@ -2,14 +2,14 @@
 import bcrypt from 'bcryptjs';
 import get from 'lodash/get';
 import omit from 'lodash/omit';
-import Debug from 'debug';
 import { NotAuthenticated } from '@feathersjs/errors';
 import { Query, Params } from '@feathersjs/feathers';
 import {
   AuthenticationRequest, AuthenticationBaseStrategy
 } from '@feathersjs/authentication';
+import { createDebug } from '@feathersjs/commons';
 
-const debug = Debug('@feathersjs/authentication-local/strategy');
+const debug = createDebug('@feathersjs/authentication-local/strategy');
 
 export class LocalStrategy extends AuthenticationBaseStrategy {
   verifyConfiguration () {
@@ -76,7 +76,7 @@ export class LocalStrategy extends AuthenticationBaseStrategy {
 
   async getEntity (result: any, params: Params) {
     const entityService = this.entityService;
-    const { entityId = entityService.id, entity } = this.configuration;
+    const { entityId = (entityService as any).id, entity } = this.configuration;
 
     if (!entityId || result[entityId] === undefined) {
       throw new NotAuthenticated('Could not get local entity');
@@ -119,9 +119,14 @@ export class LocalStrategy extends AuthenticationBaseStrategy {
   }
 
   async authenticate (data: AuthenticationRequest, params: Params) {
-    const { passwordField, usernameField, entity } = this.configuration;
+    const { passwordField, usernameField, entity, errorMessage } = this.configuration;
     const username = data[usernameField];
     const password = data[passwordField];
+
+    if (!password) { // exit early if there is no password
+      throw new NotAuthenticated(errorMessage);
+    }
+
     const result = await this.findEntity(username, omit(params, 'provider'));
 
     await this.comparePassword(result, password);