integreat 0.8.0-beta.26 → 0.8.0-beta.27
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/handlers/get.js +10 -1
- package/dist/handlers/get.js.map +1 -1
- package/dist/service/Auth.js +18 -30
- package/dist/service/Auth.js.map +1 -1
- package/dist/service/Connection.js +18 -31
- package/dist/service/Connection.js.map +1 -1
- package/package.json +3 -3
package/dist/handlers/get.js
CHANGED
|
@@ -49,11 +49,20 @@ async function mapOneOrMany(action, service, mapPerId) {
|
|
|
49
49
|
}
|
|
50
50
|
export default async function get(action, { getService }) {
|
|
51
51
|
const { type, targetService: serviceId, endpoint: endpointId, } = action.payload;
|
|
52
|
+
const id = getIdFromAction(action);
|
|
53
|
+
if (Array.isArray(id) && id.length === 0) {
|
|
54
|
+
return {
|
|
55
|
+
...action,
|
|
56
|
+
response: {
|
|
57
|
+
status: 'noaction',
|
|
58
|
+
error: 'GET action was dispatched with empty array of ids',
|
|
59
|
+
},
|
|
60
|
+
};
|
|
61
|
+
}
|
|
52
62
|
const service = typeof getService === 'function' ? getService(type, serviceId) : null;
|
|
53
63
|
if (!service) {
|
|
54
64
|
return createUnknownServiceError(action, type, serviceId, 'GET');
|
|
55
65
|
}
|
|
56
|
-
const id = getIdFromAction(action);
|
|
57
66
|
const endpointDebug = endpointId
|
|
58
67
|
? `endpoint '${endpointId}'`
|
|
59
68
|
: `endpoint matching type '${type}' and id '${id}'`;
|
package/dist/handlers/get.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/handlers/get.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/handlers/get.ts"],"names":[],"mappings":"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"}
|
package/dist/service/Auth.js
CHANGED
|
@@ -1,46 +1,35 @@
|
|
|
1
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
2
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
3
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
4
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
5
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
6
|
-
};
|
|
7
|
-
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
8
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
9
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
10
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
11
|
-
};
|
|
12
|
-
var _Auth_authenticator, _Auth_options, _Auth_authentication;
|
|
13
1
|
import { isObject } from '../utils/is.js';
|
|
14
2
|
const MAX_RETRIES = 1;
|
|
15
3
|
const shouldRetry = (authentication, retryCount) => authentication?.status === 'timeout' && retryCount < MAX_RETRIES;
|
|
16
4
|
export default class Auth {
|
|
5
|
+
id;
|
|
6
|
+
#authenticator;
|
|
7
|
+
#options;
|
|
8
|
+
#authentication;
|
|
17
9
|
constructor(id, authenticator, options) {
|
|
18
|
-
_Auth_authenticator.set(this, void 0);
|
|
19
|
-
_Auth_options.set(this, void 0);
|
|
20
|
-
_Auth_authentication.set(this, void 0);
|
|
21
10
|
if (!authenticator) {
|
|
22
11
|
throw new TypeError('Auth requires an authenticator');
|
|
23
12
|
}
|
|
24
13
|
this.id = id;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
14
|
+
this.#authenticator = authenticator;
|
|
15
|
+
this.#options = options || {};
|
|
16
|
+
this.#authentication = null;
|
|
28
17
|
}
|
|
29
18
|
async authenticate(action) {
|
|
30
|
-
if (
|
|
31
|
-
|
|
19
|
+
if (this.#authentication?.status === 'granted' &&
|
|
20
|
+
this.#authenticator.isAuthenticated(this.#authentication, action)) {
|
|
32
21
|
return true;
|
|
33
22
|
}
|
|
34
23
|
let attempt = 0;
|
|
35
24
|
do {
|
|
36
|
-
|
|
37
|
-
} while (shouldRetry(
|
|
38
|
-
return
|
|
25
|
+
this.#authentication = await this.#authenticator.authenticate(this.#options, action);
|
|
26
|
+
} while (shouldRetry(this.#authentication, attempt++));
|
|
27
|
+
return this.#authentication?.status === 'granted';
|
|
39
28
|
}
|
|
40
29
|
async authenticateAndGetAuthObject(action, method) {
|
|
41
|
-
const fn =
|
|
30
|
+
const fn = this.#authenticator.authentication[method];
|
|
42
31
|
if (typeof fn === 'function') {
|
|
43
|
-
const auth = await
|
|
32
|
+
const auth = await this.#authenticator.authenticate(this.#options, action);
|
|
44
33
|
if (auth.status === 'granted') {
|
|
45
34
|
return fn(auth);
|
|
46
35
|
}
|
|
@@ -51,18 +40,18 @@ export default class Auth {
|
|
|
51
40
|
return null;
|
|
52
41
|
}
|
|
53
42
|
getAuthObject(transporter) {
|
|
54
|
-
const auth =
|
|
43
|
+
const auth = this.#authentication;
|
|
55
44
|
if (!auth || auth.status !== 'granted') {
|
|
56
45
|
return null;
|
|
57
46
|
}
|
|
58
|
-
const authenticator =
|
|
47
|
+
const authenticator = this.#authenticator;
|
|
59
48
|
const fn = isObject(authenticator?.authentication) &&
|
|
60
49
|
typeof transporter.authentication === 'string' &&
|
|
61
50
|
authenticator.authentication[transporter.authentication];
|
|
62
51
|
return typeof fn === 'function' ? fn(auth) : null;
|
|
63
52
|
}
|
|
64
53
|
getStatusObject() {
|
|
65
|
-
const auth =
|
|
54
|
+
const auth = this.#authentication;
|
|
66
55
|
if (!auth) {
|
|
67
56
|
return { status: 'noaccess' };
|
|
68
57
|
}
|
|
@@ -76,7 +65,7 @@ export default class Auth {
|
|
|
76
65
|
return { status, error: [error, auth.error].filter(Boolean).join(' ') };
|
|
77
66
|
}
|
|
78
67
|
applyToAction(action, transporter) {
|
|
79
|
-
const auth =
|
|
68
|
+
const auth = this.#authentication;
|
|
80
69
|
if (auth?.status === 'granted') {
|
|
81
70
|
return {
|
|
82
71
|
...action,
|
|
@@ -96,5 +85,4 @@ export default class Auth {
|
|
|
96
85
|
};
|
|
97
86
|
}
|
|
98
87
|
}
|
|
99
|
-
_Auth_authenticator = new WeakMap(), _Auth_options = new WeakMap(), _Auth_authentication = new WeakMap();
|
|
100
88
|
//# sourceMappingURL=Auth.js.map
|
package/dist/service/Auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/service/Auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/service/Auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,51 +1,38 @@
|
|
|
1
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
2
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
3
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
4
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
5
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
6
|
-
};
|
|
7
|
-
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
8
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
9
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
10
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
11
|
-
};
|
|
12
|
-
var _Connection_transporter, _Connection_options, _Connection_connection, _Connection_emit;
|
|
13
1
|
const isSuccessStatus = (status) => typeof status === 'string' && ['ok', 'noaction'].includes(status);
|
|
14
2
|
export default class Connection {
|
|
3
|
+
#transporter;
|
|
4
|
+
#options;
|
|
5
|
+
#connection;
|
|
6
|
+
#emit;
|
|
15
7
|
constructor(transporter, options, emit) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
__classPrivateFieldSet(this, _Connection_transporter, transporter, "f");
|
|
21
|
-
__classPrivateFieldSet(this, _Connection_options, options, "f");
|
|
22
|
-
__classPrivateFieldSet(this, _Connection_connection, null, "f");
|
|
23
|
-
__classPrivateFieldSet(this, _Connection_emit, emit, "f");
|
|
8
|
+
this.#transporter = transporter;
|
|
9
|
+
this.#options = options;
|
|
10
|
+
this.#connection = null;
|
|
11
|
+
this.#emit = emit;
|
|
24
12
|
}
|
|
25
13
|
async connect(auth) {
|
|
26
|
-
if (typeof
|
|
27
|
-
|
|
14
|
+
if (typeof this.#transporter.connect === 'function') {
|
|
15
|
+
this.#connection = (await this.#transporter.connect(this.#options, auth || null, this.#connection?.status === 'ok' ? this.#connection : null, this.#emit)) || { status: 'ok' };
|
|
28
16
|
}
|
|
29
17
|
else {
|
|
30
|
-
|
|
18
|
+
this.#connection = { status: 'ok' };
|
|
31
19
|
}
|
|
32
|
-
return isSuccessStatus(
|
|
20
|
+
return isSuccessStatus(this.#connection?.status);
|
|
33
21
|
}
|
|
34
22
|
async disconnect() {
|
|
35
|
-
if (typeof
|
|
36
|
-
await
|
|
23
|
+
if (typeof this.#transporter.disconnect === 'function') {
|
|
24
|
+
await this.#transporter.disconnect(this.#connection);
|
|
37
25
|
}
|
|
38
|
-
|
|
26
|
+
this.#connection = null;
|
|
39
27
|
}
|
|
40
28
|
get status() {
|
|
41
|
-
return
|
|
29
|
+
return this.#connection?.status || null;
|
|
42
30
|
}
|
|
43
31
|
get error() {
|
|
44
|
-
return
|
|
32
|
+
return this.#connection?.error || null;
|
|
45
33
|
}
|
|
46
34
|
get object() {
|
|
47
|
-
return
|
|
35
|
+
return this.#connection || null;
|
|
48
36
|
}
|
|
49
37
|
}
|
|
50
|
-
_Connection_transporter = new WeakMap(), _Connection_options = new WeakMap(), _Connection_connection = new WeakMap(), _Connection_emit = new WeakMap();
|
|
51
38
|
//# sourceMappingURL=Connection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../src/service/Connection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../src/service/Connection.ts"],"names":[],"mappings":"AAQA,MAAM,eAAe,GAAG,CAAC,MAAsB,EAAE,EAAE,CACjD,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAEnE,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,YAAY,CAAa;IACzB,QAAQ,CAAiB;IACzB,WAAW,CAAyB;IACpC,KAAK,CAAiD;IAEtD,YACE,WAAwB,EACxB,OAAwB,EACxB,IAAqD;QAErD,IAAI,CAAC,YAAY,GAAG,WAAW,CAAA;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAqC;QACjD,IAAI,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,KAAK,UAAU,EAAE;YACnD,IAAI,CAAC,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CACjD,IAAI,CAAC,QAAQ,EACb,IAAI,IAAI,IAAI,EACZ,IAAI,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAC3D,IAAI,CAAC,KAAK,CACX,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;SACvB;aAAM;YACL,IAAI,CAAC,WAAW,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;SACpC;QACD,OAAO,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,KAAK,UAAU,EAAE;YACtD,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;SACrD;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;IACzB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,WAAW,EAAE,MAAM,IAAI,IAAI,CAAA;IACzC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,IAAI,CAAA;IACxC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,WAAW,IAAI,IAAI,CAAA;IACjC,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "0.8.0-beta.
|
|
3
|
+
"version": "0.8.0-beta.27",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"homepage": "https://github.com/integreat-io/integreat#readme",
|
|
40
40
|
"engines": {
|
|
41
|
-
"node": ">=
|
|
41
|
+
"node": ">= 18"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"@types/debug": "^4.1.7",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"rfdc": "^1.3.0"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@integreat/ts-dev-setup": "^4.0.
|
|
59
|
+
"@integreat/ts-dev-setup": "^4.0.1",
|
|
60
60
|
"@types/sinon": "^10.0.13",
|
|
61
61
|
"integreat-transporter-http": "0.1.0-beta.6",
|
|
62
62
|
"nock": "^13.3.0",
|