@feathersjs/authentication 5.0.0-pre.3 → 5.0.0-pre.31

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

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AAIxB,sBAAK;AAFd,MAAM,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;AAGtB,oCAAY;AACrB,+BAMgB;AALd,0GAAA,kBAAkB,OAAA;AAMpB,uCAAwD;AAA/C,sHAAA,0BAA0B,OAAA;AACnC,qCAAkD;AAAzC,gHAAA,qBAAqB,OAAA;AAC9B,6BAAoC;AAA3B,kGAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAgC;AAChC,iCAAsC;AAA7B,qGAAA,YAAY,OAAA;AACrB,+BAOe;AANb,0GAAA,kBAAkB,OAAA;AAOpB,uCAAuD;AAA9C,sHAAA,0BAA0B,OAAA;AACnC,qCAAiD;AAAxC,gHAAA,qBAAqB,OAAA;AAC9B,6BAAmC;AAA1B,kGAAA,WAAW,OAAA;AACpB,qCAAqF;AAA5E,uHAAA,4BAA4B,OAAA"}

package/lib/jwt.d.ts

@@ -2,7 +2,7 @@
 import { IncomingMessage } from 'http';
 import { Params } from '@feathersjs/feathers';
 import { AuthenticationBaseStrategy } from './strategy';
-import { AuthenticationRequest, AuthenticationResult, ConnectionEvent } from './core';
+import { AuthenticationParams, AuthenticationRequest, AuthenticationResult, ConnectionEvent } from './core';
 export declare class JWTStrategy extends AuthenticationBaseStrategy {
     expirationTimers: WeakMap<object, any>;
     get configuration(): any;
@@ -17,7 +17,7 @@ export declare class JWTStrategy extends AuthenticationBaseStrategy {
      */
     getEntity(id: string, params: Params): Promise<any>;
     getEntityId(authResult: AuthenticationResult, _params: Params): Promise<any>;
-    authenticate(authentication: AuthenticationRequest, params: Params): Promise<{
+    authenticate(authentication: AuthenticationRequest, params: AuthenticationParams): Promise<{
         accessToken: any;
         authentication: {
             strategy: string;
@@ -28,5 +28,5 @@ export declare class JWTStrategy extends AuthenticationBaseStrategy {
     parse(req: IncomingMessage): Promise<{
         strategy: string;
         accessToken: string;
-    }>;
+    } | null>;
 }

package/lib/jwt.js

@@ -1,26 +1,17 @@
 "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 });
 exports.JWTStrategy = void 0;
-/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/ban-ts-comment */
 const omit_1 = __importDefault(require("lodash/omit"));
 const errors_1 = require("@feathersjs/errors");
 const commons_1 = require("@feathersjs/commons");
 // @ts-ignore
 const long_timeout_1 = __importDefault(require("long-timeout"));
 const strategy_1 = require("./strategy");
-const debug = commons_1.createDebug('@feathersjs/authentication/jwt');
+const debug = (0, commons_1.createDebug)('@feathersjs/authentication/jwt');
 const SPLIT_HEADER = /(\S+)\s+(\S+)/;
 class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
     constructor() {
@@ -30,39 +21,46 @@ class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
     get configuration() {
         const authConfig = this.authentication.configuration;
         const config = super.configuration;
-        return Object.assign({ service: authConfig.service, entity: authConfig.entity, entityId: authConfig.entityId, header: 'Authorization', schemes: ['Bearer', 'JWT'] }, config);
+        return {
+            service: authConfig.service,
+            entity: authConfig.entity,
+            entityId: authConfig.entityId,
+            header: 'Authorization',
+            schemes: ['Bearer', 'JWT'],
+            ...config
+        };
     }
-    handleConnection(event, connection, authResult) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const isValidLogout = event === 'logout' && connection.authentication && authResult &&
-                connection.authentication.accessToken === authResult.accessToken;
-            const { accessToken } = authResult || {};
-            if (accessToken && event === 'login') {
-                debug('Adding authentication information to connection');
-                const { exp } = yield this.authentication.verifyAccessToken(accessToken);
-                // The time (in ms) until the token expires
-                const duration = (exp * 1000) - Date.now();
-                // This may have to be a `logout` event but right now we don't want
-                // the whole context object lingering around until the timer is gone
-                const timer = long_timeout_1.default.setTimeout(() => this.app.emit('disconnect', connection), duration);
-                debug(`Registering connection expiration timer for ${duration}ms`);
-                long_timeout_1.default.clearTimeout(this.expirationTimers.get(connection));
-                this.expirationTimers.set(connection, timer);
-                debug('Adding authentication information to connection');
-                connection.authentication = {
-                    strategy: this.name,
-                    accessToken
-                };
-            }
-            else if (event === 'disconnect' || isValidLogout) {
-                debug('Removing authentication information and expiration timer from connection');
-                const { entity } = this.configuration;
-                delete connection[entity];
-                delete connection.authentication;
-                long_timeout_1.default.clearTimeout(this.expirationTimers.get(connection));
-                this.expirationTimers.delete(connection);
-            }
-        });
+    async handleConnection(event, connection, authResult) {
+        const isValidLogout = event === 'logout' &&
+            connection.authentication &&
+            authResult &&
+            connection.authentication.accessToken === authResult.accessToken;
+        const { accessToken } = authResult || {};
+        if (accessToken && event === 'login') {
+            debug('Adding authentication information to connection');
+            const { exp } = await this.authentication.verifyAccessToken(accessToken);
+            // The time (in ms) until the token expires
+            const duration = exp * 1000 - Date.now();
+            // This may have to be a `logout` event but right now we don't want
+            // the whole context object lingering around until the timer is gone
+            const timer = long_timeout_1.default.setTimeout(() => this.app.emit('disconnect', connection), duration);
+            debug(`Registering connection expiration timer for ${duration}ms`);
+            long_timeout_1.default.clearTimeout(this.expirationTimers.get(connection));
+            this.expirationTimers.set(connection, timer);
+            debug('Adding authentication information to connection');
+            connection.authentication = {
+                strategy: this.name,
+                accessToken
+            };
+        }
+        else if (event === 'disconnect' || isValidLogout) {
+            debug('Removing authentication information and expiration timer from connection');
+            const { entity } = this.configuration;
+            delete connection[entity];
+            delete connection.authentication;
+            long_timeout_1.default.clearTimeout(this.expirationTimers.get(connection));
+            this.expirationTimers.delete(connection);
+        }
     }
     verifyConfiguration() {
         const allowedKeys = ['entity', 'entityId', 'service', 'header', 'schemes'];
@@ -75,10 +73,8 @@ class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
             throw new Error(`The 'header' option for the ${this.name} strategy must be a string`);
         }
     }
-    getEntityQuery(_params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {};
-        });
+    async getEntityQuery(_params) {
+        return {};
     }
     /**
      * Return the entity for a given id
@@ -86,70 +82,65 @@ class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
      * @param id The id to use
      * @param params Service call parameters
      */
-    getEntity(id, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const entityService = this.entityService;
-            const { entity } = this.configuration;
-            debug('Getting entity', id);
-            if (entityService === null) {
-                throw new errors_1.NotAuthenticated('Could not find entity service');
-            }
-            const query = yield this.getEntityQuery(params);
-            const getParams = Object.assign({}, omit_1.default(params, 'provider'), { query });
-            const result = yield entityService.get(id, getParams);
-            if (!params.provider) {
-                return result;
-            }
-            return entityService.get(id, Object.assign(Object.assign({}, params), { [entity]: result }));
-        });
+    async getEntity(id, params) {
+        const entityService = this.entityService;
+        const { entity } = this.configuration;
+        debug('Getting entity', id);
+        if (entityService === null) {
+            throw new errors_1.NotAuthenticated('Could not find entity service');
+        }
+        const query = await this.getEntityQuery(params);
+        const getParams = Object.assign({}, (0, omit_1.default)(params, 'provider'), { query });
+        const result = await entityService.get(id, getParams);
+        if (!params.provider) {
+            return result;
+        }
+        return entityService.get(id, { ...params, [entity]: result });
     }
-    getEntityId(authResult, _params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return authResult.authentication.payload.sub;
-        });
+    async getEntityId(authResult, _params) {
+        return authResult.authentication.payload.sub;
     }
-    authenticate(authentication, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { accessToken } = authentication;
-            const { entity } = this.configuration;
-            if (!accessToken) {
-                throw new errors_1.NotAuthenticated('No access token');
-            }
-            const payload = yield this.authentication.verifyAccessToken(accessToken, params.jwt);
-            const result = {
+    async authenticate(authentication, params) {
+        const { accessToken } = authentication;
+        const { entity } = this.configuration;
+        if (!accessToken) {
+            throw new errors_1.NotAuthenticated('No access token');
+        }
+        const payload = await this.authentication.verifyAccessToken(accessToken, params.jwt);
+        const result = {
+            accessToken,
+            authentication: {
+                strategy: 'jwt',
                 accessToken,
-                authentication: {
-                    strategy: 'jwt',
-                    accessToken,
-                    payload
-                }
-            };
-            if (entity === null) {
-                return result;
+                payload
             }
-            const entityId = yield this.getEntityId(result, params);
-            const value = yield this.getEntity(entityId, params);
-            return Object.assign(Object.assign({}, result), { [entity]: value });
-        });
+        };
+        if (entity === null) {
+            return result;
+        }
+        const entityId = await this.getEntityId(result, params);
+        const value = await this.getEntity(entityId, params);
+        return {
+            ...result,
+            [entity]: value
+        };
     }
-    parse(req) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { header, schemes } = this.configuration;
-            const headerValue = req.headers && req.headers[header.toLowerCase()];
-            if (!headerValue || typeof headerValue !== 'string') {
-                return null;
-            }
-            debug('Found parsed header value');
-            const [, scheme, schemeValue] = headerValue.match(SPLIT_HEADER) || [];
-            const hasScheme = scheme && schemes.some(current => new RegExp(current, 'i').test(scheme));
-            if (scheme && !hasScheme) {
-                return null;
-            }
-            return {
-                strategy: this.name,
-                accessToken: hasScheme ? schemeValue : headerValue
-            };
-        });
+    async parse(req) {
+        const { header, schemes } = this.configuration;
+        const headerValue = req.headers && req.headers[header.toLowerCase()];
+        if (!headerValue || typeof headerValue !== 'string') {
+            return null;
+        }
+        debug('Found parsed header value');
+        const [, scheme, schemeValue] = headerValue.match(SPLIT_HEADER) || [];
+        const hasScheme = scheme && schemes.some((current) => new RegExp(current, 'i').test(scheme));
+        if (scheme && !hasScheme) {
+            return null;
+        }
+        return {
+            strategy: this.name,
+            accessToken: hasScheme ? schemeValue : headerValue
+        };
     }
 }
 exports.JWTStrategy = JWTStrategy;

package/lib/jwt.js.map

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

package/lib/options.d.ts

@@ -1,5 +1,6 @@
-declare const _default: {
-    authStrategies: any[];
+import { FromSchema, authenticationSettingsSchema } from '@feathersjs/schema';
+export declare const defaultOptions: {
+    authStrategies: string[];
     jwtOptions: {
         header: {
             typ: string;
@@ -10,4 +11,5 @@ declare const _default: {
         expiresIn: string;
     };
 };
-export default _default;
+export { authenticationSettingsSchema };
+export declare type AuthenticationConfiguration = FromSchema<typeof authenticationSettingsSchema>;

package/lib/options.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
+exports.authenticationSettingsSchema = exports.defaultOptions = void 0;
+const schema_1 = require("@feathersjs/schema");
+Object.defineProperty(exports, "authenticationSettingsSchema", { enumerable: true, get: function () { return schema_1.authenticationSettingsSchema; } });
+exports.defaultOptions = {
     authStrategies: [],
     jwtOptions: {
         header: { typ: 'access' },

package/lib/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,cAAc,EAAE,EAAE;IAClB,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;QACzB,QAAQ,EAAE,wBAAwB;QAClC,MAAM,EAAE,UAAU;QAClB,SAAS,EAAE,OAAO;QAClB,SAAS,EAAE,IAAI;KAChB;CACF,CAAC"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":";;;AAAA,+CAA6E;AAapE,6GAbY,qCAA4B,OAaZ;AAXxB,QAAA,cAAc,GAAG;IAC5B,cAAc,EAAE,EAAc;IAC9B,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;QACzB,QAAQ,EAAE,wBAAwB;QAClC,MAAM,EAAE,UAAU;QAClB,SAAS,EAAE,OAAO;QAClB,SAAS,EAAE,IAAI;KAChB;CACF,CAAA"}

package/lib/service.d.ts

@@ -1,8 +1,8 @@
-import { AuthenticationBase, AuthenticationResult, AuthenticationRequest } from './core';
 import '@feathersjs/transport-commons';
-import { Params, ServiceMethods, ServiceAddons } from '@feathersjs/feathers';
+import { ServiceMethods, ServiceAddons } from '@feathersjs/feathers';
+import { AuthenticationBase, AuthenticationResult, AuthenticationRequest, AuthenticationParams } from './core';
 declare module '@feathersjs/feathers/lib/declarations' {
-    interface FeathersApplication<ServiceTypes, AppSettings> {
+    interface FeathersApplication<Services, Settings> {
         /**
          * Returns the default authentication service or the
          * authentication service for a given path.
@@ -18,7 +18,7 @@ declare module '@feathersjs/feathers/lib/declarations' {
 }
 export interface AuthenticationService extends ServiceAddons<AuthenticationResult, AuthenticationResult> {
 }
-export declare class AuthenticationService extends AuthenticationBase implements Partial<ServiceMethods<AuthenticationResult>> {
+export declare class AuthenticationService extends AuthenticationBase implements Partial<ServiceMethods<AuthenticationResult, AuthenticationRequest, AuthenticationParams>> {
     constructor(app: any, configKey?: string, options?: {});
     /**
      * Return the payload for a JWT based on the authentication result.
@@ -27,7 +27,9 @@ export declare class AuthenticationService extends AuthenticationBase implements
      * @param _authResult The current authentication result
      * @param params The service call parameters
      */
-    getPayload(_authResult: AuthenticationResult, params: Params): Promise<any>;
+    getPayload(_authResult: AuthenticationResult, params: AuthenticationParams): Promise<{
+        [key: string]: any;
+    }>;
     /**
      * Returns the JWT options based on an authentication result.
      * By default sets the JWT subject to the entity id.
@@ -35,7 +37,7 @@ export declare class AuthenticationService extends AuthenticationBase implements
      * @param authResult The authentication result
      * @param params Service call parameters
      */
-    getTokenOptions(authResult: AuthenticationResult, params: Params): Promise<any>;
+    getTokenOptions(authResult: AuthenticationResult, params: AuthenticationParams): Promise<any>;
     /**
      * Create and return a new JWT for a given authentication request.
      * Will trigger the `login` event.
@@ -43,7 +45,7 @@ export declare class AuthenticationService extends AuthenticationBase implements
      * @param data The authentication request (should include `strategy` key)
      * @param params Service call parameters
      */
-    create(data: AuthenticationRequest, params?: Params): Promise<AuthenticationResult>;
+    create(data: AuthenticationRequest, params?: AuthenticationParams): Promise<AuthenticationResult>;
     /**
      * Mark a JWT as removed. By default only verifies the JWT and returns the result.
      * Triggers the `logout` event.
@@ -51,7 +53,7 @@ export declare class AuthenticationService extends AuthenticationBase implements
      * @param id The JWT to remove or null
      * @param params Service call parameters
      */
-    remove(id: string | null, params?: Params): Promise<AuthenticationResult>;
+    remove(id: string | null, params?: AuthenticationParams): Promise<AuthenticationResult>;
     /**
      * Validates the service configuration.
      */