@feathersjs/authentication-client 4.5.9 → 4.5.13
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 +39 -0
- package/lib/core.d.ts +1 -1
- package/lib/core.js +3 -3
- package/lib/core.js.map +1 -1
- package/lib/hooks/authentication.js +3 -2
- package/lib/hooks/authentication.js.map +1 -1
- package/lib/hooks/populate-header.js +2 -1
- package/lib/hooks/populate-header.js.map +1 -1
- package/lib/index.js +3 -2
- package/lib/index.js.map +1 -1
- package/package.json +22 -22
- package/src/core.ts +3 -3
- package/src/index.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,45 @@
|
|
|
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.13](https://github.com/feathersjs/feathers/compare/v4.5.12...v4.5.13) (2022-01-10)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @feathersjs/authentication-client
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [4.5.12](https://github.com/feathersjs/feathers/compare/v4.5.11...v4.5.12) (2022-01-06)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* Update all dependencies for crow release ([#2520](https://github.com/feathersjs/feathers/issues/2520)) ([1c63e6b](https://github.com/feathersjs/feathers/commit/1c63e6be37ff85edbe8dd318415ca6919864c033))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
## [4.5.11](https://github.com/feathersjs/feathers/compare/v4.5.10...v4.5.11) (2020-12-05)
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
### Bug Fixes
|
|
29
|
+
|
|
30
|
+
* **authentication-client:** Allow reAuthentication using specific strategy ([#2140](https://github.com/feathersjs/feathers/issues/2140)) ([2a2bbf7](https://github.com/feathersjs/feathers/commit/2a2bbf7f8ee6d32b9fac8afab3421286b06e6443))
|
|
31
|
+
* **socketio-client:** Throw an error and show a warning if someone tries to use socket.io-client v3 ([#2135](https://github.com/feathersjs/feathers/issues/2135)) ([cc3521c](https://github.com/feathersjs/feathers/commit/cc3521c935a1cbd690e29b7057998e3898f282db))
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
## [4.5.10](https://github.com/feathersjs/feathers/compare/v4.5.9...v4.5.10) (2020-11-08)
|
|
38
|
+
|
|
39
|
+
**Note:** Version bump only for package @feathersjs/authentication-client
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
|
|
6
45
|
## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
|
|
7
46
|
|
|
8
47
|
**Note:** Version bump only for package @feathersjs/authentication-client
|
package/lib/core.d.ts
CHANGED
|
@@ -28,7 +28,7 @@ export declare class AuthenticationClient {
|
|
|
28
28
|
removeAccessToken(): any;
|
|
29
29
|
reset(): Promise<any>;
|
|
30
30
|
handleError(error: FeathersError, type: 'authenticate' | 'logout'): any;
|
|
31
|
-
reAuthenticate(force?: boolean): Promise<AuthenticationResult>;
|
|
31
|
+
reAuthenticate(force?: boolean, strategy?: string): Promise<AuthenticationResult>;
|
|
32
32
|
authenticate(authentication?: AuthenticationRequest, params?: Params): Promise<AuthenticationResult>;
|
|
33
33
|
logout(): Promise<AuthenticationResult | null>;
|
|
34
34
|
}
|
package/lib/core.js
CHANGED
|
@@ -35,7 +35,7 @@ class AuthenticationClient {
|
|
|
35
35
|
const connected = this.app.io ? 'connect' : 'open';
|
|
36
36
|
const disconnected = this.app.io ? 'disconnect' : 'disconnection';
|
|
37
37
|
socket.on(disconnected, () => {
|
|
38
|
-
const authPromise = new Promise(resolve => socket.once(connected, () => resolve()))
|
|
38
|
+
const authPromise = new Promise(resolve => socket.once(connected, (data) => resolve(data)))
|
|
39
39
|
// Only reconnect when `reAuthenticate()` or `authenticate()`
|
|
40
40
|
// has been called explicitly first
|
|
41
41
|
// Force reauthentication with the server
|
|
@@ -83,7 +83,7 @@ class AuthenticationClient {
|
|
|
83
83
|
}
|
|
84
84
|
return Promise.reject(error);
|
|
85
85
|
}
|
|
86
|
-
reAuthenticate(force = false) {
|
|
86
|
+
reAuthenticate(force = false, strategy) {
|
|
87
87
|
// Either returns the authentication state or
|
|
88
88
|
// tries to re-authenticate with the stored JWT and strategy
|
|
89
89
|
const authPromise = this.app.get('authentication');
|
|
@@ -93,7 +93,7 @@ class AuthenticationClient {
|
|
|
93
93
|
throw new errors_1.NotAuthenticated('No accessToken found in storage');
|
|
94
94
|
}
|
|
95
95
|
return this.authenticate({
|
|
96
|
-
strategy: this.options.jwtStrategy,
|
|
96
|
+
strategy: strategy || this.options.jwtStrategy,
|
|
97
97
|
accessToken
|
|
98
98
|
});
|
|
99
99
|
});
|
package/lib/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":";;;AAAA,+CAAqE;AAGrE,uCAAoD;AAEpD,MAAM,QAAQ,GAAG,CAAC,QAAkB,EAAE,GAAW,EAAsB,EAAE;IACvE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEhE,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,MAAM,CAAE,AAAD,EAAG,KAAK,CAAE,GAAG,KAAK,CAAC;QAE1B,OAAO,CAAE,KAAK,EAAE,KAAK,CAAE,CAAC;KACzB;IAED,OAAO,CAAE,IAAI,EAAE,KAAK,CAAE,CAAC;AACzB,CAAC,CAAC;AAiBF,MAAa,oBAAoB;IAK/B,YAAa,GAAgB,EAAE,OAAoC;QACjE,MAAM,MAAM,GAAG,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,wBAAc,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;QAE1E,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAEjC,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SAC3B;IACH,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAY,CAAC;IAC5C,CAAC;IAED,YAAY,CAAE,MAAW;QACvB,8CAA8C;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC;QAElE,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;YAC3B,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CACxC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":";;;AAAA,+CAAqE;AAGrE,uCAAoD;AAEpD,MAAM,QAAQ,GAAG,CAAC,QAAkB,EAAE,GAAW,EAAsB,EAAE;IACvE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEhE,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,MAAM,CAAE,AAAD,EAAG,KAAK,CAAE,GAAG,KAAK,CAAC;QAE1B,OAAO,CAAE,KAAK,EAAE,KAAK,CAAE,CAAC;KACzB;IAED,OAAO,CAAE,IAAI,EAAE,KAAK,CAAE,CAAC;AACzB,CAAC,CAAC;AAiBF,MAAa,oBAAoB;IAK/B,YAAa,GAAgB,EAAE,OAAoC;QACjE,MAAM,MAAM,GAAG,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,wBAAc,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;QAE1E,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAEjC,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SAC3B;IACH,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAY,CAAC;IAC5C,CAAC;IAED,YAAY,CAAE,MAAW;QACvB,8CAA8C;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC;QAElE,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;YAC3B,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CACxC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CACrD;gBACD,6DAA6D;gBAC7D,mCAAmC;gBACnC,yCAAyC;iBACxC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAEnE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,eAAe,CAAE,QAAkB;QACjC,MAAM,CAAE,WAAW,EAAE,UAAU,CAAE,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEjF,IAAI,WAAW,KAAK,IAAI,EAAE;YACxB,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAEtD,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACrC;QAED,MAAM,CAAE,OAAO,EAAE,UAAU,CAAE,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAElF,IAAI,OAAO,KAAK,IAAI,EAAE;YACpB,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAEtD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,yBAAgB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAC1E;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,cAAc,CAAE,WAAmB;QACjC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACpE,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;aACjD,IAAI,CAAC,CAAC,WAAmB,EAAE,EAAE;YAC5B,IAAI,CAAC,WAAW,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,QAAQ,EAAE;gBACpE,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aAC9C;YAED,OAAO,WAAW,IAAI,IAAI,CAAC;QAC7B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK;QACH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAE3B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,WAAW,CAAE,KAAoB,EAAE,IAA6B;QAC9D,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE;YAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YAElE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;SAChF;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,cAAc,CAAE,QAAiB,KAAK,EAAE,QAAiB;QACvD,6CAA6C;QAC7C,4DAA4D;QAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAEnD,IAAI,CAAC,WAAW,IAAI,KAAK,KAAK,IAAI,EAAE;YAClC,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;gBAC9C,IAAI,CAAC,WAAW,EAAE;oBAChB,MAAM,IAAI,yBAAgB,CAAC,iCAAiC,CAAC,CAAC;iBAC/D;gBAED,OAAO,IAAI,CAAC,YAAY,CAAC;oBACvB,QAAQ,EAAE,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW;oBAC9C,WAAW;iBACZ,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,YAAY,CAAE,cAAsC,EAAE,MAAe;QACnE,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;SAC9B;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;aACxD,IAAI,CAAC,CAAC,UAAgC,EAAE,EAAE;YACzC,MAAM,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC;YAEnC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;YAE3C,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAoB,EAAE,EAAE,CAChC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,cAAc,CAAC,CACxC,CAAC;QAEJ,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAExC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM;QACJ,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;aACnD,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;aACpC,IAAI,CAAC,CAAC,UAAgC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;aACjE,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;aACxB,IAAI,CAAC,GAAG,EAAE;YACT,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAEpC,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CACH,CAAC;aACD,KAAK,CAAC,CAAC,KAAoB,EAAE,EAAE,CAC9B,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAClC,CAAC;IACN,CAAC;CACF;AAhKD,oDAgKC"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.authentication = void 0;
|
|
4
4
|
const commons_1 = require("@feathersjs/commons");
|
|
5
|
-
|
|
5
|
+
const authentication = () => {
|
|
6
6
|
return (context) => {
|
|
7
7
|
const { app, params, path, method, app: { authentication: service } } = context;
|
|
8
|
-
if (commons_1.stripSlashes(service.options.path) === path && method === 'create') {
|
|
8
|
+
if ((0, commons_1.stripSlashes)(service.options.path) === path && method === 'create') {
|
|
9
9
|
return context;
|
|
10
10
|
}
|
|
11
11
|
return Promise.resolve(app.get('authentication')).then(authResult => {
|
|
@@ -16,4 +16,5 @@ exports.authentication = () => {
|
|
|
16
16
|
});
|
|
17
17
|
};
|
|
18
18
|
};
|
|
19
|
+
exports.authentication = authentication;
|
|
19
20
|
//# sourceMappingURL=authentication.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/hooks/authentication.ts"],"names":[],"mappings":";;;AACA,iDAAmD;
|
|
1
|
+
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/hooks/authentication.ts"],"names":[],"mappings":";;;AACA,iDAAmD;AAE5C,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,OAAO,CAAC,OAAoB,EAAE,EAAE;QAC9B,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC;QAEhF,IAAI,IAAA,sBAAY,EAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,MAAM,KAAK,QAAQ,EAAE;YACtE,OAAO,OAAO,CAAC;SAChB;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YAClE,IAAI,UAAU,EAAE;gBACd,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;aACxD;YAED,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,cAAc,kBAgBzB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.populateHeader = void 0;
|
|
4
|
-
|
|
4
|
+
const populateHeader = () => {
|
|
5
5
|
return (context) => {
|
|
6
6
|
const { app, params: { accessToken } } = context;
|
|
7
7
|
const authentication = app.authentication;
|
|
@@ -16,4 +16,5 @@ exports.populateHeader = () => {
|
|
|
16
16
|
return context;
|
|
17
17
|
};
|
|
18
18
|
};
|
|
19
|
+
exports.populateHeader = populateHeader;
|
|
19
20
|
//# sourceMappingURL=populate-header.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populate-header.js","sourceRoot":"","sources":["../../src/hooks/populate-header.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"populate-header.js","sourceRoot":"","sources":["../../src/hooks/populate-header.ts"],"names":[],"mappings":";;;AAEO,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,OAAO,CAAC,OAAoB,EAAE,EAAE;QAC9B,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC;QACjD,MAAM,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC;QAE1C,+BAA+B;QAC/B,IAAI,GAAG,CAAC,IAAI,IAAI,WAAW,EAAE;YAC3B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC;YAClD,MAAM,UAAU,GAAG,GAAG,MAAM,IAAI,WAAW,EAAE,CAAC;YAE9C,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;gBACzC,CAAC,MAAM,CAAC,EAAE,UAAU;aACrB,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAC5B;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,cAAc,kBAiBzB"}
|
package/lib/index.js
CHANGED
|
@@ -26,14 +26,15 @@ const hooks = __importStar(require("./hooks"));
|
|
|
26
26
|
exports.hooks = hooks;
|
|
27
27
|
const storage_1 = require("./storage");
|
|
28
28
|
Object.defineProperty(exports, "MemoryStorage", { enumerable: true, get: function () { return storage_1.MemoryStorage; } });
|
|
29
|
-
|
|
29
|
+
const getDefaultStorage = () => {
|
|
30
30
|
try {
|
|
31
31
|
return new storage_1.StorageWrapper(window.localStorage);
|
|
32
32
|
}
|
|
33
33
|
catch (error) { }
|
|
34
34
|
return new storage_1.MemoryStorage();
|
|
35
35
|
};
|
|
36
|
-
exports.
|
|
36
|
+
exports.getDefaultStorage = getDefaultStorage;
|
|
37
|
+
exports.defaultStorage = (0, exports.getDefaultStorage)();
|
|
37
38
|
exports.defaults = {
|
|
38
39
|
header: 'Authorization',
|
|
39
40
|
scheme: 'Bearer',
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2E;AAyBlE,qGAzBA,2BAAoB,OAyBA;AAxB7B,+CAAiC;AAwBmD,sBAAK;AAtBzF,uCAAmE;AAsBE,8FAtBnD,uBAAa,OAsBmD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2E;AAyBlE,qGAzBA,2BAAoB,OAyBA;AAxB7B,+CAAiC;AAwBmD,sBAAK;AAtBzF,uCAAmE;AAsBE,8FAtBnD,uBAAa,OAsBmD;AAR3E,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,IAAI;QACF,OAAO,IAAI,wBAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;KAChD;IAAC,OAAO,KAAU,EAAE,GAAE;IAEvB,OAAO,IAAI,uBAAa,EAAE,CAAC;AAC7B,CAAC,CAAC;AANW,QAAA,iBAAiB,qBAM5B;AAMW,QAAA,cAAc,GAAY,IAAA,yBAAiB,GAAE,CAAC;AAE9C,QAAA,QAAQ,GAAgC;IACnD,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,QAAQ;IAChB,UAAU,EAAE,cAAc;IAC1B,WAAW,EAAE,cAAc;IAC3B,gBAAgB,EAAE,OAAO;IACzB,WAAW,EAAE,KAAK;IAClB,IAAI,EAAE,iBAAiB;IACvB,cAAc,EAAE,2BAAoB;IACpC,OAAO,EAAE,sBAAc;CACxB,CAAC;AAEF,MAAM,IAAI,GAAG,CAAC,WAAiD,EAAE,EAAE,EAAE;IACnE,MAAM,OAAO,GAAgC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAQ,EAAE,QAAQ,CAAC,CAAC;IACnF,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IAEnC,OAAO,CAAC,GAAgB,EAAE,EAAE;QAC1B,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAExD,GAAG,CAAC,cAAc,GAAG,cAAc,CAAC;QACpC,GAAG,CAAC,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACpE,GAAG,CAAC,cAAc,GAAG,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxE,GAAG,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAExD,GAAG,CAAC,KAAK,CAAC;YACR,MAAM,EAAE;gBACN,GAAG,EAAE;oBACH,KAAK,CAAC,cAAc,EAAE;oBACtB,KAAK,CAAC,cAAc,EAAE;iBACvB;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,IAAI,CAAC;AAEpB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;CACtD"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@feathersjs/authentication-client",
|
|
3
3
|
"description": "The authentication plugin for feathers-client",
|
|
4
|
-
"version": "4.5.
|
|
4
|
+
"version": "4.5.13",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -52,28 +52,28 @@
|
|
|
52
52
|
"access": "public"
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@feathersjs/authentication": "^4.5.
|
|
56
|
-
"@feathersjs/commons": "^4.5.
|
|
57
|
-
"@feathersjs/errors": "^4.5.
|
|
58
|
-
"@feathersjs/feathers": "^4.5.
|
|
59
|
-
"debug": "^4.
|
|
55
|
+
"@feathersjs/authentication": "^4.5.12",
|
|
56
|
+
"@feathersjs/commons": "^4.5.12",
|
|
57
|
+
"@feathersjs/errors": "^4.5.12",
|
|
58
|
+
"@feathersjs/feathers": "^4.5.12",
|
|
59
|
+
"debug": "^4.3.3"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
|
-
"@feathersjs/authentication-local": "^4.5.
|
|
63
|
-
"@feathersjs/express": "^4.5.
|
|
64
|
-
"@feathersjs/primus": "^4.5.
|
|
65
|
-
"@feathersjs/primus-client": "^4.5.
|
|
66
|
-
"@feathersjs/rest-client": "^4.5.
|
|
67
|
-
"@feathersjs/socketio": "^4.5.
|
|
68
|
-
"@feathersjs/socketio-client": "^4.5.
|
|
69
|
-
"@types/debug": "^4.1.
|
|
70
|
-
"@types/mocha": "^
|
|
71
|
-
"@types/node": "^
|
|
72
|
-
"axios": "^0.
|
|
73
|
-
"mocha": "^
|
|
74
|
-
"shx": "^0.3.
|
|
75
|
-
"ts-node": "^
|
|
76
|
-
"typescript": "^4.
|
|
62
|
+
"@feathersjs/authentication-local": "^4.5.12",
|
|
63
|
+
"@feathersjs/express": "^4.5.12",
|
|
64
|
+
"@feathersjs/primus": "^4.5.12",
|
|
65
|
+
"@feathersjs/primus-client": "^4.5.12",
|
|
66
|
+
"@feathersjs/rest-client": "^4.5.12",
|
|
67
|
+
"@feathersjs/socketio": "^4.5.13",
|
|
68
|
+
"@feathersjs/socketio-client": "^4.5.13",
|
|
69
|
+
"@types/debug": "^4.1.7",
|
|
70
|
+
"@types/mocha": "^9.0.0",
|
|
71
|
+
"@types/node": "^17.0.8",
|
|
72
|
+
"axios": "^0.24.0",
|
|
73
|
+
"mocha": "^9.1.3",
|
|
74
|
+
"shx": "^0.3.3",
|
|
75
|
+
"ts-node": "^10.4.0",
|
|
76
|
+
"typescript": "^4.5.4"
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "b5e94c4e996f64ef926b7d18849c854455d82f29"
|
|
79
79
|
}
|
package/src/core.ts
CHANGED
|
@@ -65,7 +65,7 @@ export class AuthenticationClient {
|
|
|
65
65
|
|
|
66
66
|
socket.on(disconnected, () => {
|
|
67
67
|
const authPromise = new Promise(resolve =>
|
|
68
|
-
socket.once(connected, () => resolve())
|
|
68
|
+
socket.once(connected, (data: any) => resolve(data))
|
|
69
69
|
)
|
|
70
70
|
// Only reconnect when `reAuthenticate()` or `authenticate()`
|
|
71
71
|
// has been called explicitly first
|
|
@@ -132,7 +132,7 @@ export class AuthenticationClient {
|
|
|
132
132
|
return Promise.reject(error);
|
|
133
133
|
}
|
|
134
134
|
|
|
135
|
-
reAuthenticate (force: boolean = false): Promise<AuthenticationResult> {
|
|
135
|
+
reAuthenticate (force: boolean = false, strategy?: string): Promise<AuthenticationResult> {
|
|
136
136
|
// Either returns the authentication state or
|
|
137
137
|
// tries to re-authenticate with the stored JWT and strategy
|
|
138
138
|
const authPromise = this.app.get('authentication');
|
|
@@ -144,7 +144,7 @@ export class AuthenticationClient {
|
|
|
144
144
|
}
|
|
145
145
|
|
|
146
146
|
return this.authenticate({
|
|
147
|
-
strategy: this.options.jwtStrategy,
|
|
147
|
+
strategy: strategy || this.options.jwtStrategy,
|
|
148
148
|
accessToken
|
|
149
149
|
});
|
|
150
150
|
});
|
package/src/index.ts
CHANGED