integreat 0.8.2 → 0.8.3
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/dist/authenticators/options.js +1 -1
- package/dist/authenticators/options.js.map +1 -1
- package/dist/authenticators/token.js +1 -1
- package/dist/authenticators/token.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/service/Auth.js +5 -5
- package/dist/service/Auth.js.map +1 -1
- package/dist/service/types.d.ts +5 -4
- package/package.json +1 -1
|
@@ -3,7 +3,7 @@ const optionsAuth = {
|
|
|
3
3
|
async authenticate(options, _action) {
|
|
4
4
|
return { status: 'granted', ...options };
|
|
5
5
|
},
|
|
6
|
-
isAuthenticated(authentication, _action) {
|
|
6
|
+
isAuthenticated(authentication, _options, _action) {
|
|
7
7
|
return !!(authentication && authentication.status === 'granted');
|
|
8
8
|
},
|
|
9
9
|
authentication: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/authenticators/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAMzC,MAAM,WAAW,GAAkB;IAQjC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO;QACjC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CAAA;IAC1C,CAAC;IAOD,eAAe,CAAC,cAAc,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/authenticators/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAMzC,MAAM,WAAW,GAAkB;IAQjC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO;QACjC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CAAA;IAC1C,CAAC;IAOD,eAAe,CAAC,cAAc,EAAE,QAAQ,EAAE,OAAO;QAC/C,OAAO,CAAC,CAAC,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;IAClE,CAAC;IAED,cAAc,EAAE;QAOd,QAAQ,CAAC,cAAqC;YAC5C,IAAI,QAAQ,CAAC,cAAc,CAAC,EAAE;gBAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,GAAG,cAAc,CAAA;gBAC7C,IAAI,MAAM,KAAK,SAAS,EAAE;oBACxB,OAAO,OAAO,CAAA;iBACf;aACF;YACD,OAAO,EAAE,CAAA;QACX,CAAC;QAOD,aAAa,CACX,cAAqC;YAErC,IAAI,QAAQ,CAAC,cAAc,CAAC,EAAE;gBAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,GAAG,cAAc,CAAA;gBAC7C,IAAI,MAAM,KAAK,SAAS,EAAE;oBACxB,OAAO,OAAO,CAAA;iBACf;aACF;YACD,OAAO,EAAE,CAAA;QACX,CAAC;KACF;CACF,CAAA;AAED,eAAe,WAAW,CAAA"}
|
|
@@ -15,7 +15,7 @@ const tokenAuth = {
|
|
|
15
15
|
? { status: 'granted', token, type, encode }
|
|
16
16
|
: { status: 'refused' };
|
|
17
17
|
},
|
|
18
|
-
isAuthenticated(authentication, _action) {
|
|
18
|
+
isAuthenticated(authentication, _options, _action) {
|
|
19
19
|
return !!(authentication &&
|
|
20
20
|
authentication.status === 'granted' &&
|
|
21
21
|
authentication.token);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/authenticators/token.ts"],"names":[],"mappings":"AAiBA,MAAM,eAAe,GAAG,CAAC,cAA0C,EAAE,EAAE;IACrE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,cAAc,IAAI,EAAE,CAAA;IAC5D,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE;QAClC,OAAO,EAAE,CAAA;KACV;IACD,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK;QAC7D,IAAI;KACL,CAAA;AACH,CAAC,CAAA;AAKD,MAAM,SAAS,GAAkB;IAO/B,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO;QACjC,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QAC5D,OAAO,KAAK;YACV,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE;YAC5C,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;IAC3B,CAAC;IAOD,eAAe,CAAC,cAAc,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/authenticators/token.ts"],"names":[],"mappings":"AAiBA,MAAM,eAAe,GAAG,CAAC,cAA0C,EAAE,EAAE;IACrE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,cAAc,IAAI,EAAE,CAAA;IAC5D,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE;QAClC,OAAO,EAAE,CAAA;KACV;IACD,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK;QAC7D,IAAI;KACL,CAAA;AACH,CAAC,CAAA;AAKD,MAAM,SAAS,GAAkB;IAO/B,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO;QACjC,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QAC5D,OAAO,KAAK;YACV,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE;YAC5C,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;IAC3B,CAAC;IAOD,eAAe,CAAC,cAAc,EAAE,QAAQ,EAAE,OAAO;QAC/C,OAAO,CAAC,CAAC,CACP,cAAc;YACd,cAAc,CAAC,MAAM,KAAK,SAAS;YACnC,cAAc,CAAC,KAAK,CACrB,CAAA;IACH,CAAC;IAED,cAAc,EAAE;QAOd,QAAQ,CAAC,cAA0C;YACjD,OAAO,eAAe,CAAC,cAAc,CAAC,CAAA;QACxC,CAAC;QAQD,aAAa,CAAC,cAA0C;YACtD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC,cAAc,CAAC,CAAA;YACvD,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAC1E,CAAC;KACF;CACF,CAAA;AAED,eAAe,SAAS,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -8,7 +8,7 @@ export * as middleware from './middleware/index.js';
|
|
|
8
8
|
export * as adapters from './adapters/index.js';
|
|
9
9
|
export { createAction } from './utils/action.js';
|
|
10
10
|
export default {
|
|
11
|
-
version: '0.8.
|
|
11
|
+
version: '0.8.3',
|
|
12
12
|
create,
|
|
13
13
|
mergeDefinitions,
|
|
14
14
|
mergeResources,
|
package/dist/service/Auth.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { isObject } from '../utils/is.js';
|
|
2
2
|
const MAX_RETRIES = 1;
|
|
3
3
|
const shouldRetry = (authentication, retryCount) => authentication?.status === 'timeout' && retryCount < MAX_RETRIES;
|
|
4
|
-
const getKey = (authenticator, action) => typeof authenticator.extractAuthKey === 'function'
|
|
5
|
-
? authenticator.extractAuthKey(action) || ''
|
|
4
|
+
const getKey = (authenticator, options, action) => typeof authenticator.extractAuthKey === 'function'
|
|
5
|
+
? authenticator.extractAuthKey(options, action) || ''
|
|
6
6
|
: '';
|
|
7
7
|
export default class Auth {
|
|
8
8
|
id;
|
|
@@ -15,10 +15,10 @@ export default class Auth {
|
|
|
15
15
|
this.#options = options || {};
|
|
16
16
|
}
|
|
17
17
|
async authenticate(action) {
|
|
18
|
-
const key = getKey(this.#authenticator, action);
|
|
18
|
+
const key = getKey(this.#authenticator, this.#options, action);
|
|
19
19
|
let authentication = this.#authentications.get(key);
|
|
20
20
|
if (authentication?.status === 'granted' &&
|
|
21
|
-
this.#authenticator.isAuthenticated(authentication, action)) {
|
|
21
|
+
this.#authenticator.isAuthenticated(authentication, this.#options, action)) {
|
|
22
22
|
return true;
|
|
23
23
|
}
|
|
24
24
|
let attempt = 0;
|
|
@@ -70,7 +70,7 @@ export default class Auth {
|
|
|
70
70
|
return { status, error: [error, auth.error].filter(Boolean).join(' ') };
|
|
71
71
|
}
|
|
72
72
|
applyToAction(action, transporter) {
|
|
73
|
-
const key = getKey(this.#authenticator, action);
|
|
73
|
+
const key = getKey(this.#authenticator, this.#options, action);
|
|
74
74
|
const auth = this.#authentications.get(key);
|
|
75
75
|
if (auth?.status === 'granted') {
|
|
76
76
|
return {
|
package/dist/service/Auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/service/Auth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,MAAM,WAAW,GAAG,CAAC,CAAA;AAErB,MAAM,WAAW,GAAG,CAClB,cAAqC,EACrC,UAAkB,EAClB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,SAAS,IAAI,UAAU,GAAG,WAAW,CAAA;AAOrE,MAAM,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/service/Auth.ts"],"names":[],"mappings":"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"}
|
package/dist/service/types.d.ts
CHANGED
|
@@ -21,11 +21,12 @@ export type AuthOptions = Record<string, unknown>;
|
|
|
21
21
|
export interface Authentication extends Record<string, unknown> {
|
|
22
22
|
status: string;
|
|
23
23
|
error?: string;
|
|
24
|
+
authKey?: string;
|
|
24
25
|
}
|
|
25
|
-
export interface Authenticator<T extends Authentication = Authentication> {
|
|
26
|
-
extractAuthKey?: (action: Action | null) => string;
|
|
27
|
-
authenticate: (options:
|
|
28
|
-
isAuthenticated: (authentication: T | null, action: Action | null) => boolean;
|
|
26
|
+
export interface Authenticator<T extends Authentication = Authentication, U extends AuthOptions = AuthOptions> {
|
|
27
|
+
extractAuthKey?: (options: U | null, action: Action | null) => string;
|
|
28
|
+
authenticate: (options: U | null, action: Action | null) => Promise<T>;
|
|
29
|
+
isAuthenticated: (authentication: T | null, options: U | null, action: Action | null) => boolean;
|
|
29
30
|
authentication: {
|
|
30
31
|
[asFunction: string]: (authentication: T | null) => Record<string, unknown>;
|
|
31
32
|
};
|