@feathersjs/authentication 5.0.24 → 5.0.25
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 +6 -0
- package/lib/hooks/authenticate.js +7 -9
- package/lib/hooks/authenticate.js.map +1 -1
- package/lib/jwt.js +5 -4
- package/lib/jwt.js.map +1 -1
- package/package.json +11 -11
- package/src/hooks/authenticate.ts +8 -6
- package/src/jwt.ts +5 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
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
|
+
## [5.0.25](https://github.com/feathersjs/feathers/compare/v5.0.24...v5.0.25) (2024-05-03)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- Reduce usage of lodash ([#3455](https://github.com/feathersjs/feathers/issues/3455)) ([8ce807a](https://github.com/feathersjs/feathers/commit/8ce807a5ca53ff5b8d5107a0656c6329404e6e6c))
|
|
11
|
+
|
|
6
12
|
## [5.0.24](https://github.com/feathersjs/feathers/compare/v5.0.23...v5.0.24) (2024-03-13)
|
|
7
13
|
|
|
8
14
|
**Note:** Version bump only for package @feathersjs/authentication
|
|
@@ -1,16 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const flatten_1 = __importDefault(require("lodash/flatten"));
|
|
7
|
-
const omit_1 = __importDefault(require("lodash/omit"));
|
|
8
3
|
const errors_1 = require("@feathersjs/errors");
|
|
9
4
|
const commons_1 = require("@feathersjs/commons");
|
|
10
5
|
const debug = (0, commons_1.createDebug)('@feathersjs/authentication/hooks/authenticate');
|
|
11
6
|
exports.default = (originalSettings, ...originalStrategies) => {
|
|
12
7
|
const settings = typeof originalSettings === 'string'
|
|
13
|
-
? { strategies:
|
|
8
|
+
? { strategies: [originalSettings, ...originalStrategies] }
|
|
14
9
|
: originalSettings;
|
|
15
10
|
if (!originalSettings || settings.strategies.length === 0) {
|
|
16
11
|
throw new Error('The authenticate hook needs at least one allowed strategy');
|
|
@@ -35,12 +30,15 @@ exports.default = (originalSettings, ...originalStrategies) => {
|
|
|
35
30
|
return next();
|
|
36
31
|
}
|
|
37
32
|
if (authentication) {
|
|
38
|
-
const
|
|
33
|
+
const { provider, authentication, ...authParams } = params;
|
|
39
34
|
debug('Authenticating with', authentication, strategies);
|
|
40
35
|
const authResult = await authService.authenticate(authentication, authParams, ...strategies);
|
|
41
|
-
|
|
36
|
+
const { accessToken, ...authResultWithoutToken } = authResult;
|
|
37
|
+
context.params = {
|
|
38
|
+
...params,
|
|
39
|
+
...authResultWithoutToken,
|
|
42
40
|
authenticated: true
|
|
43
|
-
}
|
|
41
|
+
};
|
|
44
42
|
}
|
|
45
43
|
else if (provider) {
|
|
46
44
|
throw new errors_1.NotAuthenticated('Not authenticated');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../src/hooks/authenticate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../src/hooks/authenticate.ts"],"names":[],"mappings":";;AACA,+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,CAAC,gBAAgB,EAAE,GAAG,kBAAkB,CAAC,EAAE;QAC3D,CAAC,CAAC,gBAAgB,CAAA;IAEtB,IAAI,CAAC,gBAAgB,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;IAC9E,CAAC;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,CAAC;YACnD,MAAM,IAAI,yBAAgB,CAAC,qDAAqD,CAAC,CAAA;QACnF,CAAC;QAED,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;YACnE,MAAM,IAAI,yBAAgB,CAAC,+CAA+C,CAAC,CAAA;QAC7E,CAAC;QAED,IAAI,OAAO,KAAK,WAAW,EAAE,CAAC;YAC5B,MAAM,IAAI,yBAAgB,CACxB,8EAA8E,CAC/E,CAAA;QACH,CAAC;QAED,IAAI,MAAM,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;YAClC,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAA;YAE1D,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,MAAM,EAAE,WAAW,EAAE,GAAG,sBAAsB,EAAE,GAAG,UAAU,CAAA;YAE7D,OAAO,CAAC,MAAM,GAAG;gBACf,GAAG,MAAM;gBACT,GAAG,sBAAsB;gBACzB,aAAa,EAAE,IAAI;aACpB,CAAA;QACH,CAAC;aAAM,IAAI,QAAQ,EAAE,CAAC;YACpB,MAAM,IAAI,yBAAgB,CAAC,mBAAmB,CAAC,CAAA;QACjD,CAAC;QAED,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;AACH,CAAC,CAAA"}
|
package/lib/jwt.js
CHANGED
|
@@ -4,8 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.JWTStrategy = void 0;
|
|
7
|
-
/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/ban-ts-comment */
|
|
8
|
-
const omit_1 = __importDefault(require("lodash/omit"));
|
|
9
7
|
const errors_1 = require("@feathersjs/errors");
|
|
10
8
|
const commons_1 = require("@feathersjs/commons");
|
|
11
9
|
// @ts-ignore
|
|
@@ -93,8 +91,11 @@ class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
|
|
|
93
91
|
throw new errors_1.NotAuthenticated('Could not find entity service');
|
|
94
92
|
}
|
|
95
93
|
const query = await this.getEntityQuery(params);
|
|
96
|
-
const
|
|
97
|
-
const result = await entityService.get(id,
|
|
94
|
+
const { provider, ...paramsWithoutProvider } = params;
|
|
95
|
+
const result = await entityService.get(id, {
|
|
96
|
+
...paramsWithoutProvider,
|
|
97
|
+
query
|
|
98
|
+
});
|
|
98
99
|
if (!params.provider) {
|
|
99
100
|
return result;
|
|
100
101
|
}
|
package/lib/jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../src/jwt.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../src/jwt.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": "5.0.
|
|
4
|
+
"version": "5.0.25",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -53,12 +53,12 @@
|
|
|
53
53
|
"access": "public"
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@feathersjs/commons": "^5.0.
|
|
57
|
-
"@feathersjs/errors": "^5.0.
|
|
58
|
-
"@feathersjs/feathers": "^5.0.
|
|
56
|
+
"@feathersjs/commons": "^5.0.25",
|
|
57
|
+
"@feathersjs/errors": "^5.0.25",
|
|
58
|
+
"@feathersjs/feathers": "^5.0.25",
|
|
59
59
|
"@feathersjs/hooks": "^0.9.0",
|
|
60
|
-
"@feathersjs/schema": "^5.0.
|
|
61
|
-
"@feathersjs/transport-commons": "^5.0.
|
|
60
|
+
"@feathersjs/schema": "^5.0.25",
|
|
61
|
+
"@feathersjs/transport-commons": "^5.0.25",
|
|
62
62
|
"@types/jsonwebtoken": "^9.0.6",
|
|
63
63
|
"jsonwebtoken": "^9.0.2",
|
|
64
64
|
"lodash": "^4.17.21",
|
|
@@ -66,15 +66,15 @@
|
|
|
66
66
|
"uuid": "^9.0.1"
|
|
67
67
|
},
|
|
68
68
|
"devDependencies": {
|
|
69
|
-
"@feathersjs/memory": "^5.0.
|
|
69
|
+
"@feathersjs/memory": "^5.0.25",
|
|
70
70
|
"@types/lodash": "^4.17.0",
|
|
71
71
|
"@types/mocha": "^10.0.6",
|
|
72
|
-
"@types/node": "^20.
|
|
72
|
+
"@types/node": "^20.12.8",
|
|
73
73
|
"@types/uuid": "^9.0.8",
|
|
74
|
-
"mocha": "^10.
|
|
74
|
+
"mocha": "^10.4.0",
|
|
75
75
|
"shx": "^0.3.4",
|
|
76
76
|
"ts-node": "^10.9.2",
|
|
77
|
-
"typescript": "^5.4.
|
|
77
|
+
"typescript": "^5.4.5"
|
|
78
78
|
},
|
|
79
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "01bc3339efd27df1b3e8d4f6a82152faf6c5ced3"
|
|
80
80
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import flatten from 'lodash/flatten'
|
|
2
|
-
import omit from 'lodash/omit'
|
|
3
1
|
import { HookContext, NextFunction } from '@feathersjs/feathers'
|
|
4
2
|
import { NotAuthenticated } from '@feathersjs/errors'
|
|
5
3
|
import { createDebug } from '@feathersjs/commons'
|
|
@@ -14,7 +12,7 @@ export interface AuthenticateHookSettings {
|
|
|
14
12
|
export default (originalSettings: string | AuthenticateHookSettings, ...originalStrategies: string[]) => {
|
|
15
13
|
const settings =
|
|
16
14
|
typeof originalSettings === 'string'
|
|
17
|
-
? { strategies:
|
|
15
|
+
? { strategies: [originalSettings, ...originalStrategies] }
|
|
18
16
|
: originalSettings
|
|
19
17
|
|
|
20
18
|
if (!originalSettings || settings.strategies.length === 0) {
|
|
@@ -49,15 +47,19 @@ export default (originalSettings: string | AuthenticateHookSettings, ...original
|
|
|
49
47
|
}
|
|
50
48
|
|
|
51
49
|
if (authentication) {
|
|
52
|
-
const authParams =
|
|
50
|
+
const { provider, authentication, ...authParams } = params
|
|
53
51
|
|
|
54
52
|
debug('Authenticating with', authentication, strategies)
|
|
55
53
|
|
|
56
54
|
const authResult = await authService.authenticate(authentication, authParams, ...strategies)
|
|
57
55
|
|
|
58
|
-
|
|
56
|
+
const { accessToken, ...authResultWithoutToken } = authResult
|
|
57
|
+
|
|
58
|
+
context.params = {
|
|
59
|
+
...params,
|
|
60
|
+
...authResultWithoutToken,
|
|
59
61
|
authenticated: true
|
|
60
|
-
}
|
|
62
|
+
}
|
|
61
63
|
} else if (provider) {
|
|
62
64
|
throw new NotAuthenticated('Not authenticated')
|
|
63
65
|
}
|
package/src/jwt.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/ban-ts-comment */
|
|
2
|
-
import omit from 'lodash/omit'
|
|
3
2
|
import { IncomingMessage } from 'http'
|
|
4
3
|
import { NotAuthenticated } from '@feathersjs/errors'
|
|
5
4
|
import { Params } from '@feathersjs/feathers'
|
|
@@ -115,8 +114,11 @@ export class JWTStrategy extends AuthenticationBaseStrategy {
|
|
|
115
114
|
}
|
|
116
115
|
|
|
117
116
|
const query = await this.getEntityQuery(params)
|
|
118
|
-
const
|
|
119
|
-
const result = await entityService.get(id,
|
|
117
|
+
const { provider, ...paramsWithoutProvider } = params
|
|
118
|
+
const result = await entityService.get(id, {
|
|
119
|
+
...paramsWithoutProvider,
|
|
120
|
+
query
|
|
121
|
+
})
|
|
120
122
|
|
|
121
123
|
if (!params.provider) {
|
|
122
124
|
return result
|