@feathersjs/authentication 5.0.0-pre.6 → 5.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/index.js.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -2,7 +2,7 @@
2
2
  import { IncomingMessage } from 'http';
3
3
  import { Params } from '@feathersjs/feathers';
4
4
  import { AuthenticationBaseStrategy } from './strategy';
5
- import { AuthenticationRequest, AuthenticationResult, ConnectionEvent } from './core';
5
+ import { AuthenticationParams, AuthenticationRequest, AuthenticationResult, ConnectionEvent } from './core';
6
6
  export declare class JWTStrategy extends AuthenticationBaseStrategy {
7
7
  expirationTimers: WeakMap<object, any>;
8
8
  get configuration(): any;
@@ -17,7 +17,7 @@ export declare class JWTStrategy extends AuthenticationBaseStrategy {
17
17
  */
18
18
  getEntity(id: string, params: Params): Promise<any>;
19
19
  getEntityId(authResult: AuthenticationResult, _params: Params): Promise<any>;
20
- authenticate(authentication: AuthenticationRequest, params: Params): Promise<{
20
+ authenticate(authentication: AuthenticationRequest, params: AuthenticationParams): Promise<{
21
21
  accessToken: any;
22
22
  authentication: {
23
23
  strategy: string;
package/lib/jwt.js CHANGED
@@ -1,26 +1,17 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
14
5
  Object.defineProperty(exports, "__esModule", { value: true });
15
6
  exports.JWTStrategy = void 0;
16
- /* eslint-disable @typescript-eslint/no-unused-vars */
7
+ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/ban-ts-comment */
17
8
  const omit_1 = __importDefault(require("lodash/omit"));
18
9
  const errors_1 = require("@feathersjs/errors");
19
10
  const commons_1 = require("@feathersjs/commons");
20
11
  // @ts-ignore
21
12
  const long_timeout_1 = __importDefault(require("long-timeout"));
22
13
  const strategy_1 = require("./strategy");
23
- const debug = commons_1.createDebug('@feathersjs/authentication/jwt');
14
+ const debug = (0, commons_1.createDebug)('@feathersjs/authentication/jwt');
24
15
  const SPLIT_HEADER = /(\S+)\s+(\S+)/;
25
16
  class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
26
17
  constructor() {
@@ -30,39 +21,49 @@ class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
30
21
  get configuration() {
31
22
  const authConfig = this.authentication.configuration;
32
23
  const config = super.configuration;
33
- return Object.assign({ service: authConfig.service, entity: authConfig.entity, entityId: authConfig.entityId, header: 'Authorization', schemes: ['Bearer', 'JWT'] }, config);
24
+ return {
25
+ service: authConfig.service,
26
+ entity: authConfig.entity,
27
+ entityId: authConfig.entityId,
28
+ header: 'Authorization',
29
+ schemes: ['Bearer', 'JWT'],
30
+ ...config
31
+ };
34
32
  }
35
- handleConnection(event, connection, authResult) {
36
- return __awaiter(this, void 0, void 0, function* () {
37
- const isValidLogout = event === 'logout' && connection.authentication && authResult &&
38
- connection.authentication.accessToken === authResult.accessToken;
39
- const { accessToken } = authResult || {};
40
- if (accessToken && event === 'login') {
41
- debug('Adding authentication information to connection');
42
- const { exp } = yield this.authentication.verifyAccessToken(accessToken);
43
- // The time (in ms) until the token expires
44
- const duration = (exp * 1000) - Date.now();
45
- // This may have to be a `logout` event but right now we don't want
46
- // the whole context object lingering around until the timer is gone
47
- const timer = long_timeout_1.default.setTimeout(() => this.app.emit('disconnect', connection), duration);
48
- debug(`Registering connection expiration timer for ${duration}ms`);
49
- long_timeout_1.default.clearTimeout(this.expirationTimers.get(connection));
50
- this.expirationTimers.set(connection, timer);
51
- debug('Adding authentication information to connection');
52
- connection.authentication = {
53
- strategy: this.name,
54
- accessToken
55
- };
56
- }
57
- else if (event === 'disconnect' || isValidLogout) {
58
- debug('Removing authentication information and expiration timer from connection');
59
- const { entity } = this.configuration;
33
+ async handleConnection(event, connection, authResult) {
34
+ var _a;
35
+ const isValidLogout = event === 'logout' &&
36
+ connection.authentication &&
37
+ authResult &&
38
+ connection.authentication.accessToken === authResult.accessToken;
39
+ const { accessToken } = authResult || {};
40
+ const { entity } = this.configuration;
41
+ if (accessToken && event === 'login') {
42
+ debug('Adding authentication information to connection');
43
+ const { exp } = ((_a = authResult === null || authResult === void 0 ? void 0 : authResult.authentication) === null || _a === void 0 ? void 0 : _a.payload) || (await this.authentication.verifyAccessToken(accessToken));
44
+ // The time (in ms) until the token expires
45
+ const duration = exp * 1000 - Date.now();
46
+ const timer = long_timeout_1.default.setTimeout(() => this.app.emit('disconnect', connection), duration);
47
+ debug(`Registering connection expiration timer for ${duration}ms`);
48
+ long_timeout_1.default.clearTimeout(this.expirationTimers.get(connection));
49
+ this.expirationTimers.set(connection, timer);
50
+ debug('Adding authentication information to connection');
51
+ connection.authentication = {
52
+ strategy: this.name,
53
+ accessToken
54
+ };
55
+ connection[entity] = authResult[entity];
56
+ }
57
+ else if (event === 'disconnect' || isValidLogout) {
58
+ debug('Removing authentication information and expiration timer from connection');
59
+ await new Promise((resolve) => process.nextTick(() => {
60
60
  delete connection[entity];
61
61
  delete connection.authentication;
62
- long_timeout_1.default.clearTimeout(this.expirationTimers.get(connection));
63
- this.expirationTimers.delete(connection);
64
- }
65
- });
62
+ resolve(connection);
63
+ }));
64
+ long_timeout_1.default.clearTimeout(this.expirationTimers.get(connection));
65
+ this.expirationTimers.delete(connection);
66
+ }
66
67
  }
67
68
  verifyConfiguration() {
68
69
  const allowedKeys = ['entity', 'entityId', 'service', 'header', 'schemes'];
@@ -75,10 +76,8 @@ class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
75
76
  throw new Error(`The 'header' option for the ${this.name} strategy must be a string`);
76
77
  }
77
78
  }
78
- getEntityQuery(_params) {
79
- return __awaiter(this, void 0, void 0, function* () {
80
- return {};
81
- });
79
+ async getEntityQuery(_params) {
80
+ return {};
82
81
  }
83
82
  /**
84
83
  * Return the entity for a given id
@@ -86,70 +85,65 @@ class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
86
85
  * @param id The id to use
87
86
  * @param params Service call parameters
88
87
  */
89
- getEntity(id, params) {
90
- return __awaiter(this, void 0, void 0, function* () {
91
- const entityService = this.entityService;
92
- const { entity } = this.configuration;
93
- debug('Getting entity', id);
94
- if (entityService === null) {
95
- throw new errors_1.NotAuthenticated('Could not find entity service');
96
- }
97
- const query = yield this.getEntityQuery(params);
98
- const getParams = Object.assign({}, omit_1.default(params, 'provider'), { query });
99
- const result = yield entityService.get(id, getParams);
100
- if (!params.provider) {
101
- return result;
102
- }
103
- return entityService.get(id, Object.assign(Object.assign({}, params), { [entity]: result }));
104
- });
88
+ async getEntity(id, params) {
89
+ const entityService = this.entityService;
90
+ const { entity } = this.configuration;
91
+ debug('Getting entity', id);
92
+ if (entityService === null) {
93
+ throw new errors_1.NotAuthenticated('Could not find entity service');
94
+ }
95
+ const query = await this.getEntityQuery(params);
96
+ const getParams = Object.assign({}, (0, omit_1.default)(params, 'provider'), { query });
97
+ const result = await entityService.get(id, getParams);
98
+ if (!params.provider) {
99
+ return result;
100
+ }
101
+ return entityService.get(id, { ...params, [entity]: result });
105
102
  }
106
- getEntityId(authResult, _params) {
107
- return __awaiter(this, void 0, void 0, function* () {
108
- return authResult.authentication.payload.sub;
109
- });
103
+ async getEntityId(authResult, _params) {
104
+ return authResult.authentication.payload.sub;
110
105
  }
111
- authenticate(authentication, params) {
112
- return __awaiter(this, void 0, void 0, function* () {
113
- const { accessToken } = authentication;
114
- const { entity } = this.configuration;
115
- if (!accessToken) {
116
- throw new errors_1.NotAuthenticated('No access token');
117
- }
118
- const payload = yield this.authentication.verifyAccessToken(accessToken, params.jwt);
119
- const result = {
106
+ async authenticate(authentication, params) {
107
+ const { accessToken } = authentication;
108
+ const { entity } = this.configuration;
109
+ if (!accessToken) {
110
+ throw new errors_1.NotAuthenticated('No access token');
111
+ }
112
+ const payload = await this.authentication.verifyAccessToken(accessToken, params.jwt);
113
+ const result = {
114
+ accessToken,
115
+ authentication: {
116
+ strategy: 'jwt',
120
117
  accessToken,
121
- authentication: {
122
- strategy: 'jwt',
123
- accessToken,
124
- payload
125
- }
126
- };
127
- if (entity === null) {
128
- return result;
118
+ payload
129
119
  }
130
- const entityId = yield this.getEntityId(result, params);
131
- const value = yield this.getEntity(entityId, params);
132
- return Object.assign(Object.assign({}, result), { [entity]: value });
133
- });
120
+ };
121
+ if (entity === null) {
122
+ return result;
123
+ }
124
+ const entityId = await this.getEntityId(result, params);
125
+ const value = await this.getEntity(entityId, params);
126
+ return {
127
+ ...result,
128
+ [entity]: value
129
+ };
134
130
  }
135
- parse(req) {
136
- return __awaiter(this, void 0, void 0, function* () {
137
- const { header, schemes } = this.configuration;
138
- const headerValue = req.headers && req.headers[header.toLowerCase()];
139
- if (!headerValue || typeof headerValue !== 'string') {
140
- return null;
141
- }
142
- debug('Found parsed header value');
143
- const [, scheme, schemeValue] = headerValue.match(SPLIT_HEADER) || [];
144
- const hasScheme = scheme && schemes.some(current => new RegExp(current, 'i').test(scheme));
145
- if (scheme && !hasScheme) {
146
- return null;
147
- }
148
- return {
149
- strategy: this.name,
150
- accessToken: hasScheme ? schemeValue : headerValue
151
- };
152
- });
131
+ async parse(req) {
132
+ const { header, schemes } = this.configuration;
133
+ const headerValue = req.headers && req.headers[header.toLowerCase()];
134
+ if (!headerValue || typeof headerValue !== 'string') {
135
+ return null;
136
+ }
137
+ debug('Found parsed header value');
138
+ const [, scheme, schemeValue] = headerValue.match(SPLIT_HEADER) || [];
139
+ const hasScheme = scheme && schemes.some((current) => new RegExp(current, 'i').test(scheme));
140
+ if (scheme && !hasScheme) {
141
+ return null;
142
+ }
143
+ return {
144
+ strategy: this.name,
145
+ accessToken: hasScheme ? schemeValue : headerValue
146
+ };
153
147
  }
154
148
  }
155
149
  exports.JWTStrategy = JWTStrategy;
package/lib/jwt.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jwt.js","sourceRoot":"","sources":["../src/jwt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jwt.js","sourceRoot":"","sources":["../src/jwt.ts"],"names":[],"mappings":"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"}
package/lib/options.d.ts CHANGED
@@ -1,5 +1,6 @@
1
- declare const _default: {
2
- authStrategies: any[];
1
+ import { FromSchema, authenticationSettingsSchema } from '@feathersjs/schema';
2
+ export declare const defaultOptions: {
3
+ authStrategies: string[];
3
4
  jwtOptions: {
4
5
  header: {
5
6
  typ: string;
@@ -10,4 +11,5 @@ declare const _default: {
10
11
  expiresIn: string;
11
12
  };
12
13
  };
13
- export default _default;
14
+ export { authenticationSettingsSchema };
15
+ export type AuthenticationConfiguration = FromSchema<typeof authenticationSettingsSchema>;
package/lib/options.js CHANGED
@@ -1,6 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = {
3
+ exports.authenticationSettingsSchema = exports.defaultOptions = void 0;
4
+ const schema_1 = require("@feathersjs/schema");
5
+ Object.defineProperty(exports, "authenticationSettingsSchema", { enumerable: true, get: function () { return schema_1.authenticationSettingsSchema; } });
6
+ exports.defaultOptions = {
4
7
  authStrategies: [],
5
8
  jwtOptions: {
6
9
  header: { typ: 'access' },
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -1,8 +1,8 @@
1
- import { AuthenticationBase, AuthenticationResult, AuthenticationRequest } from './core';
2
1
  import '@feathersjs/transport-commons';
3
- import { Params, ServiceMethods, ServiceAddons } from '@feathersjs/feathers';
2
+ import { ServiceMethods, ServiceAddons } from '@feathersjs/feathers';
3
+ import { AuthenticationBase, AuthenticationResult, AuthenticationRequest, AuthenticationParams } from './core';
4
4
  declare module '@feathersjs/feathers/lib/declarations' {
5
- interface FeathersApplication<ServiceTypes, AppSettings> {
5
+ interface FeathersApplication<Services, Settings> {
6
6
  /**
7
7
  * Returns the default authentication service or the
8
8
  * authentication service for a given path.
@@ -18,7 +18,7 @@ declare module '@feathersjs/feathers/lib/declarations' {
18
18
  }
19
19
  export interface AuthenticationService extends ServiceAddons<AuthenticationResult, AuthenticationResult> {
20
20
  }
21
- export declare class AuthenticationService extends AuthenticationBase implements Partial<ServiceMethods<AuthenticationResult>> {
21
+ export declare class AuthenticationService extends AuthenticationBase implements Partial<ServiceMethods<AuthenticationResult, AuthenticationRequest, AuthenticationParams>> {
22
22
  constructor(app: any, configKey?: string, options?: {});
23
23
  /**
24
24
  * Return the payload for a JWT based on the authentication result.
@@ -27,7 +27,9 @@ export declare class AuthenticationService extends AuthenticationBase implements
27
27
  * @param _authResult The current authentication result
28
28
  * @param params The service call parameters
29
29
  */
30
- getPayload(_authResult: AuthenticationResult, params: Params): Promise<any>;
30
+ getPayload(_authResult: AuthenticationResult, params: AuthenticationParams): Promise<{
31
+ [key: string]: any;
32
+ }>;
31
33
  /**
32
34
  * Returns the JWT options based on an authentication result.
33
35
  * By default sets the JWT subject to the entity id.
@@ -35,7 +37,7 @@ export declare class AuthenticationService extends AuthenticationBase implements
35
37
  * @param authResult The authentication result
36
38
  * @param params Service call parameters
37
39
  */
38
- getTokenOptions(authResult: AuthenticationResult, params: Params): Promise<any>;
40
+ getTokenOptions(authResult: AuthenticationResult, params: AuthenticationParams): Promise<any>;
39
41
  /**
40
42
  * Create and return a new JWT for a given authentication request.
41
43
  * Will trigger the `login` event.
@@ -43,7 +45,7 @@ export declare class AuthenticationService extends AuthenticationBase implements
43
45
  * @param data The authentication request (should include `strategy` key)
44
46
  * @param params Service call parameters
45
47
  */
46
- create(data: AuthenticationRequest, params?: Params): Promise<AuthenticationResult>;
48
+ create(data: AuthenticationRequest, params?: AuthenticationParams): Promise<AuthenticationResult>;
47
49
  /**
48
50
  * Mark a JWT as removed. By default only verifies the JWT and returns the result.
49
51
  * Triggers the `logout` event.
@@ -51,7 +53,7 @@ export declare class AuthenticationService extends AuthenticationBase implements
51
53
  * @param id The JWT to remove or null
52
54
  * @param params Service call parameters
53
55
  */
54
- remove(id: string | null, params?: Params): Promise<AuthenticationResult>;
56
+ remove(id: string | null, params?: AuthenticationParams): Promise<AuthenticationResult>;
55
57
  /**
56
58
  * Validates the service configuration.
57
59
  */