integreat 1.3.4 → 1.3.6
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.
|
@@ -6,7 +6,7 @@ const getIdent = async (ident, dispatch) => {
|
|
|
6
6
|
});
|
|
7
7
|
return response.status === 'ok' ? response?.access?.ident || ident : undefined;
|
|
8
8
|
};
|
|
9
|
-
const isIdentGetable = (ident) => !!(ident?.id || ident?.withToken);
|
|
9
|
+
const isIdentGetable = (ident) => !ident?.root && !!(ident?.id || ident?.withToken);
|
|
10
10
|
const completeIdent = (next) => async (action) => {
|
|
11
11
|
const originalIdent = action.meta?.ident;
|
|
12
12
|
if (isIdentGetable(originalIdent)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completeIdent.js","sourceRoot":"","sources":["../../src/middleware/completeIdent.ts"],"names":[],"mappings":"AAEA,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAY,EAAE,QAAyB,EAAE,EAAE;IACjE,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC;QAC9B,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,EAAE,KAAK,EAAE;KAChB,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;AAChF,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,KAAa,EAAkB,EAAE,CACvD,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,SAAS,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"completeIdent.js","sourceRoot":"","sources":["../../src/middleware/completeIdent.ts"],"names":[],"mappings":"AAEA,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAY,EAAE,QAAyB,EAAE,EAAE;IACjE,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC;QAC9B,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,EAAE,KAAK,EAAE;KAChB,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;AAChF,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,KAAa,EAAkB,EAAE,CACvD,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,SAAS,CAAC,CAAA;AAmBnD,MAAM,aAAa,GAAe,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;IAC3D,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,KAAK,CAAA;IACxC,IAAI,cAAc,CAAC,aAAa,CAAC,EAAE;QACjC,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;QACjD,OAAO,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;KAC5D;SAAM;QACL,OAAO,IAAI,CAAC,MAAM,CAAC,CAAA;KACpB;AACH,CAAC,CAAA;AAED,eAAe,aAAa,CAAA"}
|
|
@@ -10,7 +10,10 @@ const setServiceIdAsSourceServiceOnAction = (action, serviceId) => ({
|
|
|
10
10
|
sourceService: action.payload.sourceService || serviceId,
|
|
11
11
|
},
|
|
12
12
|
});
|
|
13
|
-
const isIdent = (ident) => isObject(ident) &&
|
|
13
|
+
const isIdent = (ident) => isObject(ident) &&
|
|
14
|
+
(typeof ident.id === 'string' ||
|
|
15
|
+
typeof ident.withToken === 'string' ||
|
|
16
|
+
(Array.isArray(ident.withToken) && typeof ident.withToken[0] === 'string'));
|
|
14
17
|
const isKnownIdent = (ident) => ident[identityFromIntegreat] === true;
|
|
15
18
|
function markIdentAsKnown(response) {
|
|
16
19
|
const ident = response.access?.ident;
|
|
@@ -29,6 +32,9 @@ function markIdentAsKnown(response) {
|
|
|
29
32
|
}
|
|
30
33
|
const removeKnownIdentMarker = ({ [identityFromIntegreat]: _, ...identWithoutMarker }) => identWithoutMarker;
|
|
31
34
|
async function authorizeIncoming(action, serviceId) {
|
|
35
|
+
if (typeof action.response?.status === 'string') {
|
|
36
|
+
return action;
|
|
37
|
+
}
|
|
32
38
|
const ident = action.meta?.ident;
|
|
33
39
|
if (!isIdent(ident)) {
|
|
34
40
|
return setErrorOnAction(action, 'Authentication was refused. No ident', `auth:service:${serviceId}`, 'noaccess');
|
|
@@ -44,12 +50,10 @@ async function authorizeIncoming(action, serviceId) {
|
|
|
44
50
|
}
|
|
45
51
|
}
|
|
46
52
|
const dispatchWithProgress = (dispatch, setProgress, serviceId) => async function (action) {
|
|
47
|
-
if (typeof action.response?.status === 'string') {
|
|
48
|
-
return action.response;
|
|
49
|
-
}
|
|
50
53
|
const p = dispatch(action);
|
|
51
54
|
p.onProgress(setProgress);
|
|
52
|
-
|
|
55
|
+
const response = await p;
|
|
56
|
+
return setOrigin(response, `service:${serviceId}`);
|
|
53
57
|
};
|
|
54
58
|
async function runAuths(auths, authentication, action) {
|
|
55
59
|
let response = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incoming.js","sourceRoot":"","sources":["../../../src/service/utils/incoming.ts"],"names":[],"mappings":"AACA,OAAO,SAA+B,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAU5C,MAAM,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAA;AAE7D,MAAM,mCAAmC,GAAG,CAC1C,MAAc,EACd,SAAiB,EACT,EAAE,CAAC,CAAC;IACZ,GAAG,MAAM;IACT,OAAO,EAAE;QACP,GAAG,MAAM,CAAC,OAAO;QACjB,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,IAAI,SAAS;KACzD;CACF,CAAC,CAAA;AAEF,MAAM,OAAO,GAAG,CAAC,KAAc,EAAkB,EAAE,CACjD,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"incoming.js","sourceRoot":"","sources":["../../../src/service/utils/incoming.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.6",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -59,8 +59,8 @@
|
|
|
59
59
|
"@types/sinon": "^10.0.16",
|
|
60
60
|
"integreat-adapter-json": "^1.0.0",
|
|
61
61
|
"integreat-adapter-uri": "^1.0.0",
|
|
62
|
-
"integreat-transformers": "^1.0.
|
|
63
|
-
"integreat-transporter-http": "1.2.
|
|
62
|
+
"integreat-transformers": "^1.0.2",
|
|
63
|
+
"integreat-transporter-http": "1.2.1",
|
|
64
64
|
"nock": "^13.3.3",
|
|
65
65
|
"sinon": "^16.0.0"
|
|
66
66
|
}
|