@feathersjs/authentication 5.0.0-pre.9 → 5.0.0

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Feathers
+Copyright (c) 2023 Feathers Contributors
 
 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) 2023 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
 
 Licensed under the [MIT license](LICENSE).

package/lib/core.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { SignOptions, Secret, VerifyOptions } from 'jsonwebtoken';
 import { Application, Params } from '@feathersjs/feathers';
 import { IncomingMessage, ServerResponse } from 'http';
+import { AuthenticationConfiguration } from './options';
 export interface AuthenticationResult {
     [key: string]: any;
 }
@@ -9,7 +11,16 @@ export interface AuthenticationRequest {
     strategy?: string;
     [key: string]: any;
 }
-export declare type ConnectionEvent = 'login' | 'logout' | 'disconnect';
+export interface AuthenticationParams extends Params {
+    payload?: {
+        [key: string]: any;
+    };
+    jwtOptions?: SignOptions;
+    authStrategies?: string[];
+    secret?: string;
+    [key: string]: any;
+}
+export type ConnectionEvent = 'login' | 'logout' | 'disconnect';
 export interface AuthenticationStrategy {
     /**
      * Implement this method to get access to the AuthenticationService
@@ -34,6 +45,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 +58,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 +82,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.
      *
@@ -80,7 +98,7 @@ export declare class AuthenticationBase {
     /**
      * Return the current configuration from the application
      */
-    get configuration(): any;
+    get configuration(): AuthenticationConfiguration;
     /**
      * A list of all registered strategy names
      */
@@ -98,6 +116,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 +146,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 +156,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 };
 };
@@ -18,8 +9,8 @@ const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const uuid_1 = require("uuid");
 const errors_1 = require("@feathersjs/errors");
 const commons_1 = require("@feathersjs/commons");
-const options_1 = __importDefault(require("./options"));
-const debug = commons_1.createDebug('@feathersjs/authentication/base');
+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.
@@ -83,8 +79,16 @@ class AuthenticationBase {
      * @param names The list or strategy names
      */
     getStrategies(...names) {
-        return names.map(name => this.strategies[name])
-            .filter(current => !!current);
+        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 +97,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 +116,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 +141,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 +171,24 @@ 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, 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>, _next?: NextFunction) => Promise<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 };
 };
@@ -16,28 +7,27 @@ const flatten_1 = __importDefault(require("lodash/flatten"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const errors_1 = require("@feathersjs/errors");
 const commons_1 = require("@feathersjs/commons");
-const debug = commons_1.createDebug('@feathersjs/authentication/hooks/authenticate');
+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, _next) => __awaiter(void 0, void 0, void 0, function* () {
-        const next = typeof _next === 'function' ? _next : () => __awaiter(void 0, void 0, void 0, function* () { return context; });
+    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;
         const authService = app.defaultAuthentication(settings.service);
         debug(`Running authenticate hook on '${path}'`);
-        if (type && type !== 'before') {
+        if (type && type !== 'before' && type !== 'around') {
             throw new errors_1.NotAuthenticated('The authenticate hook must be used as a before hook');
         }
         if (!authService || typeof authService.authenticate !== 'function') {
             throw new errors_1.NotAuthenticated('Could not find a valid authentication service');
         }
-        // @ts-ignore
         if (service === authService) {
             throw new errors_1.NotAuthenticated('The authenticate hook does not need to be used on the authentication service');
         }
@@ -45,15 +35,17 @@ exports.default = (originalSettings, ...originalStrategies) => {
             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 });
+            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 next();
-    });
+    };
 };
 //# sourceMappingURL=authenticate.js.map

package/lib/hooks/authenticate.js.map

@@ -1 +1 @@
-{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../src/hooks/authenticate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,6DAAqC;AACrC,uDAA+B;AAE/B,+CAAsD;AACtD,iDAAkD;AAElD,MAAM,KAAK,GAAG,qBAAW,CAAC,+CAA+C,CAAC,CAAC;AAO3E,kBAAe,CAAC,gBAAmD,EAAE,GAAG,kBAA4B,EAAE,EAAE;IACtG,MAAM,QAAQ,GAAG,OAAO,gBAAgB,KAAK,QAAQ;QACnD,CAAC,CAAC,EAAE,UAAU,EAAE,iBAAO,CAAC,CAAE,gBAAgB,EAAE,GAAG,kBAAkB,CAAE,CAAC,EAAE;QACtE,CAAC,CAAC,gBAAgB,CAAC;IAErB,IAAI,CAAC,gBAAgB,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QACzD,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;KAC9E;IAED,OAAO,CAAO,OAA8B,EAAE,KAAoB,EAAE,EAAE;QACpE,MAAM,IAAI,GAAG,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAS,EAAE,kDAAC,OAAA,OAAO,CAAA,GAAA,CAAC;QACvE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QACrD,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;QAChC,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;QAC5C,MAAM,WAAW,GAAG,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAEhE,KAAK,CAAC,iCAAiC,IAAI,GAAG,CAAC,CAAC;QAEhD,IAAI,IAAI,IAAI,IAAI,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,yBAAgB,CAAC,qDAAqD,CAAC,CAAC;SACnF;QAED,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,CAAC,YAAY,KAAK,UAAU,EAAE;YAClE,MAAM,IAAI,yBAAgB,CAAC,+CAA+C,CAAC,CAAC;SAC7E;QAED,aAAa;QACb,IAAI,OAAO,KAAK,WAAW,EAAE;YAC3B,MAAM,IAAI,yBAAgB,CAAC,8EAA8E,CAAC,CAAC;SAC5G;QAED,IAAI,MAAM,CAAC,aAAa,KAAK,IAAI,EAAE;YACjC,OAAO,IAAI,EAAE,CAAC;SACf;QAED,IAAI,cAAc,EAAE;YAClB,MAAM,UAAU,GAAG,cAAI,CAAC,MAAM,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;YAE9D,KAAK,CAAC,qBAAqB,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;YAEzD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,cAAc,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,CAAC;YAE7F,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,cAAI,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;SACtG;aAAM,IAAI,QAAQ,EAAE;YACnB,MAAM,IAAI,yBAAgB,CAAC,mBAAmB,CAAC,CAAC;SACjD;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAA,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../src/hooks/authenticate.ts"],"names":[],"mappings":";;;;;AAAA,6DAAoC;AACpC,uDAA8B;AAE9B,+CAAqD;AACrD,iDAAiD;AAEjD,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,+CAA+C,CAAC,CAAA;AAO1E,kBAAe,CAAC,gBAAmD,EAAE,GAAG,kBAA4B,EAAE,EAAE;IACtG,MAAM,QAAQ,GACZ,OAAO,gBAAgB,KAAK,QAAQ;QAClC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAA,iBAAO,EAAC,CAAC,gBAAgB,EAAE,GAAG,kBAAkB,CAAC,CAAC,EAAE;QACpE,CAAC,CAAC,gBAAgB,CAAA;IAEtB,IAAI,CAAC,gBAAgB,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QACzD,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;KAC7E;IAED,OAAO,KAAK,EAAE,OAAoB,EAAE,KAAoB,EAAE,EAAE;QAC1D,MAAM,IAAI,GAAG,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,OAAO,CAAA;QACtE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;QACpD,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAA;QAC/B,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,CAAA;QAC3C,MAAM,WAAW,GAAG,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAE/D,KAAK,CAAC,iCAAiC,IAAI,GAAG,CAAC,CAAA;QAE/C,IAAI,IAAI,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ,EAAE;YAClD,MAAM,IAAI,yBAAgB,CAAC,qDAAqD,CAAC,CAAA;SAClF;QAED,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,CAAC,YAAY,KAAK,UAAU,EAAE;YAClE,MAAM,IAAI,yBAAgB,CAAC,+CAA+C,CAAC,CAAA;SAC5E;QAED,IAAI,OAAO,KAAK,WAAW,EAAE;YAC3B,MAAM,IAAI,yBAAgB,CACxB,8EAA8E,CAC/E,CAAA;SACF;QAED,IAAI,MAAM,CAAC,aAAa,KAAK,IAAI,EAAE;YACjC,OAAO,IAAI,EAAE,CAAA;SACd;QAED,IAAI,cAAc,EAAE;YAClB,MAAM,UAAU,GAAG,IAAA,cAAI,EAAC,MAAM,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAA;YAE7D,KAAK,CAAC,qBAAqB,EAAE,cAAc,EAAE,UAAU,CAAC,CAAA;YAExD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,cAAc,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,CAAA;YAE5F,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAA,cAAI,EAAC,UAAU,EAAE,aAAa,CAAC,EAAE;gBAC1E,aAAa,EAAE,IAAI;aACpB,CAAC,CAAA;SACH;aAAM,IAAI,QAAQ,EAAE;YACnB,MAAM,IAAI,yBAAgB,CAAC,mBAAmB,CAAC,CAAA;SAChD;QAED,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;AACH,CAAC,CAAA"}

package/lib/hooks/connection.js

@@ -1,25 +1,11 @@
 "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 };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const omit_1 = __importDefault(require("lodash/omit"));
-exports.default = (event) => (context, next) => __awaiter(void 0, void 0, void 0, function* () {
-    yield next();
+exports.default = (event) => async (context, next) => {
+    await next();
     const { result, params: { connection } } = context;
     if (connection) {
         const service = context.service;
-        Object.assign(connection, omit_1.default(result, 'accessToken', 'authentication'));
-        yield service.handleConnection(event, connection, result);
+        await service.handleConnection(event, connection, result);
     }
-});
+};
 //# sourceMappingURL=connection.js.map

package/lib/hooks/connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/hooks/connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,uDAA+B;AAG/B,kBAAe,CAAC,KAAsB,EAAE,EAAE,CAAC,CAAO,OAAoB,EAAE,IAAkB,EAAE,EAAE;IAC5F,MAAM,IAAI,EAAE,CAAC;IAEb,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC;IAEnD,IAAI,UAAU,EAAE;QACd,MAAM,OAAO,GAAG,OAAO,CAAC,OAAwC,CAAC;QAEjE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,cAAI,CAAC,MAAM,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAEzE,MAAM,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;KAC3D;AACH,CAAC,CAAA,CAAC"}
+{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/hooks/connection.ts"],"names":[],"mappings":";;AAGA,kBAAe,CAAC,KAAsB,EAAE,EAAE,CAAC,KAAK,EAAE,OAAoB,EAAE,IAAkB,EAAE,EAAE;IAC5F,MAAM,IAAI,EAAE,CAAA;IAEZ,MAAM,EACJ,MAAM,EACN,MAAM,EAAE,EAAE,UAAU,EAAE,EACvB,GAAG,OAAO,CAAA;IAEX,IAAI,UAAU,EAAE;QACd,MAAM,OAAO,GAAG,OAAO,CAAC,OAAwC,CAAA;QAEhE,MAAM,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;KAC1D;AACH,CAAC,CAAA"}

package/lib/hooks/event.js

@@ -1,22 +1,13 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const commons_1 = require("@feathersjs/commons");
-const debug = commons_1.createDebug('@feathersjs/authentication/hooks/connection');
-exports.default = (event) => (context, next) => __awaiter(void 0, void 0, void 0, function* () {
-    yield next();
+const debug = (0, commons_1.createDebug)('@feathersjs/authentication/hooks/connection');
+exports.default = (event) => async (context, next) => {
+    await next();
     const { app, result, params } = context;
     if (params.provider && result) {
         debug(`Sending authentication event '${event}'`);
         app.emit(event, result, params, context);
     }
-});
+};
 //# sourceMappingURL=event.js.map

package/lib/hooks/event.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.js","sourceRoot":"","sources":["../../src/hooks/event.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,iDAAkD;AAGlD,MAAM,KAAK,GAAG,qBAAW,CAAC,6CAA6C,CAAC,CAAC;AAEzE,kBAAe,CAAC,KAAsB,EAAE,EAAE,CAAC,CAAO,OAAoB,EAAE,IAAkB,EAAE,EAAE;IAC5F,MAAM,IAAI,EAAE,CAAC;IAEb,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAExC,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,EAAE;QAC7B,KAAK,CAAC,iCAAiC,KAAK,GAAG,CAAC,CAAC;QACjD,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;KAC1C;AACH,CAAC,CAAA,CAAC"}
+{"version":3,"file":"event.js","sourceRoot":"","sources":["../../src/hooks/event.ts"],"names":[],"mappings":";;AACA,iDAAiD;AAGjD,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,6CAA6C,CAAC,CAAA;AAExE,kBAAe,CAAC,KAAsB,EAAE,EAAE,CAAC,KAAK,EAAE,OAAoB,EAAE,IAAkB,EAAE,EAAE;IAC5F,MAAM,IAAI,EAAE,CAAA;IAEZ,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAEvC,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,EAAE;QAC7B,KAAK,CAAC,iCAAiC,KAAK,GAAG,CAAC,CAAA;QAChD,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;KACzC;AACH,CAAC,CAAA"}

package/lib/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyD;AAAhD,6HAAA,OAAO,OAAgB;AAChC,2CAAqD;AAA5C,yHAAA,OAAO,OAAc;AAC9B,iCAA2C;AAAlC,+GAAA,OAAO,OAAS"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAwD;AAA/C,6HAAA,OAAO,OAAgB;AAChC,2CAAoD;AAA3C,yHAAA,OAAO,OAAc;AAC9B,iCAA0C;AAAjC,+GAAA,OAAO,OAAS"}

package/lib/index.d.ts

@@ -1,8 +1,7 @@
-import * as hooks from './hooks';
-declare const authenticate: (originalSettings: string | import("./hooks/authenticate").AuthenticateHookSettings, ...originalStrategies: string[]) => (context: import("@feathersjs/feathers/lib").HookContext<any, any>, _next?: import("@feathersjs/hooks/lib").NextFunction) => Promise<any>;
-export { hooks };
-export { authenticate };
-export { AuthenticationBase, AuthenticationRequest, AuthenticationResult, AuthenticationStrategy, ConnectionEvent } from './core';
+export * as hooks from './hooks';
+export { authenticate } from './hooks';
+export { AuthenticationBase, AuthenticationRequest, AuthenticationResult, AuthenticationStrategy, AuthenticationParams, ConnectionEvent } from './core';
 export { AuthenticationBaseStrategy } from './strategy';
 export { AuthenticationService } from './service';
 export { JWTStrategy } from './jwt';
+export { authenticationSettingsSchema, AuthenticationConfiguration } from './options';

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -19,11 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JWTStrategy = exports.AuthenticationService = exports.AuthenticationBaseStrategy = exports.AuthenticationBase = exports.authenticate = exports.hooks = void 0;
-const hooks = __importStar(require("./hooks"));
-exports.hooks = hooks;
-const { authenticate } = hooks;
-exports.authenticate = authenticate;
+exports.authenticationSettingsSchema = exports.JWTStrategy = exports.AuthenticationService = exports.AuthenticationBaseStrategy = exports.AuthenticationBase = exports.authenticate = exports.hooks = void 0;
+exports.hooks = __importStar(require("./hooks"));
+var hooks_1 = require("./hooks");
+Object.defineProperty(exports, "authenticate", { enumerable: true, get: function () { return hooks_1.authenticate; } });
 var core_1 = require("./core");
 Object.defineProperty(exports, "AuthenticationBase", { enumerable: true, get: function () { return core_1.AuthenticationBase; } });
 var strategy_1 = require("./strategy");
@@ -32,4 +35,6 @@ var service_1 = require("./service");
 Object.defineProperty(exports, "AuthenticationService", { enumerable: true, get: function () { return service_1.AuthenticationService; } });
 var jwt_1 = require("./jwt");
 Object.defineProperty(exports, "JWTStrategy", { enumerable: true, get: function () { return jwt_1.JWTStrategy; } });
+var options_1 = require("./options");
+Object.defineProperty(exports, "authenticationSettingsSchema", { enumerable: true, get: function () { return options_1.authenticationSettingsSchema; } });
 //# sourceMappingURL=index.js.map