@feathersjs/authentication 4.5.8 → 4.5.12
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/CHANGELOG.md +38 -0
- package/lib/core.js +5 -5
- package/lib/core.js.map +1 -1
- package/lib/hooks/authenticate.js +4 -4
- package/lib/hooks/authenticate.js.map +1 -1
- package/lib/hooks/connection.js +1 -1
- package/lib/hooks/connection.js.map +1 -1
- package/lib/hooks/event.js +1 -1
- package/lib/hooks/event.js.map +1 -1
- package/lib/hooks/index.js +7 -3
- package/lib/hooks/index.js.map +1 -1
- package/lib/index.js +2 -2
- package/lib/jwt.js +2 -2
- package/lib/jwt.js.map +1 -1
- package/lib/service.js +11 -5
- package/lib/service.js.map +1 -1
- package/package.json +18 -18
- package/src/core.ts +1 -1
- package/src/service.ts +7 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,44 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [4.5.12](https://github.com/feathersjs/feathers/compare/v4.5.11...v4.5.12) (2022-01-06)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* Update all dependencies for crow release ([#2520](https://github.com/feathersjs/feathers/issues/2520)) ([1c63e6b](https://github.com/feathersjs/feathers/commit/1c63e6be37ff85edbe8dd318415ca6919864c033))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [4.5.11](https://github.com/feathersjs/feathers/compare/v4.5.10...v4.5.11) (2020-12-05)
|
|
18
|
+
|
|
19
|
+
**Note:** Version bump only for package @feathersjs/authentication
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
## [4.5.10](https://github.com/feathersjs/feathers/compare/v4.5.9...v4.5.10) (2020-11-08)
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
### Bug Fixes
|
|
29
|
+
|
|
30
|
+
* **authentication:** consistent response return between local and jwt strategy ([#2042](https://github.com/feathersjs/feathers/issues/2042)) ([8d25be1](https://github.com/feathersjs/feathers/commit/8d25be101a2593a9e789375c928a07780b9e28cf))
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
|
|
37
|
+
|
|
38
|
+
**Note:** Version bump only for package @feathersjs/authentication
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
6
44
|
## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
|
|
7
45
|
|
|
8
46
|
**Note:** Version bump only for package @feathersjs/authentication
|
package/lib/core.js
CHANGED
|
@@ -19,7 +19,7 @@ const uuid_1 = require("uuid");
|
|
|
19
19
|
const errors_1 = require("@feathersjs/errors");
|
|
20
20
|
const debug_1 = __importDefault(require("debug"));
|
|
21
21
|
const options_1 = __importDefault(require("./options"));
|
|
22
|
-
const debug = debug_1.default('@feathersjs/authentication/base');
|
|
22
|
+
const debug = (0, debug_1.default)('@feathersjs/authentication/base');
|
|
23
23
|
/**
|
|
24
24
|
* A base class for managing authentication strategies and creating and verifying JWTs
|
|
25
25
|
*/
|
|
@@ -38,7 +38,7 @@ class AuthenticationBase {
|
|
|
38
38
|
this.strategies = {};
|
|
39
39
|
this.configKey = configKey;
|
|
40
40
|
app.set('defaultAuthentication', app.get('defaultAuthentication') || configKey);
|
|
41
|
-
app.set(configKey, merge_1.default({}, app.get(configKey), options));
|
|
41
|
+
app.set(configKey, (0, merge_1.default)({}, app.get(configKey), options));
|
|
42
42
|
}
|
|
43
43
|
/**
|
|
44
44
|
* Return the current configuration from the application
|
|
@@ -95,10 +95,10 @@ class AuthenticationBase {
|
|
|
95
95
|
// Use configuration by default but allow overriding the secret
|
|
96
96
|
const jwtSecret = secretOverride || secret;
|
|
97
97
|
// Default jwt options merged with additional options
|
|
98
|
-
const options = merge_1.default({}, jwtOptions, optsOverride);
|
|
98
|
+
const options = (0, merge_1.default)({}, jwtOptions, optsOverride);
|
|
99
99
|
if (!options.jwtid) {
|
|
100
100
|
// Generate a UUID as JWT ID by default
|
|
101
|
-
options.jwtid = uuid_1.v4();
|
|
101
|
+
options.jwtid = (0, uuid_1.v4)();
|
|
102
102
|
}
|
|
103
103
|
return jsonwebtoken_1.default.sign(payload, jwtSecret, options);
|
|
104
104
|
});
|
|
@@ -113,7 +113,7 @@ class AuthenticationBase {
|
|
|
113
113
|
return __awaiter(this, void 0, void 0, function* () {
|
|
114
114
|
const { secret, jwtOptions } = this.configuration;
|
|
115
115
|
const jwtSecret = secretOverride || secret;
|
|
116
|
-
const options = merge_1.default({}, jwtOptions, optsOverride);
|
|
116
|
+
const options = (0, merge_1.default)({}, jwtOptions, optsOverride);
|
|
117
117
|
const { algorithm } = options;
|
|
118
118
|
// Normalize the `algorithm` setting into the algorithms array
|
|
119
119
|
if (algorithm && !options.algorithms) {
|
package/lib/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAiC;AACjC,gEAAgF;AAChF,+BAAoC;AACpC,+CAAsD;AACtD,kDAA0B;AAG1B,wDAAuC;AAEvC,MAAM,KAAK,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,10 @@ const flatten_1 = __importDefault(require("lodash/flatten"));
|
|
|
16
16
|
const omit_1 = __importDefault(require("lodash/omit"));
|
|
17
17
|
const errors_1 = require("@feathersjs/errors");
|
|
18
18
|
const debug_1 = __importDefault(require("debug"));
|
|
19
|
-
const debug = debug_1.default('@feathersjs/authentication/hooks/authenticate');
|
|
19
|
+
const debug = (0, debug_1.default)('@feathersjs/authentication/hooks/authenticate');
|
|
20
20
|
exports.default = (originalSettings, ...originalStrategies) => {
|
|
21
21
|
const settings = typeof originalSettings === 'string'
|
|
22
|
-
? { strategies: flatten_1.default([originalSettings, ...originalStrategies]) }
|
|
22
|
+
? { strategies: (0, flatten_1.default)([originalSettings, ...originalStrategies]) }
|
|
23
23
|
: originalSettings;
|
|
24
24
|
if (!originalSettings || settings.strategies.length === 0) {
|
|
25
25
|
throw new Error('The authenticate hook needs at least one allowed strategy');
|
|
@@ -44,10 +44,10 @@ exports.default = (originalSettings, ...originalStrategies) => {
|
|
|
44
44
|
return context;
|
|
45
45
|
}
|
|
46
46
|
if (authentication) {
|
|
47
|
-
const authParams = omit_1.default(params, 'provider', 'authentication');
|
|
47
|
+
const authParams = (0, omit_1.default)(params, 'provider', 'authentication');
|
|
48
48
|
debug('Authenticating with', authentication, strategies);
|
|
49
49
|
const authResult = yield authService.authenticate(authentication, authParams, ...strategies);
|
|
50
|
-
context.params = Object.assign({}, params, omit_1.default(authResult, 'accessToken'), { authenticated: true });
|
|
50
|
+
context.params = Object.assign({}, params, (0, omit_1.default)(authResult, 'accessToken'), { authenticated: true });
|
|
51
51
|
return context;
|
|
52
52
|
}
|
|
53
53
|
else if (provider) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../src/hooks/authenticate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,6DAAqC;AACrC,uDAA+B;AAE/B,+CAAsD;AACtD,kDAA0B;AAE1B,MAAM,KAAK,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../src/hooks/authenticate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,6DAAqC;AACrC,uDAA+B;AAE/B,+CAAsD;AACtD,kDAA0B;AAE1B,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,+CAA+C,CAAC,CAAC;AAOrE,kBAAe,CAAC,gBAAmD,EAAE,GAAG,kBAA4B,EAAE,EAAE;IACtG,MAAM,QAAQ,GAAG,OAAO,gBAAgB,KAAK,QAAQ;QACnD,CAAC,CAAC,EAAE,UAAU,EAAE,IAAA,iBAAO,EAAC,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,OAAoB,EAAE,EAAE;QACpC,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,OAAO,CAAC;SAChB;QAED,IAAI,cAAc,EAAE;YAClB,MAAM,UAAU,GAAG,IAAA,cAAI,EAAC,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,IAAA,cAAI,EAAC,UAAU,EAAE,aAAa,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAErG,OAAO,OAAO,CAAC;SAChB;aAAM,IAAI,QAAQ,EAAE;YACnB,MAAM,IAAI,yBAAgB,CAAC,mBAAmB,CAAC,CAAC;SACjD;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAA,CAAC;AACJ,CAAC,CAAC"}
|
package/lib/hooks/connection.js
CHANGED
|
@@ -19,7 +19,7 @@ exports.default = (event) => (context) => __awaiter(void 0, void 0, void 0, func
|
|
|
19
19
|
return context;
|
|
20
20
|
}
|
|
21
21
|
const service = context.service;
|
|
22
|
-
Object.assign(connection, omit_1.default(result, 'accessToken', 'authentication'));
|
|
22
|
+
Object.assign(connection, (0, omit_1.default)(result, 'accessToken', 'authentication'));
|
|
23
23
|
yield service.handleConnection(event, connection, result);
|
|
24
24
|
return context;
|
|
25
25
|
});
|
|
@@ -1 +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,EAAE;IACxE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,OAAO,CAAC;KAChB;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,OAAwC,CAAC;IAEjE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,cAAI,
|
|
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,EAAE;IACxE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,OAAO,CAAC;KAChB;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,OAAwC,CAAC;IAEjE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,IAAA,cAAI,EAAC,MAAM,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEzE,MAAM,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAE1D,OAAO,OAAO,CAAC;AACjB,CAAC,CAAA,CAAC"}
|
package/lib/hooks/event.js
CHANGED
|
@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const debug_1 = __importDefault(require("debug"));
|
|
16
|
-
const debug = debug_1.default('@feathersjs/authentication/hooks/connection');
|
|
16
|
+
const debug = (0, debug_1.default)('@feathersjs/authentication/hooks/connection');
|
|
17
17
|
exports.default = (event) => (context) => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
18
|
const { app, result, params } = context;
|
|
19
19
|
if (params.provider && result) {
|
package/lib/hooks/event.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.js","sourceRoot":"","sources":["../../src/hooks/event.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA0B;AAI1B,MAAM,KAAK,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"event.js","sourceRoot":"","sources":["../../src/hooks/event.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA0B;AAI1B,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,6CAA6C,CAAC,CAAC;AAEnE,kBAAe,CAAC,KAAsB,EAAE,EAAE,CAAC,CAAO,OAAoB,EAAE,EAAE;IACxE,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;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAA,CAAC"}
|
package/lib/hooks/index.js
CHANGED
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.event = exports.connection = exports.authenticate = void 0;
|
|
3
7
|
var authenticate_1 = require("./authenticate");
|
|
4
|
-
Object.defineProperty(exports, "authenticate", { enumerable: true, get: function () { return authenticate_1.default; } });
|
|
8
|
+
Object.defineProperty(exports, "authenticate", { enumerable: true, get: function () { return __importDefault(authenticate_1).default; } });
|
|
5
9
|
var connection_1 = require("./connection");
|
|
6
|
-
Object.defineProperty(exports, "connection", { enumerable: true, get: function () { return connection_1.default; } });
|
|
10
|
+
Object.defineProperty(exports, "connection", { enumerable: true, get: function () { return __importDefault(connection_1).default; } });
|
|
7
11
|
var event_1 = require("./event");
|
|
8
|
-
Object.defineProperty(exports, "event", { enumerable: true, get: function () { return event_1.default; } });
|
|
12
|
+
Object.defineProperty(exports, "event", { enumerable: true, get: function () { return __importDefault(event_1).default; } });
|
|
9
13
|
//# sourceMappingURL=index.js.map
|
package/lib/hooks/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"
|
|
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"}
|
package/lib/index.js
CHANGED
|
@@ -14,12 +14,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
14
14
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
15
|
if (mod && mod.__esModule) return mod;
|
|
16
16
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
18
|
__setModuleDefault(result, mod);
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.authenticate = exports.hooks = void 0;
|
|
22
|
+
exports.JWTStrategy = exports.AuthenticationService = exports.AuthenticationBaseStrategy = exports.AuthenticationBase = exports.authenticate = exports.hooks = void 0;
|
|
23
23
|
const hooks = __importStar(require("./hooks"));
|
|
24
24
|
exports.hooks = hooks;
|
|
25
25
|
const { authenticate } = hooks;
|
package/lib/jwt.js
CHANGED
|
@@ -19,7 +19,7 @@ const errors_1 = require("@feathersjs/errors");
|
|
|
19
19
|
// @ts-ignore
|
|
20
20
|
const long_timeout_1 = __importDefault(require("long-timeout"));
|
|
21
21
|
const strategy_1 = require("./strategy");
|
|
22
|
-
const debug = debug_1.default('@feathersjs/authentication/jwt');
|
|
22
|
+
const debug = (0, debug_1.default)('@feathersjs/authentication/jwt');
|
|
23
23
|
const SPLIT_HEADER = /(\S+)\s+(\S+)/;
|
|
24
24
|
class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
|
|
25
25
|
constructor() {
|
|
@@ -93,7 +93,7 @@ class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
|
|
|
93
93
|
throw new errors_1.NotAuthenticated(`Could not find entity service`);
|
|
94
94
|
}
|
|
95
95
|
const query = yield this.getEntityQuery(params);
|
|
96
|
-
const getParams = Object.assign({}, omit_1.default(params, 'provider'), { query });
|
|
96
|
+
const getParams = Object.assign({}, (0, omit_1.default)(params, 'provider'), { query });
|
|
97
97
|
const result = yield entityService.get(id, getParams);
|
|
98
98
|
if (!params.provider) {
|
|
99
99
|
return result;
|
package/lib/jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../src/jwt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,uDAA+B;AAE/B,+CAAsD;AAEtD,aAAa;AACb,gEAA8B;AAE9B,yCAAwD;AAGxD,MAAM,KAAK,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../src/jwt.ts"],"names":[],"mappings":"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"}
|
package/lib/service.js
CHANGED
|
@@ -19,7 +19,8 @@ const errors_1 = require("@feathersjs/errors");
|
|
|
19
19
|
const core_1 = require("./core");
|
|
20
20
|
const hooks_1 = require("./hooks");
|
|
21
21
|
require("@feathersjs/transport-commons");
|
|
22
|
-
const
|
|
22
|
+
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
23
|
+
const debug = (0, debug_1.default)('@feathersjs/authentication/service');
|
|
23
24
|
class AuthenticationService extends core_1.AuthenticationBase {
|
|
24
25
|
constructor(app, configKey = 'authentication', options = {}) {
|
|
25
26
|
super(app, configKey, options);
|
|
@@ -53,7 +54,7 @@ class AuthenticationService extends core_1.AuthenticationBase {
|
|
|
53
54
|
getTokenOptions(authResult, params) {
|
|
54
55
|
return __awaiter(this, void 0, void 0, function* () {
|
|
55
56
|
const { service, entity, entityId } = this.configuration;
|
|
56
|
-
const jwtOptions = merge_1.default({}, params.jwtOptions, params.jwt);
|
|
57
|
+
const jwtOptions = (0, merge_1.default)({}, params.jwtOptions, params.jwt);
|
|
57
58
|
const value = service && entity && authResult[entity];
|
|
58
59
|
// Set the subject to the entity id if it is available
|
|
59
60
|
if (value && !jwtOptions.subject) {
|
|
@@ -90,7 +91,12 @@ class AuthenticationService extends core_1.AuthenticationBase {
|
|
|
90
91
|
]);
|
|
91
92
|
debug('Creating JWT with', payload, jwtOptions);
|
|
92
93
|
const accessToken = yield this.createAccessToken(payload, jwtOptions, params.secret);
|
|
93
|
-
return
|
|
94
|
+
return (0, merge_1.default)({ accessToken }, authResult, {
|
|
95
|
+
authentication: {
|
|
96
|
+
accessToken,
|
|
97
|
+
payload: jsonwebtoken_1.default.decode(accessToken)
|
|
98
|
+
}
|
|
99
|
+
});
|
|
94
100
|
});
|
|
95
101
|
}
|
|
96
102
|
/**
|
|
@@ -134,8 +140,8 @@ class AuthenticationService extends core_1.AuthenticationBase {
|
|
|
134
140
|
}
|
|
135
141
|
this.hooks({
|
|
136
142
|
after: {
|
|
137
|
-
create: [hooks_1.connection('login'), hooks_1.event('login')],
|
|
138
|
-
remove: [hooks_1.connection('logout'), hooks_1.event('logout')]
|
|
143
|
+
create: [(0, hooks_1.connection)('login'), (0, hooks_1.event)('login')],
|
|
144
|
+
remove: [(0, hooks_1.connection)('logout'), (0, hooks_1.event)('logout')]
|
|
139
145
|
}
|
|
140
146
|
});
|
|
141
147
|
this.app.on('disconnect', (connection) => __awaiter(this, void 0, void 0, function* () {
|
package/lib/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,yDAAiC;AACjC,+CAAsD;AACtD,iCAAyF;AACzF,mCAA4C;AAC5C,yCAAuC;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@feathersjs/authentication",
|
|
3
3
|
"description": "Add Authentication to your FeathersJS app.",
|
|
4
|
-
"version": "4.5.
|
|
4
|
+
"version": "4.5.12",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -52,27 +52,27 @@
|
|
|
52
52
|
"access": "public"
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@feathersjs/errors": "^4.5.
|
|
56
|
-
"@feathersjs/feathers": "^4.5.
|
|
57
|
-
"@feathersjs/transport-commons": "^4.5.
|
|
58
|
-
"@types/jsonwebtoken": "^8.5.
|
|
59
|
-
"debug": "^4.
|
|
55
|
+
"@feathersjs/errors": "^4.5.12",
|
|
56
|
+
"@feathersjs/feathers": "^4.5.12",
|
|
57
|
+
"@feathersjs/transport-commons": "^4.5.12",
|
|
58
|
+
"@types/jsonwebtoken": "^8.5.6",
|
|
59
|
+
"debug": "^4.3.3",
|
|
60
60
|
"jsonwebtoken": "^8.5.1",
|
|
61
|
-
"lodash": "^4.17.
|
|
61
|
+
"lodash": "^4.17.21",
|
|
62
62
|
"long-timeout": "^0.1.1",
|
|
63
|
-
"uuid": "^8.2
|
|
63
|
+
"uuid": "^8.3.2"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
|
-
"@types/debug": "^4.1.
|
|
67
|
-
"@types/lodash": "^4.14.
|
|
68
|
-
"@types/mocha": "^
|
|
69
|
-
"@types/node": "^
|
|
70
|
-
"@types/uuid": "^8.
|
|
66
|
+
"@types/debug": "^4.1.7",
|
|
67
|
+
"@types/lodash": "^4.14.178",
|
|
68
|
+
"@types/mocha": "^9.0.0",
|
|
69
|
+
"@types/node": "^17.0.8",
|
|
70
|
+
"@types/uuid": "^8.3.3",
|
|
71
71
|
"feathers-memory": "^4.1.0",
|
|
72
|
-
"mocha": "^
|
|
73
|
-
"shx": "^0.3.
|
|
74
|
-
"ts-node": "^
|
|
75
|
-
"typescript": "^
|
|
72
|
+
"mocha": "^9.1.3",
|
|
73
|
+
"shx": "^0.3.3",
|
|
74
|
+
"ts-node": "^10.4.0",
|
|
75
|
+
"typescript": "^4.5.4"
|
|
76
76
|
},
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "8697ecc85808437e9aab63e5d2327679340c5401"
|
|
78
78
|
}
|
package/src/core.ts
CHANGED
|
@@ -190,7 +190,7 @@ export class AuthenticationBase {
|
|
|
190
190
|
const verified = await jsonwebtoken.verify(accessToken, jwtSecret, options);
|
|
191
191
|
|
|
192
192
|
return verified as any;
|
|
193
|
-
} catch (error) {
|
|
193
|
+
} catch (error: any) {
|
|
194
194
|
throw new NotAuthenticated(error.message, error);
|
|
195
195
|
}
|
|
196
196
|
}
|
package/src/service.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { AuthenticationBase, AuthenticationResult, AuthenticationRequest } from
|
|
|
5
5
|
import { connection, event } from './hooks';
|
|
6
6
|
import '@feathersjs/transport-commons';
|
|
7
7
|
import { Application, Params, ServiceMethods, ServiceAddons } from '@feathersjs/feathers';
|
|
8
|
+
import jsonwebtoken from 'jsonwebtoken';
|
|
8
9
|
|
|
9
10
|
const debug = Debug('@feathersjs/authentication/service');
|
|
10
11
|
|
|
@@ -112,7 +113,12 @@ export class AuthenticationService extends AuthenticationBase implements Partial
|
|
|
112
113
|
|
|
113
114
|
const accessToken = await this.createAccessToken(payload, jwtOptions, params.secret);
|
|
114
115
|
|
|
115
|
-
return
|
|
116
|
+
return merge({ accessToken }, authResult, {
|
|
117
|
+
authentication: {
|
|
118
|
+
accessToken,
|
|
119
|
+
payload: jsonwebtoken.decode(accessToken)
|
|
120
|
+
}
|
|
121
|
+
});
|
|
116
122
|
}
|
|
117
123
|
|
|
118
124
|
/**
|