@feathersjs/authentication 5.0.0-pre.2 → 5.0.0-pre.22

package/CHANGELOG.md

@@ -3,6 +3,205 @@
 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.22](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.21...v5.0.0-pre.22) (2022-05-24)
+
+**Note:** Version bump only for package @feathersjs/authentication
+
+
+
+
+
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/authentication
+
+
+
+
+
+# [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
+
+
+### Bug Fixes
+
+* **dependencies:** Lock monorepo package version numbers ([#2623](https://github.com/feathersjs/feathers/issues/2623)) ([5640c10](https://github.com/feathersjs/feathers/commit/5640c1020cc139994e695d658c08bad3494db507))
+
+
+
+
+
+# [5.0.0-pre.19](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.18...v5.0.0-pre.19) (2022-05-01)
+
+
+### Features
+
+* **typescript:** Improve adapter typings ([#2605](https://github.com/feathersjs/feathers/issues/2605)) ([3b2ca0a](https://github.com/feathersjs/feathers/commit/3b2ca0a6a8e03e8390272c4d7e930b4bffdaacf5))
+* **typescript:** Improve params and query typeability ([#2600](https://github.com/feathersjs/feathers/issues/2600)) ([df28b76](https://github.com/feathersjs/feathers/commit/df28b7619161f1df5e700326f52cca1a92dc5d28))
+
+
+
+
+
+# [5.0.0-pre.18](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.17...v5.0.0-pre.18) (2022-04-11)
+
+
+### Features
+
+* **authentication:** Add setup method for auth strategies ([#1611](https://github.com/feathersjs/feathers/issues/1611)) ([a3c3581](https://github.com/feathersjs/feathers/commit/a3c35814dccdbbf6de96f04f60b226ce206c6dbe))
+* **configuration:** Allow app configuration to be validated against a schema ([#2590](https://github.com/feathersjs/feathers/issues/2590)) ([a268f86](https://github.com/feathersjs/feathers/commit/a268f86da92a8ada14ed11ab456aac0a4bba5bb0))
+
+
+
+
+
+# [5.0.0-pre.17](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.16...v5.0.0-pre.17) (2022-02-15)
+
+**Note:** Version bump only for package @feathersjs/authentication
+
+
+
+
+
+# [5.0.0-pre.16](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.15...v5.0.0-pre.16) (2022-01-12)
+
+
+### Features
+
+* **express, koa:** make transports similar ([#2486](https://github.com/feathersjs/feathers/issues/2486)) ([26aa937](https://github.com/feathersjs/feathers/commit/26aa937c114fb8596dfefc599b1f53cead69c159))
+
+
+
+
+
+# [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))
+
+
+### Features
+
+* **authentication-oauth:** Allow dynamic oAuth redirect ([#2469](https://github.com/feathersjs/feathers/issues/2469)) ([b7143d4](https://github.com/feathersjs/feathers/commit/b7143d4c0fbe961e714f79512be04449b9bbd7d9))
+
+
+
+
+
+# [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
+
+
+
+
+
+# [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
+
+
+
+
+
+# [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
+
+
+
+
+
+# [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
+
+
+
+
+
+# [5.0.0-pre.10](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.9...v5.0.0-pre.10) (2021-09-19)
+
+**Note:** Version bump only for package @feathersjs/authentication
+
+
+
+
+
+# [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
+
+
+
+
+
+# [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
+
+
+
+
+
+# [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
+
+
+
+
+
+# [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
+
+
+
+
+
+# [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
+
+
+
+
+
+# [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

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Feathers
+Copyright (c) 2022 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

@@ -1,8 +1,8 @@
 # @feathersjs/authentication
 
 [![CI](https://github.com/feathersjs/feathers/workflows/CI/badge.svg)](https://github.com/feathersjs/feathers/actions?query=workflow%3ACI)
-[![Dependency Status](https://img.shields.io/david/feathersjs/feathers.svg?style=flat-square&path=packages/authentication)](https://david-dm.org/feathersjs/feathers?path=packages/authentication)
 [![Download Status](https://img.shields.io/npm/dm/@feathersjs/authentication.svg?style=flat-square)](https://www.npmjs.com/package/@feathersjs/authentication)
+[![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/qa8kez8QBx)
 
 > Add Authentication to your FeathersJS app.
 
@@ -18,6 +18,6 @@ Refer to the [Feathers authentication API documentation](https://docs.feathersjs
 
 ## License
 
-Copyright (c) 2021 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
+Copyright (c) 2022 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
 
 Licensed under the [MIT license](LICENSE).

package/lib/core.d.ts

@@ -9,6 +9,15 @@ export interface AuthenticationRequest {
     strategy?: string;
     [key: string]: any;
 }
+export interface AuthenticationParams extends Params {
+    payload?: {
+        [key: string]: any;
+    };
+    jwtOptions?: SignOptions;
+    authStrategies?: string[];
+    secret?: string;
+    [key: string]: any;
+}
 export declare type ConnectionEvent = 'login' | 'logout' | 'disconnect';
 export interface AuthenticationStrategy {
     /**
@@ -34,6 +43,12 @@ export interface AuthenticationStrategy {
      * and throw an error if it is invalid.
      */
     verifyConfiguration?(): void;
+    /**
+     * Implement this method to setup this strategy
+     * @param auth The AuthenticationService
+     * @param name The name of the strategy
+     */
+    setup?(auth: AuthenticationBase, name: string): Promise<void>;
     /**
      * Authenticate an authentication request with this strategy.
      * Should throw an error if the strategy did not succeed.
@@ -41,7 +56,7 @@ export interface AuthenticationStrategy {
      * @param authentication The authentication request
      * @param params The service call parameters
      */
-    authenticate?(authentication: AuthenticationRequest, params: Params): Promise<AuthenticationResult>;
+    authenticate?(authentication: AuthenticationRequest, params: AuthenticationParams): Promise<AuthenticationResult>;
     /**
      * Update a real-time connection according to this strategy.
      *
@@ -65,10 +80,11 @@ export interface JwtVerifyOptions extends VerifyOptions {
  */
 export declare class AuthenticationBase {
     app: Application;
-    configKey: string;
     strategies: {
         [key: string]: AuthenticationStrategy;
     };
+    configKey: string;
+    isReady: boolean;
     /**
      * Create a new authentication service.
      *
@@ -98,6 +114,13 @@ export declare class AuthenticationBase {
      * @param names The list or strategy names
      */
     getStrategies(...names: string[]): AuthenticationStrategy[];
+    /**
+     * Returns a single strategy by name
+     *
+     * @param name The strategy name
+     * @returns The authentication strategy or undefined
+     */
+    getStrategy(name: string): AuthenticationStrategy;
     /**
      * Create a new access token with payload and options.
      *
@@ -121,7 +144,7 @@ export declare class AuthenticationBase {
      * @param params Service call parameters
      * @param allowed A list of allowed strategy names
      */
-    authenticate(authentication: AuthenticationRequest, params: Params, ...allowed: string[]): Promise<AuthenticationResult>;
+    authenticate(authentication: AuthenticationRequest, params: AuthenticationParams, ...allowed: string[]): Promise<AuthenticationResult>;
     handleConnection(event: ConnectionEvent, connection: any, authResult?: AuthenticationResult): Promise<void>;
     /**
      * Parse an HTTP request and response for authentication request information.
@@ -131,4 +154,5 @@ export declare class AuthenticationBase {
      * @param names A list of strategies to use
      */
     parse(req: IncomingMessage, res: ServerResponse, ...names: string[]): Promise<AuthenticationRequest>;
+    setup(): Promise<void>;
 }

package/lib/core.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,9 +8,9 @@ const merge_1 = __importDefault(require("lodash/merge"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const uuid_1 = require("uuid");
 const errors_1 = require("@feathersjs/errors");
-const debug_1 = __importDefault(require("debug"));
-const options_1 = __importDefault(require("./options"));
-const debug = debug_1.default('@feathersjs/authentication/base');
+const commons_1 = require("@feathersjs/commons");
+const options_1 = require("./options");
+const debug = (0, commons_1.createDebug)('@feathersjs/authentication/base');
 /**
  * A base class for managing authentication strategies and creating and verifying JWTs
  */
@@ -38,15 +29,16 @@ class AuthenticationBase {
         this.app = app;
         this.strategies = {};
         this.configKey = configKey;
+        this.isReady = false;
         app.set('defaultAuthentication', app.get('defaultAuthentication') || configKey);
-        app.set(configKey, merge_1.default({}, app.get(configKey), options));
+        app.set(configKey, (0, merge_1.default)({}, app.get(configKey), options));
     }
     /**
      * Return the current configuration from the application
      */
     get configuration() {
         // Always returns a copy of the authentication configuration
-        return Object.assign({}, options_1.default, this.app.get(this.configKey));
+        return Object.assign({}, options_1.defaultOptions, this.app.get(this.configKey));
     }
     /**
      * A list of all registered strategy names
@@ -61,6 +53,7 @@ class AuthenticationBase {
      * @param strategy The authentication strategy instance
      */
     register(name, strategy) {
+        var _a;
         // Call the functions a strategy can implement
         if (typeof strategy.setName === 'function') {
             strategy.setName(name);
@@ -76,6 +69,9 @@ class AuthenticationBase {
         }
         // Register strategy as name
         this.strategies[name] = strategy;
+        if (this.isReady) {
+            (_a = strategy.setup) === null || _a === void 0 ? void 0 : _a.call(strategy, this, name);
+        }
     }
     /**
      * Get the registered authentication strategies for a list of names.
@@ -86,6 +82,15 @@ class AuthenticationBase {
         return names.map(name => this.strategies[name])
             .filter(current => !!current);
     }
+    /**
+     * Returns a single strategy by name
+     *
+     * @param name The strategy name
+     * @returns The authentication strategy or undefined
+     */
+    getStrategy(name) {
+        return this.strategies[name];
+    }
     /**
      * Create a new access token with payload and options.
      *
@@ -93,19 +98,17 @@ class AuthenticationBase {
      * @param optsOverride The options to extend the defaults (`configuration.jwtOptions`) with
      * @param secretOverride Use a different secret instead
      */
-    createAccessToken(payload, optsOverride, secretOverride) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { secret, jwtOptions } = this.configuration;
-            // Use configuration by default but allow overriding the secret
-            const jwtSecret = secretOverride || secret;
-            // Default jwt options merged with additional options
-            const options = merge_1.default({}, jwtOptions, optsOverride);
-            if (!options.jwtid) {
-                // Generate a UUID as JWT ID by default
-                options.jwtid = uuid_1.v4();
-            }
-            return jsonwebtoken_1.default.sign(payload, jwtSecret, options);
-        });
+    async createAccessToken(payload, optsOverride, secretOverride) {
+        const { secret, jwtOptions } = this.configuration;
+        // Use configuration by default but allow overriding the secret
+        const jwtSecret = secretOverride || secret;
+        // Default jwt options merged with additional options
+        const options = (0, merge_1.default)({}, jwtOptions, optsOverride);
+        if (!options.jwtid) {
+            // Generate a UUID as JWT ID by default
+            options.jwtid = (0, uuid_1.v4)();
+        }
+        return jsonwebtoken_1.default.sign(payload, jwtSecret, options);
     }
     /**
      * Verifies an access token.
@@ -114,25 +117,23 @@ class AuthenticationBase {
      * @param optsOverride The options to extend the defaults (`configuration.jwtOptions`) with
      * @param secretOverride Use a different secret instead
      */
-    verifyAccessToken(accessToken, optsOverride, secretOverride) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { secret, jwtOptions } = this.configuration;
-            const jwtSecret = secretOverride || secret;
-            const options = merge_1.default({}, jwtOptions, optsOverride);
-            const { algorithm } = options;
-            // Normalize the `algorithm` setting into the algorithms array
-            if (algorithm && !options.algorithms) {
-                options.algorithms = Array.isArray(algorithm) ? algorithm : [algorithm];
-                delete options.algorithm;
-            }
-            try {
-                const verified = jsonwebtoken_1.default.verify(accessToken, jwtSecret, options);
-                return verified;
-            }
-            catch (error) {
-                throw new errors_1.NotAuthenticated(error.message, error);
-            }
-        });
+    async verifyAccessToken(accessToken, optsOverride, secretOverride) {
+        const { secret, jwtOptions } = this.configuration;
+        const jwtSecret = secretOverride || secret;
+        const options = (0, merge_1.default)({}, jwtOptions, optsOverride);
+        const { algorithm } = options;
+        // Normalize the `algorithm` setting into the algorithms array
+        if (algorithm && !options.algorithms) {
+            options.algorithms = Array.isArray(algorithm) ? algorithm : [algorithm];
+            delete options.algorithm;
+        }
+        try {
+            const verified = jsonwebtoken_1.default.verify(accessToken, jwtSecret, options);
+            return verified;
+        }
+        catch (error) {
+            throw new errors_1.NotAuthenticated(error.message, error);
+        }
     }
     /**
      * Authenticate a given authentication request against a list of strategies.
@@ -141,29 +142,28 @@ class AuthenticationBase {
      * @param params Service call parameters
      * @param allowed A list of allowed strategy names
      */
-    authenticate(authentication, params, ...allowed) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { strategy } = authentication || {};
-            const [authStrategy] = this.getStrategies(strategy);
-            const strategyAllowed = allowed.includes(strategy);
-            debug('Running authenticate for strategy', strategy, allowed);
-            if (!authentication || !authStrategy || !strategyAllowed) {
-                const additionalInfo = (!strategy && ' (no `strategy` set)') ||
-                    (!strategyAllowed && ' (strategy not allowed in authStrategies)') || '';
-                // If there are no valid strategies or `authentication` is not an object
-                throw new errors_1.NotAuthenticated('Invalid authentication information' + additionalInfo);
-            }
-            return authStrategy.authenticate(authentication, Object.assign(Object.assign({}, params), { authenticated: true }));
+    async authenticate(authentication, params, ...allowed) {
+        const { strategy } = authentication || {};
+        const [authStrategy] = this.getStrategies(strategy);
+        const strategyAllowed = allowed.includes(strategy);
+        debug('Running authenticate for strategy', strategy, allowed);
+        if (!authentication || !authStrategy || !strategyAllowed) {
+            const additionalInfo = (!strategy && ' (no `strategy` set)') ||
+                (!strategyAllowed && ' (strategy not allowed in authStrategies)') || '';
+            // If there are no valid strategies or `authentication` is not an object
+            throw new errors_1.NotAuthenticated('Invalid authentication information' + additionalInfo);
+        }
+        return authStrategy.authenticate(authentication, {
+            ...params,
+            authenticated: true
         });
     }
-    handleConnection(event, connection, authResult) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const strategies = this.getStrategies(...Object.keys(this.strategies))
-                .filter(current => typeof current.handleConnection === 'function');
-            for (const strategy of strategies) {
-                yield strategy.handleConnection(event, connection, authResult);
-            }
-        });
+    async handleConnection(event, connection, authResult) {
+        const strategies = this.getStrategies(...Object.keys(this.strategies))
+            .filter(current => typeof current.handleConnection === 'function');
+        for (const strategy of strategies) {
+            await strategy.handleConnection(event, connection, authResult);
+        }
     }
     /**
      * Parse an HTTP request and response for authentication request information.
@@ -172,19 +172,25 @@ class AuthenticationBase {
      * @param res The HTTP response
      * @param names A list of strategies to use
      */
-    parse(req, res, ...names) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const strategies = this.getStrategies(...names)
-                .filter(current => typeof current.parse === 'function');
-            debug('Strategies parsing HTTP header for authentication information', names);
-            for (const authStrategy of strategies) {
-                const value = yield authStrategy.parse(req, res);
-                if (value !== null) {
-                    return value;
-                }
+    async parse(req, res, ...names) {
+        const strategies = this.getStrategies(...names)
+            .filter(current => typeof current.parse === 'function');
+        debug('Strategies parsing HTTP header for authentication information', names);
+        for (const authStrategy of strategies) {
+            const value = await authStrategy.parse(req, res);
+            if (value !== null) {
+                return value;
             }
-            return null;
-        });
+        }
+        return null;
+    }
+    async setup() {
+        var _a;
+        this.isReady = true;
+        for (const name of Object.keys(this.strategies)) {
+            const strategy = this.strategies[name];
+            await ((_a = strategy.setup) === null || _a === void 0 ? void 0 : _a.call(strategy, this, name));
+        }
     }
 }
 exports.AuthenticationBase = AuthenticationBase;

package/lib/core.js.map

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

package/lib/hooks/authenticate.d.ts

@@ -1,7 +1,7 @@
-import { HookContext } from '@feathersjs/feathers';
+import { HookContext, NextFunction } from '@feathersjs/feathers';
 export interface AuthenticateHookSettings {
     service?: string;
-    strategies: string[];
+    strategies?: string[];
 }
-declare const _default: (originalSettings: string | AuthenticateHookSettings, ...originalStrategies: string[]) => (context: HookContext<any, any>) => Promise<HookContext<any, any>>;
+declare const _default: (originalSettings: string | AuthenticateHookSettings, ...originalStrategies: string[]) => (context: HookContext, _next?: NextFunction) => Promise<any>;
 export default _default;

package/lib/hooks/authenticate.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 };
 };
@@ -15,16 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const flatten_1 = __importDefault(require("lodash/flatten"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const errors_1 = require("@feathersjs/errors");
-const debug_1 = __importDefault(require("debug"));
-const debug = debug_1.default('@feathersjs/authentication/hooks/authenticate');
+const commons_1 = require("@feathersjs/commons");
+const debug = (0, commons_1.createDebug)('@feathersjs/authentication/hooks/authenticate');
 exports.default = (originalSettings, ...originalStrategies) => {
     const settings = typeof originalSettings === 'string'
-        ? { strategies: flatten_1.default([originalSettings, ...originalStrategies]) }
+        ? { strategies: (0, flatten_1.default)([originalSettings, ...originalStrategies]) }
         : originalSettings;
     if (!originalSettings || settings.strategies.length === 0) {
         throw new Error('The authenticate hook needs at least one allowed strategy');
     }
-    return (context) => __awaiter(void 0, void 0, void 0, function* () {
+    return async (context, _next) => {
+        const next = typeof _next === 'function' ? _next : async () => context;
         const { app, params, type, path, service } = context;
         const { strategies } = settings;
         const { provider, authentication } = params;
@@ -41,19 +33,18 @@ exports.default = (originalSettings, ...originalStrategies) => {
             throw new errors_1.NotAuthenticated('The authenticate hook does not need to be used on the authentication service');
         }
         if (params.authenticated === true) {
-            return context;
+            return next();
         }
         if (authentication) {
-            const authParams = omit_1.default(params, 'provider', 'authentication');
+            const authParams = (0, omit_1.default)(params, 'provider', 'authentication');
             debug('Authenticating with', authentication, strategies);
-            const authResult = yield authService.authenticate(authentication, authParams, ...strategies);
-            context.params = Object.assign({}, params, omit_1.default(authResult, 'accessToken'), { authenticated: true });
-            return context;
+            const authResult = await authService.authenticate(authentication, authParams, ...strategies);
+            context.params = Object.assign({}, params, (0, omit_1.default)(authResult, 'accessToken'), { authenticated: true });
         }
         else if (provider) {
             throw new errors_1.NotAuthenticated('Not authenticated');
         }
-        return context;
-    });
+        return next();
+    };
 };
 //# sourceMappingURL=authenticate.js.map