integreat 1.3.1 → 1.3.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/handlers/get.js
CHANGED
|
@@ -2,8 +2,11 @@ import debugLib from 'debug';
|
|
|
2
2
|
import pLimit from 'p-limit';
|
|
3
3
|
import { createErrorResponse, createUnknownServiceError, combineResponses, setOrigin, } from '../utils/response.js';
|
|
4
4
|
import mutateAndSend from '../utils/mutateAndSend.js';
|
|
5
|
+
import { isObject } from '../utils/is.js';
|
|
5
6
|
const debug = debugLib('great');
|
|
6
|
-
const isErrorResponse = (response) => response
|
|
7
|
+
const isErrorResponse = (response) => isObject(response) &&
|
|
8
|
+
response.status !== 'ok' &&
|
|
9
|
+
response.status !== 'notfound';
|
|
7
10
|
const getIdFromAction = ({ payload: { id } }) => Array.isArray(id) && id.length === 1 ? id[0] : id;
|
|
8
11
|
function combineIndividualResponses(action, responses) {
|
|
9
12
|
const errorResponses = responses.filter(isErrorResponse);
|
package/dist/handlers/get.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/handlers/get.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,OAAO,CAAA;AAC5B,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,EAChB,SAAS,GACV,MAAM,sBAAsB,CAAA;AAC7B,OAAO,aAAa,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/handlers/get.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,9 @@ function authorizeByAllow(allow, hasIdent = false) {
|
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
const hasRole = (required, present) => Boolean(present && required.some((role) => present.includes(role)));
|
|
21
|
+
const hasIdent = (required, present) => typeof present === 'string' && required.includes(present);
|
|
22
|
+
const hasFromFields = (access) => typeof access.identFromField === 'string' ||
|
|
23
|
+
typeof access.roleFromField === 'string';
|
|
21
24
|
const authMethods = [
|
|
22
25
|
'allow',
|
|
23
26
|
'ident',
|
|
@@ -28,6 +31,40 @@ const authMethods = [
|
|
|
28
31
|
const isAuthMethod = (method) => authMethods.includes(method);
|
|
29
32
|
const hasAuthMethod = (access) => Object.keys(access).filter(isAuthMethod).length > 0;
|
|
30
33
|
const createRequiredError = (items, itemName) => `Authentication was refused, ${itemName}${items.length > 1 ? 's' : ''} required: ${items.map((item) => `'${item}'`).join(', ')}`;
|
|
34
|
+
function authorizeByFromField(type, ident) {
|
|
35
|
+
if (ident) {
|
|
36
|
+
return undefined;
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
return {
|
|
40
|
+
reason: 'NO_IDENT',
|
|
41
|
+
error: `Authentication was refused for type '${type}'`,
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
function authorizeByRoleOrIdent(access, ident) {
|
|
46
|
+
const roles = ensureArray(access.role);
|
|
47
|
+
const idents = ensureArray(access.ident);
|
|
48
|
+
const isGrantedByRole = roles.length > 0 && hasRole(roles, ident?.roles);
|
|
49
|
+
const isGrantedByIdent = idents.length > 0 && hasIdent(idents, ident?.id);
|
|
50
|
+
if (isGrantedByIdent ||
|
|
51
|
+
isGrantedByRole ||
|
|
52
|
+
(roles.length === 0 && idents.length === 0)) {
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
if (roles.length > 0 && !isGrantedByRole) {
|
|
56
|
+
return {
|
|
57
|
+
reason: 'MISSING_ROLE',
|
|
58
|
+
error: createRequiredError(roles, 'role'),
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
return {
|
|
63
|
+
reason: 'WRONG_IDENT',
|
|
64
|
+
error: createRequiredError(idents, 'ident'),
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
}
|
|
31
68
|
function authorizeByOneSchema(ident, schema, type, actionType, requireAuth) {
|
|
32
69
|
if (!schema) {
|
|
33
70
|
return {
|
|
@@ -49,29 +86,10 @@ function authorizeByOneSchema(ident, schema, type, actionType, requireAuth) {
|
|
|
49
86
|
error: `Authentication was refused for type '${type}'`,
|
|
50
87
|
};
|
|
51
88
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
return {
|
|
55
|
-
reason: 'MISSING_ROLE',
|
|
56
|
-
error: createRequiredError(roles, 'role'),
|
|
57
|
-
};
|
|
58
|
-
}
|
|
59
|
-
const idents = ensureArray(access.ident);
|
|
60
|
-
if (idents.length > 0 && ident?.id && !idents.includes(ident?.id)) {
|
|
61
|
-
return {
|
|
62
|
-
reason: 'WRONG_IDENT',
|
|
63
|
-
error: createRequiredError(idents, 'ident'),
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
|
-
if ((typeof access.identFromField === 'string' ||
|
|
67
|
-
typeof access.roleFromField === 'string') &&
|
|
68
|
-
!ident) {
|
|
69
|
-
return {
|
|
70
|
-
reason: 'NO_IDENT',
|
|
71
|
-
error: `Authentication was refused for type '${type}'`,
|
|
72
|
-
};
|
|
89
|
+
if (hasFromFields(access)) {
|
|
90
|
+
return authorizeByFromField(type, ident);
|
|
73
91
|
}
|
|
74
|
-
return
|
|
92
|
+
return authorizeByRoleOrIdent(access, ident);
|
|
75
93
|
}
|
|
76
94
|
function authorizeBySchema(ident, schemas, actionTypes, action, requireAuth) {
|
|
77
95
|
for (const actionType of actionTypes) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authAction.js","sourceRoot":"","sources":["../../../src/service/utils/authAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKlD,MAAM,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAA;AAE7D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAiE,EACjE,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;AAEtD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,YAAY,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC;IACzE,GAAG,MAAM;IACT,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,EAAE,YAAY,EAAE;CAChE,CAAC,CAAA;AAEF,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AAEtD,SAAS,gBAAgB,CAAC,KAAc,EAAE,QAAQ,GAAG,KAAK;IACxD,QAAQ,KAAK,EAAE;QACb,KAAK,SAAS,CAAC;QACf,KAAK,KAAK;YACR,OAAO,SAAS,CAAA;QAClB,KAAK,MAAM;YACT,OAAO,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;QAC1C;YAEE,OAAO,YAAY,CAAA;KACtB;AACH,CAAC;AAED,MAAM,OAAO,GAAG,CAAC,QAAkB,EAAE,OAAkB,EAAE,EAAE,CACzD,OAAO,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"authAction.js","sourceRoot":"","sources":["../../../src/service/utils/authAction.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/response.js
CHANGED
|
@@ -43,14 +43,15 @@ function getCombinedOrigins(responses) {
|
|
|
43
43
|
return origins.length === 1 ? origins[0] : undefined;
|
|
44
44
|
}
|
|
45
45
|
export function combineResponses(responses) {
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
const realResponses = responses.filter(isNotNullOrUndefined);
|
|
47
|
+
if (realResponses.length < 2) {
|
|
48
|
+
return realResponses[0];
|
|
48
49
|
}
|
|
49
50
|
else {
|
|
50
|
-
const status = getCombinedStatus(
|
|
51
|
-
const error = getCombinedErrors(
|
|
52
|
-
const warning = getCombinedWarnings(
|
|
53
|
-
const origin = getCombinedOrigins(
|
|
51
|
+
const status = getCombinedStatus(realResponses);
|
|
52
|
+
const error = getCombinedErrors(realResponses);
|
|
53
|
+
const warning = getCombinedWarnings(realResponses);
|
|
54
|
+
const origin = getCombinedOrigins(realResponses);
|
|
54
55
|
return {
|
|
55
56
|
status,
|
|
56
57
|
...(error && { error }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.3",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"debug": "^4.3.4",
|
|
47
47
|
"deepmerge-ts": "^5.1.0",
|
|
48
48
|
"map-any": "^1.0.0",
|
|
49
|
-
"map-transform": "^1.0.
|
|
49
|
+
"map-transform": "^1.0.4",
|
|
50
50
|
"ms": "^2.1.3",
|
|
51
51
|
"nanoid": "^4.0.2",
|
|
52
52
|
"p-limit": "^4.0.0",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"rfdc": "^1.3.0"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
|
-
"@integreat/ts-dev-setup": "^
|
|
58
|
+
"@integreat/ts-dev-setup": "^5.0.0",
|
|
59
59
|
"@types/sinon": "^10.0.16",
|
|
60
60
|
"integreat-adapter-json": "^1.0.0",
|
|
61
61
|
"integreat-adapter-uri": "^1.0.0",
|