@feathersjs/authentication 5.0.0-pre.21 → 5.0.0-pre.24
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 +27 -0
- package/lib/core.d.ts +1 -0
- package/lib/core.js +5 -7
- package/lib/core.js.map +1 -1
- package/lib/hooks/authenticate.js +3 -2
- package/lib/hooks/authenticate.js.map +1 -1
- package/lib/hooks/connection.js.map +1 -1
- package/lib/hooks/event.js.map +1 -1
- package/lib/hooks/index.js.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/jwt.js +6 -4
- package/lib/jwt.js.map +1 -1
- package/lib/options.js +6 -3
- package/lib/options.js.map +1 -1
- package/lib/service.js +12 -8
- package/lib/service.js.map +1 -1
- package/lib/strategy.js.map +1 -1
- package/package.json +11 -11
- package/src/core.ts +107 -95
- package/src/hooks/authenticate.ts +35 -31
- package/src/hooks/connection.ts +12 -9
- package/src/hooks/event.ts +9 -9
- package/src/hooks/index.ts +3 -3
- package/src/index.ts +7 -7
- package/src/jwt.ts +84 -77
- package/src/options.ts +16 -10
- package/src/service.ts +80 -69
- package/src/strategy.ts +17 -17
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,33 @@
|
|
|
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.0-pre.24](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.23...v5.0.0-pre.24) (2022-06-21)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **authentication:** Add safe dispatch data for authentication requests ([#2662](https://github.com/feathersjs/feathers/issues/2662)) ([d8104a1](https://github.com/feathersjs/feathers/commit/d8104a19ee9181e6a5ea81014af29ff9a3c28a8a))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
# [5.0.0-pre.23](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.22...v5.0.0-pre.23) (2022-06-06)
|
|
18
|
+
|
|
19
|
+
**Note:** Version bump only for package @feathersjs/authentication
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
# [5.0.0-pre.22](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.21...v5.0.0-pre.22) (2022-05-24)
|
|
26
|
+
|
|
27
|
+
**Note:** Version bump only for package @feathersjs/authentication
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
6
33
|
# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
|
|
7
34
|
|
|
8
35
|
**Note:** Version bump only for package @feathersjs/authentication
|
package/lib/core.d.ts
CHANGED
package/lib/core.js
CHANGED
|
@@ -79,8 +79,7 @@ class AuthenticationBase {
|
|
|
79
79
|
* @param names The list or strategy names
|
|
80
80
|
*/
|
|
81
81
|
getStrategies(...names) {
|
|
82
|
-
return names.map(name => this.strategies[name])
|
|
83
|
-
.filter(current => !!current);
|
|
82
|
+
return names.map((name) => this.strategies[name]).filter((current) => !!current);
|
|
84
83
|
}
|
|
85
84
|
/**
|
|
86
85
|
* Returns a single strategy by name
|
|
@@ -149,7 +148,8 @@ class AuthenticationBase {
|
|
|
149
148
|
debug('Running authenticate for strategy', strategy, allowed);
|
|
150
149
|
if (!authentication || !authStrategy || !strategyAllowed) {
|
|
151
150
|
const additionalInfo = (!strategy && ' (no `strategy` set)') ||
|
|
152
|
-
(!strategyAllowed && ' (strategy not allowed in authStrategies)') ||
|
|
151
|
+
(!strategyAllowed && ' (strategy not allowed in authStrategies)') ||
|
|
152
|
+
'';
|
|
153
153
|
// If there are no valid strategies or `authentication` is not an object
|
|
154
154
|
throw new errors_1.NotAuthenticated('Invalid authentication information' + additionalInfo);
|
|
155
155
|
}
|
|
@@ -159,8 +159,7 @@ class AuthenticationBase {
|
|
|
159
159
|
});
|
|
160
160
|
}
|
|
161
161
|
async handleConnection(event, connection, authResult) {
|
|
162
|
-
const strategies = this.getStrategies(...Object.keys(this.strategies))
|
|
163
|
-
.filter(current => typeof current.handleConnection === 'function');
|
|
162
|
+
const strategies = this.getStrategies(...Object.keys(this.strategies)).filter((current) => typeof current.handleConnection === 'function');
|
|
164
163
|
for (const strategy of strategies) {
|
|
165
164
|
await strategy.handleConnection(event, connection, authResult);
|
|
166
165
|
}
|
|
@@ -173,8 +172,7 @@ class AuthenticationBase {
|
|
|
173
172
|
* @param names A list of strategies to use
|
|
174
173
|
*/
|
|
175
174
|
async parse(req, res, ...names) {
|
|
176
|
-
const strategies = this.getStrategies(...names)
|
|
177
|
-
.filter(current => typeof current.parse === 'function');
|
|
175
|
+
const strategies = this.getStrategies(...names).filter((current) => typeof current.parse === 'function');
|
|
178
176
|
debug('Strategies parsing HTTP header for authentication information', names);
|
|
179
177
|
for (const authStrategy of strategies) {
|
|
180
178
|
const value = await authStrategy.parse(req, res);
|
package/lib/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAgC;AAChC,gEAA+E;AAC/E,+BAAmC;AACnC,+CAAqD;AACrD,iDAAiD;AAGjD,uCAA0C;AAE1C,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,iCAAiC,CAAC,CAAA;AAkF5D;;GAEG;AACH,MAAa,kBAAkB;IAM7B;;;;;;OAMG;IACH,YAAY,GAAgB,EAAE,SAAS,GAAG,gBAAgB,EAAE,OAAO,GAAG,EAAE;QACtE,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,GAAG,KAAK,UAAU,EAAE;YACzC,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAA;SAC1F;QAED,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QAEpB,GAAG,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,SAAS,CAAC,CAAA;QAC/E,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,IAAA,eAAK,EAAC,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;IAC5D,CAAC;IAED;;OAEG;IACH,IAAI,aAAa;QACf,4DAA4D;QAC5D,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,wBAAc,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAA;IACxE,CAAC;IAED;;OAEG;IACH,IAAI,aAAa;QACf,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACrC,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,IAAY,EAAE,QAAgC;;QACrD,8CAA8C;QAC9C,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,UAAU,EAAE;YAC1C,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;SACvB;QAED,IAAI,OAAO,QAAQ,CAAC,cAAc,KAAK,UAAU,EAAE;YACjD,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SAClC;QAED,IAAI,OAAO,QAAQ,CAAC,iBAAiB,KAAK,UAAU,EAAE;YACpD,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;SACjC;QAED,IAAI,OAAO,QAAQ,CAAC,mBAAmB,KAAK,UAAU,EAAE;YACtD,QAAQ,CAAC,mBAAmB,EAAE,CAAA;SAC/B;QAED,4BAA4B;QAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAA;QAEhC,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,MAAA,QAAQ,CAAC,KAAK,yDAAG,IAAI,EAAE,IAAI,CAAC,CAAA;SAC7B;IACH,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAC,GAAG,KAAe;QAC9B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAClF,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,IAAY;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,iBAAiB,CACrB,OAAiC,EACjC,YAA0B,EAC1B,cAAuB;QAEvB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,aAAa,CAAA;QACjD,+DAA+D;QAC/D,MAAM,SAAS,GAAG,cAAc,IAAI,MAAM,CAAA;QAC1C,qDAAqD;QACrD,MAAM,OAAO,GAAG,IAAA,eAAK,EAAC,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;QAEnD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YAClB,uCAAuC;YACvC,OAAO,CAAC,KAAK,GAAG,IAAA,SAAM,GAAE,CAAA;SACzB;QAED,OAAO,sBAAY,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IACvD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,iBAAiB,CAAC,WAAmB,EAAE,YAA+B,EAAE,cAAuB;QACnG,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,aAAa,CAAA;QACjD,MAAM,SAAS,GAAG,cAAc,IAAI,MAAM,CAAA;QAC1C,MAAM,OAAO,GAAG,IAAA,eAAK,EAAC,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;QACnD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;QAE7B,8DAA8D;QAC9D,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACpC,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YACvE,OAAO,OAAO,CAAC,SAAS,CAAA;SACzB;QAED,IAAI;YACF,MAAM,QAAQ,GAAG,sBAAY,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;YAErE,OAAO,QAAe,CAAA;SACvB;QAAC,OAAO,KAAU,EAAE;YACnB,MAAM,IAAI,yBAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;SACjD;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,YAAY,CAChB,cAAqC,EACrC,MAA4B,EAC5B,GAAG,OAAiB;QAEpB,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,IAAI,EAAE,CAAA;QACzC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QACnD,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAElD,KAAK,CAAC,mCAAmC,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAE7D,IAAI,CAAC,cAAc,IAAI,CAAC,YAAY,IAAI,CAAC,eAAe,EAAE;YACxD,MAAM,cAAc,GAClB,CAAC,CAAC,QAAQ,IAAI,sBAAsB,CAAC;gBACrC,CAAC,CAAC,eAAe,IAAI,2CAA2C,CAAC;gBACjE,EAAE,CAAA;YAEJ,wEAAwE;YACxE,MAAM,IAAI,yBAAgB,CAAC,oCAAoC,GAAG,cAAc,CAAC,CAAA;SAClF;QAED,OAAO,YAAY,CAAC,YAAY,CAAC,cAAc,EAAE;YAC/C,GAAG,MAAM;YACT,aAAa,EAAE,IAAI;SACpB,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAAsB,EAAE,UAAe,EAAE,UAAiC;QAC/F,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAC3E,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,OAAO,CAAC,gBAAgB,KAAK,UAAU,CAC5D,CAAA;QAED,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE;YACjC,MAAM,QAAQ,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;SAC/D;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,KAAK,CAAC,GAAoB,EAAE,GAAmB,EAAE,GAAG,KAAe;QACvE,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,CAAC,CAAA;QAExG,KAAK,CAAC,+DAA+D,EAAE,KAAK,CAAC,CAAA;QAE7E,KAAK,MAAM,YAAY,IAAI,UAAU,EAAE;YACrC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YAEhD,IAAI,KAAK,KAAK,IAAI,EAAE;gBAClB,OAAO,KAAK,CAAA;aACb;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,KAAK;;QACT,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QAEnB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAEtC,MAAM,CAAA,MAAA,QAAQ,CAAC,KAAK,yDAAG,IAAI,EAAE,IAAI,CAAC,CAAA,CAAA;SACnC;IACH,CAAC;CACF;AA/ND,gDA+NC"}
|
|
@@ -28,7 +28,6 @@ exports.default = (originalSettings, ...originalStrategies) => {
|
|
|
28
28
|
if (!authService || typeof authService.authenticate !== 'function') {
|
|
29
29
|
throw new errors_1.NotAuthenticated('Could not find a valid authentication service');
|
|
30
30
|
}
|
|
31
|
-
// @ts-ignore
|
|
32
31
|
if (service === authService) {
|
|
33
32
|
throw new errors_1.NotAuthenticated('The authenticate hook does not need to be used on the authentication service');
|
|
34
33
|
}
|
|
@@ -39,7 +38,9 @@ exports.default = (originalSettings, ...originalStrategies) => {
|
|
|
39
38
|
const authParams = (0, omit_1.default)(params, 'provider', 'authentication');
|
|
40
39
|
debug('Authenticating with', authentication, strategies);
|
|
41
40
|
const authResult = await authService.authenticate(authentication, authParams, ...strategies);
|
|
42
|
-
context.params = Object.assign({}, params, (0, omit_1.default)(authResult, 'accessToken'), {
|
|
41
|
+
context.params = Object.assign({}, params, (0, omit_1.default)(authResult, 'accessToken'), {
|
|
42
|
+
authenticated: true
|
|
43
|
+
});
|
|
43
44
|
}
|
|
44
45
|
else if (provider) {
|
|
45
46
|
throw new errors_1.NotAuthenticated('Not authenticated');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../src/hooks/authenticate.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"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,EAAE;YAC7B,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/hooks/connection.ts"],"names":[],"mappings":";;;;;AACA,
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/hooks/connection.ts"],"names":[],"mappings":";;;;;AACA,uDAA8B;AAG9B,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,CAAC,MAAM,CAAC,UAAU,EAAE,IAAA,cAAI,EAAC,MAAM,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAA;QAExE,MAAM,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;KAC1D;AACH,CAAC,CAAA"}
|
package/lib/hooks/event.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.js","sourceRoot":"","sources":["../../src/hooks/event.ts"],"names":[],"mappings":";;AACA,
|
|
1
|
+
{"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
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;;;;AAAA,+
|
|
1
|
+
{"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.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
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,qCAAwD;AAA/C,uHAAA,4BAA4B,OAAA"}
|
package/lib/jwt.js
CHANGED
|
@@ -4,7 +4,7 @@ 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 */
|
|
7
|
+
/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/ban-ts-comment */
|
|
8
8
|
const omit_1 = __importDefault(require("lodash/omit"));
|
|
9
9
|
const errors_1 = require("@feathersjs/errors");
|
|
10
10
|
const commons_1 = require("@feathersjs/commons");
|
|
@@ -31,14 +31,16 @@ class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
|
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
33
|
async handleConnection(event, connection, authResult) {
|
|
34
|
-
const isValidLogout = event === 'logout' &&
|
|
34
|
+
const isValidLogout = event === 'logout' &&
|
|
35
|
+
connection.authentication &&
|
|
36
|
+
authResult &&
|
|
35
37
|
connection.authentication.accessToken === authResult.accessToken;
|
|
36
38
|
const { accessToken } = authResult || {};
|
|
37
39
|
if (accessToken && event === 'login') {
|
|
38
40
|
debug('Adding authentication information to connection');
|
|
39
41
|
const { exp } = await this.authentication.verifyAccessToken(accessToken);
|
|
40
42
|
// The time (in ms) until the token expires
|
|
41
|
-
const duration =
|
|
43
|
+
const duration = exp * 1000 - Date.now();
|
|
42
44
|
// This may have to be a `logout` event but right now we don't want
|
|
43
45
|
// the whole context object lingering around until the timer is gone
|
|
44
46
|
const timer = long_timeout_1.default.setTimeout(() => this.app.emit('disconnect', connection), duration);
|
|
@@ -131,7 +133,7 @@ class JWTStrategy extends strategy_1.AuthenticationBaseStrategy {
|
|
|
131
133
|
}
|
|
132
134
|
debug('Found parsed header value');
|
|
133
135
|
const [, scheme, schemeValue] = headerValue.match(SPLIT_HEADER) || [];
|
|
134
|
-
const hasScheme = scheme && schemes.some(current => new RegExp(current, 'i').test(scheme));
|
|
136
|
+
const hasScheme = scheme && schemes.some((current) => new RegExp(current, 'i').test(scheme));
|
|
135
137
|
if (scheme && !hasScheme) {
|
|
136
138
|
return null;
|
|
137
139
|
}
|
package/lib/jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../src/jwt.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../src/jwt.ts"],"names":[],"mappings":"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"}
|
package/lib/options.js
CHANGED
|
@@ -20,11 +20,14 @@ exports.authenticationSettingsSchema = {
|
|
|
20
20
|
description: 'The JWT signing secret'
|
|
21
21
|
},
|
|
22
22
|
entity: {
|
|
23
|
-
oneOf: [
|
|
23
|
+
oneOf: [
|
|
24
|
+
{
|
|
24
25
|
type: 'null'
|
|
25
|
-
},
|
|
26
|
+
},
|
|
27
|
+
{
|
|
26
28
|
type: 'string'
|
|
27
|
-
}
|
|
29
|
+
}
|
|
30
|
+
],
|
|
28
31
|
description: 'The name of the authentication entity (e.g. user)'
|
|
29
32
|
},
|
|
30
33
|
entityId: {
|
package/lib/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":";;;AAAa,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,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"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"}
|
package/lib/service.js
CHANGED
|
@@ -10,6 +10,7 @@ const core_1 = require("./core");
|
|
|
10
10
|
const hooks_1 = require("./hooks");
|
|
11
11
|
require("@feathersjs/transport-commons");
|
|
12
12
|
const commons_1 = require("@feathersjs/commons");
|
|
13
|
+
const schema_1 = require("@feathersjs/schema");
|
|
13
14
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
14
15
|
const debug = (0, commons_1.createDebug)('@feathersjs/authentication/service');
|
|
15
16
|
class AuthenticationService extends core_1.AuthenticationBase {
|
|
@@ -18,7 +19,8 @@ class AuthenticationService extends core_1.AuthenticationBase {
|
|
|
18
19
|
if (typeof app.defaultAuthentication !== 'function') {
|
|
19
20
|
app.defaultAuthentication = function (location) {
|
|
20
21
|
const configKey = app.get('defaultAuthentication');
|
|
21
|
-
const path = location ||
|
|
22
|
+
const path = location ||
|
|
23
|
+
Object.keys(this.services).find((current) => this.service(current).configKey === configKey);
|
|
22
24
|
return path ? this.service(path) : null;
|
|
23
25
|
};
|
|
24
26
|
}
|
|
@@ -80,12 +82,14 @@ class AuthenticationService extends core_1.AuthenticationBase {
|
|
|
80
82
|
]);
|
|
81
83
|
debug('Creating JWT with', payload, jwtOptions);
|
|
82
84
|
const accessToken = await this.createAccessToken(payload, jwtOptions, params.secret);
|
|
83
|
-
return
|
|
85
|
+
return {
|
|
86
|
+
accessToken,
|
|
87
|
+
...authResult,
|
|
84
88
|
authentication: {
|
|
85
|
-
|
|
89
|
+
...authResult.authentication,
|
|
86
90
|
payload: jsonwebtoken_1.default.decode(accessToken)
|
|
87
91
|
}
|
|
88
|
-
}
|
|
92
|
+
};
|
|
89
93
|
}
|
|
90
94
|
/**
|
|
91
95
|
* Mark a JWT as removed. By default only verifies the JWT and returns the result.
|
|
@@ -113,11 +117,11 @@ class AuthenticationService extends core_1.AuthenticationBase {
|
|
|
113
117
|
// connection and event (login, logout) hooks
|
|
114
118
|
const { secret, service, entity, entityId } = this.configuration;
|
|
115
119
|
if (typeof secret !== 'string') {
|
|
116
|
-
throw new Error(
|
|
120
|
+
throw new Error("A 'secret' must be provided in your authentication configuration");
|
|
117
121
|
}
|
|
118
122
|
if (entity !== null) {
|
|
119
123
|
if (service === undefined) {
|
|
120
|
-
throw new Error(
|
|
124
|
+
throw new Error("The 'service' option is not set in the authentication configuration");
|
|
121
125
|
}
|
|
122
126
|
if (this.app.service(service) === undefined) {
|
|
123
127
|
throw new Error(`The '${service}' entity service does not exist (set to 'null' if it is not required)`);
|
|
@@ -127,8 +131,8 @@ class AuthenticationService extends core_1.AuthenticationBase {
|
|
|
127
131
|
}
|
|
128
132
|
}
|
|
129
133
|
this.hooks({
|
|
130
|
-
create: [(0, hooks_1.connection)('login'), (0, hooks_1.event)('login')],
|
|
131
|
-
remove: [(0, hooks_1.connection)('logout'), (0, hooks_1.event)('logout')]
|
|
134
|
+
create: [(0, schema_1.resolveDispatch)(), (0, hooks_1.connection)('login'), (0, hooks_1.event)('login')],
|
|
135
|
+
remove: [(0, schema_1.resolveDispatch)(), (0, hooks_1.connection)('logout'), (0, hooks_1.event)('logout')]
|
|
132
136
|
});
|
|
133
137
|
this.app.on('disconnect', async (connection) => {
|
|
134
138
|
await this.handleConnection('disconnect', connection);
|
package/lib/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
package/lib/strategy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":";;;AAGA,MAAa,0BAA0B;IAKrC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":";;;AAGA,MAAa,0BAA0B;IAKrC,iBAAiB,CAAC,IAAwB;QACxC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;IAC5B,CAAC;IAED,cAAc,CAAC,GAAgB;QAC7B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACrD,CAAC;IAED,IAAI,aAAa;QACf,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,aAAa,CAAA;QAEtC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,IAAI,CAAA;SACZ;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;IAC1C,CAAC;CACF;AA9BD,gEA8BC"}
|
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.0-pre.
|
|
4
|
+
"version": "5.0.0-pre.24",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -52,10 +52,11 @@
|
|
|
52
52
|
"access": "public"
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@feathersjs/commons": "^5.0.0-pre.
|
|
56
|
-
"@feathersjs/errors": "^5.0.0-pre.
|
|
57
|
-
"@feathersjs/feathers": "^5.0.0-pre.
|
|
58
|
-
"@feathersjs/
|
|
55
|
+
"@feathersjs/commons": "^5.0.0-pre.24",
|
|
56
|
+
"@feathersjs/errors": "^5.0.0-pre.24",
|
|
57
|
+
"@feathersjs/feathers": "^5.0.0-pre.24",
|
|
58
|
+
"@feathersjs/schema": "^5.0.0-pre.24",
|
|
59
|
+
"@feathersjs/transport-commons": "^5.0.0-pre.24",
|
|
59
60
|
"@types/jsonwebtoken": "^8.5.8",
|
|
60
61
|
"jsonwebtoken": "^8.5.1",
|
|
61
62
|
"lodash": "^4.17.21",
|
|
@@ -63,16 +64,15 @@
|
|
|
63
64
|
"uuid": "^8.3.2"
|
|
64
65
|
},
|
|
65
66
|
"devDependencies": {
|
|
66
|
-
"@feathersjs/memory": "^5.0.0-pre.
|
|
67
|
-
"@feathersjs/schema": "^5.0.0-pre.21",
|
|
67
|
+
"@feathersjs/memory": "^5.0.0-pre.24",
|
|
68
68
|
"@types/lodash": "^4.14.182",
|
|
69
69
|
"@types/mocha": "^9.1.1",
|
|
70
|
-
"@types/node": "^17.0.
|
|
70
|
+
"@types/node": "^17.0.40",
|
|
71
71
|
"@types/uuid": "^8.3.4",
|
|
72
72
|
"mocha": "^10.0.0",
|
|
73
73
|
"shx": "^0.3.4",
|
|
74
|
-
"ts-node": "^10.
|
|
75
|
-
"typescript": "^4.
|
|
74
|
+
"ts-node": "^10.8.1",
|
|
75
|
+
"typescript": "^4.7.3"
|
|
76
76
|
},
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "72779fa2938f43d7b345b6861ff0035481a07de3"
|
|
78
78
|
}
|