integreat 1.3.2 → 1.3.4
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 +4 -1
- package/dist/handlers/get.js.map +1 -1
- package/dist/middleware/completeIdent.js +3 -3
- package/dist/middleware/completeIdent.js.map +1 -1
- package/dist/schema/accessForAction.js +1 -1
- package/dist/schema/accessForAction.js.map +1 -1
- package/dist/service/utils/authAction.d.ts +6 -0
- package/dist/service/utils/authAction.js +40 -24
- package/dist/service/utils/authAction.js.map +1 -1
- package/dist/service/utils/authData.js +34 -36
- package/dist/service/utils/authData.js.map +1 -1
- package/dist/utils/response.js +7 -6
- package/dist/utils/response.js.map +1 -1
- package/package.json +4 -4
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":"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;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAKzC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;AAE/B,MAAM,eAAe,GAAG,CAAC,QAAkB,EAAE,EAAE,CAC7C,QAAQ,CAAC,QAAQ,CAAC;IAClB,QAAQ,CAAC,MAAM,KAAK,IAAI;IACxB,QAAQ,CAAC,MAAM,KAAK,UAAU,CAAA;AAEhC,MAAM,eAAe,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAU,EAAE,EAAE,CACtD,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAEnD,SAAS,0BAA0B,CACjC,MAAc,EACd,SAAqB;IAErB,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;IAExD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7B,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAA;QACzD,OAAO,SAAS,CACd;YACE,GAAG,gBAAgB;YACnB,KAAK,EAAE,uCAAuC,eAAe,CAC3D,MAAM,CACP,wCAAwC,gBAAgB,CAAC,KAAK,EAAE;SAClE,EACD,aAAa,CACd,CAAA;KACF;SAAM;QACL,OAAO;YACL,GAAG,MAAM,CAAC,QAAQ;YAClB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC/B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAChE;SACF,CAAA;KACF;AACH,CAAC;AAED,MAAM,cAAc,GAAG,CAAC,QAAmB,EAAE,EAAE,CAC7C,QAAQ,EAAE,KAAK,EAAE,KAAK,KAAK,SAAS,CAAA;AAEtC,MAAM,oBAAoB,GAAG,CAC3B,MAAc,EACd,EAAsB,EACd,EAAE,CAAC,CAAC;IACZ,GAAG,MAAM;IACT,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE;CACnC,CAAC,CAAA;AAEF,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAE,SAAiB,EAAE,EAAE,CAClE,mBAAmB,CACjB,wBAAwB,MAAM,CAAC,IAAI,wBAAwB,SAAS,IAAI,EACxE,aAAa,EACb,YAAY,CACb,CAAA;AAEH,KAAK,UAAU,sBAAsB,CAAC,MAAc,EAAE,OAAgB;IACpE,MAAM,OAAO,GAAI,MAAM,CAAC,OAAO,CAAC,EAAe,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CACnE,oBAAoB,CAAC,MAAM,EAAE,YAAY,CAAC,CAC3C,CAAA;IACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7D,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;KACjD;IAED,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,OAAO,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE,CAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CACpE,CACF,CAAA;IAED,OAAO,0BAA0B,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAE,QAAmB,EAAE,EAAE,CACjE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;IAEhC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;AAE3B,KAAK,UAAU,YAAY,CACzB,MAAc,EACd,OAAgB;IAEhB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;IACzD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;KACjD;IAED,IAAI,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;QAIxC,OAAO,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC/C;SAAM;QAEL,OAAO,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;KAChD;AACH,CAAC;AAKD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,GAAG,CAC/B,MAAc,EACd,EAAE,UAAU,EAA0B;IAEtC,MAAM,EACJ,IAAI,EACJ,aAAa,EAAE,SAAS,EACxB,QAAQ,EAAE,UAAU,GACrB,GAAG,MAAM,CAAC,OAAO,CAAA;IAElB,MAAM,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IAClC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;QACxC,OAAO,mBAAmB,CACxB,mDAAmD,EACnD,aAAa,EACb,UAAU,CACX,CAAA;KACF;IAED,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IAC3C,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,yBAAyB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;KACzD;IAED,MAAM,aAAa,GAAG,UAAU;QAC9B,CAAC,CAAC,aAAa,UAAU,GAAG;QAC5B,CAAC,CAAC,2BAA2B,IAAI,aAAa,EAAE,GAAG,CAAA;IACrD,KAAK,CAAC,kCAAkC,EAAE,OAAO,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IAEpE,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEnD,OAAO,MAAM,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;AAChD,CAAC"}
|
|
@@ -8,9 +8,9 @@ const getIdent = async (ident, dispatch) => {
|
|
|
8
8
|
};
|
|
9
9
|
const isIdentGetable = (ident) => !!(ident?.id || ident?.withToken);
|
|
10
10
|
const completeIdent = (next) => async (action) => {
|
|
11
|
-
const
|
|
12
|
-
if (isIdentGetable(
|
|
13
|
-
const ident = await getIdent(
|
|
11
|
+
const originalIdent = action.meta?.ident;
|
|
12
|
+
if (isIdentGetable(originalIdent)) {
|
|
13
|
+
const ident = await getIdent(originalIdent, next);
|
|
14
14
|
return next({ ...action, meta: { ...action.meta, ident } });
|
|
15
15
|
}
|
|
16
16
|
else {
|
|
@@ -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;AAmBnC,MAAM,aAAa,GAAe,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;IAC3D,MAAM,
|
|
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;AAmBnC,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"}
|
|
@@ -8,7 +8,7 @@ const massageAccessObject = ({ actions, allow, role, ident, ...accessObject }) =
|
|
|
8
8
|
});
|
|
9
9
|
function getActionPrefix(action) {
|
|
10
10
|
const index = action.indexOf('_');
|
|
11
|
-
return index >= 0 ? action.
|
|
11
|
+
return index >= 0 ? action.slice(0, index) : action;
|
|
12
12
|
}
|
|
13
13
|
function ensureAccessObject(access) {
|
|
14
14
|
if (typeof access === 'string') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessForAction.js","sourceRoot":"","sources":["../../src/schema/accessForAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE,CACvC,MAAM,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAA;AAE5E,MAAM,mBAAmB,GAAG,CAAC,EAC3B,OAAO,EACP,KAAK,EACL,IAAI,EACJ,KAAK,EACL,GAAG,YAAY,EACL,EAAE,EAAE,CAAC,CAAC;IAChB,GAAG,YAAY;IACf,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/C,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CAC7C,CAAC,CAAA;AAEF,SAAS,eAAe,CAAC,MAAc;IACrC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IACjC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"accessForAction.js","sourceRoot":"","sources":["../../src/schema/accessForAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE,CACvC,MAAM,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAA;AAE5E,MAAM,mBAAmB,GAAG,CAAC,EAC3B,OAAO,EACP,KAAK,EACL,IAAI,EACJ,KAAK,EACL,GAAG,YAAY,EACL,EAAE,EAAE,CAAC,CAAC;IAChB,GAAG,YAAY;IACf,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/C,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CAC7C,CAAC,CAAA;AAEF,SAAS,eAAe,CAAC,MAAc;IACrC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IACjC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;AACrD,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAkC;IAC5D,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,OAAO,mBAAmB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;KAC9C;IACD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE;QACjD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;KACzE;IACD,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;AACtD,CAAC;AAED,MAAM,eAAe,GAAG,CAAC,MAAyB,EAAE,UAAmB,EAAE,EAAE,CACzE,OAAO,MAAM,EAAE,OAAO,KAAK,QAAQ;IACnC,MAAM,EAAE,OAAO,IAAI,IAAI;IACvB,OAAO,UAAU,KAAK,QAAQ;IAC5B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,IAAI,MAAM;IACvD,CAAC,CAAC,MAAM,CAAA;AAEZ,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,MAAyB,EACzB,UAAmB;IAEnB,OAAO,kBAAkB,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;AAChE,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Action, Ident } from '../../types.js';
|
|
2
|
+
import type { Access } from '../../schema/types.js';
|
|
2
3
|
import type Schema from '../../schema/Schema.js';
|
|
3
4
|
declare const authorizedByIntegreat: unique symbol;
|
|
4
5
|
export declare const isAuthorizedAction: (action: Action & {
|
|
@@ -22,5 +23,10 @@ export declare const setAuthorizedMark: (action: Action, isAuthorized?: boolean)
|
|
|
22
23
|
payload: import("../../types.js").Payload<unknown>;
|
|
23
24
|
response?: import("../../types.js").Response<unknown> | undefined;
|
|
24
25
|
};
|
|
26
|
+
export declare function validateRoleOrIdent(required?: string | string[], present?: string | string[]): boolean;
|
|
27
|
+
export declare function authorizeByRoleOrIdent(access: Access, ident?: Ident): {
|
|
28
|
+
reason: string;
|
|
29
|
+
error: string;
|
|
30
|
+
} | undefined;
|
|
25
31
|
declare const _default: (schemas: Map<string, Schema>, requireAuth: boolean) => (action: Action) => Action;
|
|
26
32
|
export default _default;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ensureArray } from '../../utils/array.js';
|
|
1
|
+
import { arrayIncludes, ensureArray, ensureArrayOrUndefined, } from '../../utils/array.js';
|
|
2
2
|
const authorizedByIntegreat = Symbol('authorizedByIntegreat');
|
|
3
3
|
export const isAuthorizedAction = (action) => action.meta && action.meta[authorizedByIntegreat];
|
|
4
4
|
export const setAuthorizedMark = (action, isAuthorized = true) => ({
|
|
@@ -17,7 +17,8 @@ function authorizeByAllow(allow, hasIdent = false) {
|
|
|
17
17
|
return 'ALLOW_NONE';
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
-
const
|
|
20
|
+
const hasFromFields = (access) => typeof access.identFromField === 'string' ||
|
|
21
|
+
typeof access.roleFromField === 'string';
|
|
21
22
|
const authMethods = [
|
|
22
23
|
'allow',
|
|
23
24
|
'ident',
|
|
@@ -28,6 +29,40 @@ const authMethods = [
|
|
|
28
29
|
const isAuthMethod = (method) => authMethods.includes(method);
|
|
29
30
|
const hasAuthMethod = (access) => Object.keys(access).filter(isAuthMethod).length > 0;
|
|
30
31
|
const createRequiredError = (items, itemName) => `Authentication was refused, ${itemName}${items.length > 1 ? 's' : ''} required: ${items.map((item) => `'${item}'`).join(', ')}`;
|
|
32
|
+
function authorizeByFromField(type, ident) {
|
|
33
|
+
if (ident) {
|
|
34
|
+
return undefined;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
return {
|
|
38
|
+
reason: 'NO_IDENT',
|
|
39
|
+
error: `Authentication was refused for type '${type}'`,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
export function validateRoleOrIdent(required, present) {
|
|
44
|
+
const rolesArr = ensureArray(required);
|
|
45
|
+
return (rolesArr.length > 0 &&
|
|
46
|
+
arrayIncludes(rolesArr, ensureArrayOrUndefined(present)));
|
|
47
|
+
}
|
|
48
|
+
export function authorizeByRoleOrIdent(access, ident) {
|
|
49
|
+
if ((!access.role && !access.ident) ||
|
|
50
|
+
validateRoleOrIdent(access.role, ident?.roles) ||
|
|
51
|
+
validateRoleOrIdent(access.ident, ident?.id)) {
|
|
52
|
+
return undefined;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
return access.ident
|
|
56
|
+
? {
|
|
57
|
+
reason: 'WRONG_IDENT',
|
|
58
|
+
error: createRequiredError(ensureArray(access.ident), 'ident'),
|
|
59
|
+
}
|
|
60
|
+
: {
|
|
61
|
+
reason: 'MISSING_ROLE',
|
|
62
|
+
error: createRequiredError(ensureArray(access.role), 'role'),
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
}
|
|
31
66
|
function authorizeByOneSchema(ident, schema, type, actionType, requireAuth) {
|
|
32
67
|
if (!schema) {
|
|
33
68
|
return {
|
|
@@ -49,29 +84,10 @@ function authorizeByOneSchema(ident, schema, type, actionType, requireAuth) {
|
|
|
49
84
|
error: `Authentication was refused for type '${type}'`,
|
|
50
85
|
};
|
|
51
86
|
}
|
|
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
|
-
};
|
|
87
|
+
if (hasFromFields(access)) {
|
|
88
|
+
return authorizeByFromField(type, ident);
|
|
73
89
|
}
|
|
74
|
-
return
|
|
90
|
+
return authorizeByRoleOrIdent(access, ident);
|
|
75
91
|
}
|
|
76
92
|
function authorizeBySchema(ident, schemas, actionTypes, action, requireAuth) {
|
|
77
93
|
for (const actionType of actionTypes) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authAction.js","sourceRoot":"","sources":["../../../src/service/utils/authAction.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"authAction.js","sourceRoot":"","sources":["../../../src/service/utils/authAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { validateRoleOrIdent } from './authAction.js';
|
|
1
2
|
import getField from '../../utils/getField.js';
|
|
2
3
|
import { arrayIncludes, filterAsync } from '../../utils/array.js';
|
|
3
4
|
import { isTypedData, isNullOrUndefined } from '../../utils/is.js';
|
|
@@ -6,6 +7,12 @@ async function getValueAndCompare(item, fieldPath, compareValue) {
|
|
|
6
7
|
const values = await getField(item, fieldPath);
|
|
7
8
|
return isStringOrArray(values) && arrayIncludes(compareValue, values);
|
|
8
9
|
}
|
|
10
|
+
const isIdentFromFieldOrIdentOk = async (item, field, present) => field && (await getValueAndCompare(item, field, present));
|
|
11
|
+
const isItemAuthorized = async (item, access, ident) => (!access.identFromField && !access.roleFromField) ||
|
|
12
|
+
validateRoleOrIdent(access.role, ident?.roles) ||
|
|
13
|
+
validateRoleOrIdent(access.ident, ident?.id) ||
|
|
14
|
+
(await isIdentFromFieldOrIdentOk(item, access.identFromField, ident?.id)) ||
|
|
15
|
+
(await isIdentFromFieldOrIdentOk(item, access.roleFromField, ident?.roles));
|
|
9
16
|
const authorizeItem = (schemas, actionType, allowRaw, ident) => async (item) => {
|
|
10
17
|
if (!isTypedData(item)) {
|
|
11
18
|
return allowRaw ? undefined : 'RAW_DATA';
|
|
@@ -14,22 +21,13 @@ const authorizeItem = (schemas, actionType, allowRaw, ident) => async (item) =>
|
|
|
14
21
|
if (!schema) {
|
|
15
22
|
return 'NO_SCHEMA';
|
|
16
23
|
}
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
const validateRole = typeof roleFromField === 'string';
|
|
20
|
-
if (!validateIdent && !validateRole) {
|
|
24
|
+
const access = schema.accessForAction(actionType);
|
|
25
|
+
if (await isItemAuthorized(item, access, ident)) {
|
|
21
26
|
return undefined;
|
|
22
27
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const roleResult = !validateRole ||
|
|
26
|
-
(await getValueAndCompare(item, roleFromField, ident?.roles));
|
|
27
|
-
if (validateIdent && validateRole && (identResult || roleResult)) {
|
|
28
|
-
return undefined;
|
|
28
|
+
else {
|
|
29
|
+
return access.identFromField ? 'WRONG_IDENT' : 'MISSING_ROLE';
|
|
29
30
|
}
|
|
30
|
-
return ((!identResult && 'WRONG_IDENT') ||
|
|
31
|
-
(!roleResult && 'MISSING_ROLE') ||
|
|
32
|
-
undefined);
|
|
33
31
|
};
|
|
34
32
|
const generateWarning = (removedCount, isToService) => removedCount > 0
|
|
35
33
|
? `${removedCount} item${removedCount === 1 ? ' was' : 's were'} removed from ${isToService ? 'request' : 'response'} data due to lack of access`
|
|
@@ -37,37 +35,37 @@ const generateWarning = (removedCount, isToService) => removedCount > 0
|
|
|
37
35
|
const generateErrorAndReason = (reason, data, isToService, service) => reason === 'RAW_DATA'
|
|
38
36
|
? `Authentication was refused for raw ${isToService ? 'request' : 'response'} data${service ? ` ${isToService ? 'to' : 'from'} service '${service}'` : ''}`
|
|
39
37
|
: `Authentication was refused for type '${data.$type}'${service ? ` on service '${service}'` : ''}`;
|
|
40
|
-
async function
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
};
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
61
|
-
return { data };
|
|
38
|
+
async function authorizeDataArrayAndWrapInResponse(data, authItemFn, isToService) {
|
|
39
|
+
const authed = await filterAsync(data, async (data) => (await authItemFn(data)) === undefined);
|
|
40
|
+
const warning = generateWarning(data.length - authed.length, isToService);
|
|
41
|
+
return { data: authed, warning };
|
|
42
|
+
}
|
|
43
|
+
async function authorizeDataItemAndWrapInResponse(data, authItemFn, isToService, service) {
|
|
44
|
+
if (!isNullOrUndefined(data)) {
|
|
45
|
+
const reason = await authItemFn(data);
|
|
46
|
+
if (typeof reason === 'string') {
|
|
47
|
+
const error = generateErrorAndReason(reason, data, isToService, service);
|
|
48
|
+
return {
|
|
49
|
+
data: undefined,
|
|
50
|
+
status: 'noaccess',
|
|
51
|
+
error,
|
|
52
|
+
reason,
|
|
53
|
+
origin: 'auth:data',
|
|
54
|
+
};
|
|
55
|
+
}
|
|
62
56
|
}
|
|
57
|
+
return { data };
|
|
63
58
|
}
|
|
59
|
+
const authorizeDataAndWrapInResponse = async (data, authItemFn, isToService, service) => Array.isArray(data)
|
|
60
|
+
? authorizeDataArrayAndWrapInResponse(data, authItemFn, isToService)
|
|
61
|
+
: authorizeDataItemAndWrapInResponse(data, authItemFn, isToService, service);
|
|
64
62
|
const isError = (status) => typeof status === 'string' && status !== 'ok';
|
|
65
63
|
const authorizeDataBase = (schemas, isToService) => async function authorizeData(action, allowRaw = false) {
|
|
66
64
|
if (action.meta?.ident?.root) {
|
|
67
65
|
return action;
|
|
68
66
|
}
|
|
69
67
|
const { type: actionType, payload: { targetService }, meta: { ident } = {}, } = action;
|
|
70
|
-
const { data, status: authedStatus, error, reason, warning, } = await
|
|
68
|
+
const { data, status: authedStatus, error, reason, warning, } = await authorizeDataAndWrapInResponse(isToService ? action.payload.data : action.response?.data, authorizeItem(schemas, actionType, allowRaw, ident), isToService, targetService);
|
|
71
69
|
const status = isError(action.response?.status) || !authedStatus
|
|
72
70
|
? action.response?.status
|
|
73
71
|
: authedStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authData.js","sourceRoot":"","sources":["../../../src/service/utils/authData.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,yBAAyB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"authData.js","sourceRoot":"","sources":["../../../src/service/utils/authData.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":"AAAA,OAAO,QAAQ,MAAM,OAAO,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAG5E,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;AAK/B,MAAM,UAAU,mBAAmB,CACjC,KAAc,EACd,MAAc,EACd,MAAM,GAAG,OAAO,EAChB,MAAe;IAEf,OAAO;QACL,MAAM;QACN,KAAK,EACH,KAAK,YAAY,KAAK;YACpB,CAAC,CAAC,KAAK,CAAC,OAAO;YACf,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ;gBAC3B,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,eAAe;QACrB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,IAAmC,EACnC,SAA6B,EAC7B,UAAkB;IAElB,MAAM,KAAK,GAAG,SAAS;QACrB,CAAC,CAAC,oBAAoB,SAAS,IAAI,WAAW,kBAAkB;QAChE,CAAC,CAAC,+BAA+B,IAAI,IAAI,WAAW,GAAG,CAAA;IACzD,KAAK,CAAC,GAAG,UAAU,KAAK,KAAK,EAAE,CAAC,CAAA;IAChC,OAAO,mBAAmB,CAAC,KAAK,EAAE,WAAW,UAAU,EAAE,CAAC,CAAA;AAC5D,CAAC;AAED,MAAM,iBAAiB,GAAG,CAAC,SAAqB,EAAE,EAAE,CAClD,SAAS;KACN,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;KAClC,MAAM,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;AAE7E,SAAS,iBAAiB,CAAC,SAAqB;IAC9C,MAAM,MAAM,GAAG,SAAS;SACrB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC;SACjE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;SAC3D,MAAM,CAAC,WAAW,CAAC,CAAA;IACtB,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AACtE,CAAC;AAED,MAAM,mBAAmB,GAAG,CAAC,SAAqB,EAAE,EAAE,CACpD,SAAS;KACN,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;KACnC,MAAM,CAAC,oBAAoB,CAAC;KAC5B,MAAM,CAAC,WAAW,CAAC;KACnB,IAAI,CAAC,KAAK,CAAC,CAAA;AAEhB,SAAS,kBAAkB,CAAC,SAAqB;IAC/C,MAAM,OAAO,GAAG,SAAS;SACtB,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;SAClC,MAAM,CAAC,oBAAoB,CAAC;SAC5B,MAAM,CAAC,WAAW,CAAC,CAAA;IACtB,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACtD,CAAC;AAKD,MAAM,UAAU,gBAAgB,CAAC,SAAqB;IACpD,
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,OAAO,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAG5E,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;AAK/B,MAAM,UAAU,mBAAmB,CACjC,KAAc,EACd,MAAc,EACd,MAAM,GAAG,OAAO,EAChB,MAAe;IAEf,OAAO;QACL,MAAM;QACN,KAAK,EACH,KAAK,YAAY,KAAK;YACpB,CAAC,CAAC,KAAK,CAAC,OAAO;YACf,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ;gBAC3B,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,eAAe;QACrB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,IAAmC,EACnC,SAA6B,EAC7B,UAAkB;IAElB,MAAM,KAAK,GAAG,SAAS;QACrB,CAAC,CAAC,oBAAoB,SAAS,IAAI,WAAW,kBAAkB;QAChE,CAAC,CAAC,+BAA+B,IAAI,IAAI,WAAW,GAAG,CAAA;IACzD,KAAK,CAAC,GAAG,UAAU,KAAK,KAAK,EAAE,CAAC,CAAA;IAChC,OAAO,mBAAmB,CAAC,KAAK,EAAE,WAAW,UAAU,EAAE,CAAC,CAAA;AAC5D,CAAC;AAED,MAAM,iBAAiB,GAAG,CAAC,SAAqB,EAAE,EAAE,CAClD,SAAS;KACN,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;KAClC,MAAM,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;AAE7E,SAAS,iBAAiB,CAAC,SAAqB;IAC9C,MAAM,MAAM,GAAG,SAAS;SACrB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC;SACjE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;SAC3D,MAAM,CAAC,WAAW,CAAC,CAAA;IACtB,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AACtE,CAAC;AAED,MAAM,mBAAmB,GAAG,CAAC,SAAqB,EAAE,EAAE,CACpD,SAAS;KACN,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;KACnC,MAAM,CAAC,oBAAoB,CAAC;KAC5B,MAAM,CAAC,WAAW,CAAC;KACnB,IAAI,CAAC,KAAK,CAAC,CAAA;AAEhB,SAAS,kBAAkB,CAAC,SAAqB;IAC/C,MAAM,OAAO,GAAG,SAAS;SACtB,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;SAClC,MAAM,CAAC,oBAAoB,CAAC;SAC5B,MAAM,CAAC,WAAW,CAAC,CAAA;IACtB,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACtD,CAAC;AAKD,MAAM,UAAU,gBAAgB,CAAC,SAAqB;IACpD,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAC5D,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,OAAO,aAAa,CAAC,CAAC,CAAC,CAAA;KACxB;SAAM;QACL,MAAM,MAAM,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAA;QAC/C,MAAM,KAAK,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAA;QAC9C,MAAM,OAAO,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAA;QAClD,MAAM,MAAM,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAA;QAChD,OAAO;YACL,MAAM;YACN,GAAG,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,CAAC;YACvB,GAAG,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,CAAC;YAC3B,GAAG,CAAC,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC;SAC1B,CAAA;KACF;AACH,CAAC;AAED,MAAM,cAAc,GAAG,CACrB,MAAc,EACd,cAAkC,EAClC,QAAiB,EACjB,EAAE,CACF,cAAc;IACZ,CAAC,CAAC,QAAQ;QACR,CAAC,CAAC,GAAG,MAAM,IAAI,cAAc,EAAE;QAC/B,CAAC,CAAC,cAAc;IAClB,CAAC,CAAC,MAAM,CAAA;AAQZ,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,QAAkB,EAClB,MAAc,EACd,QAAQ,GAAG,KAAK,EAChB,EAAE,CACF,QAAQ,CAAC,MAAM,KAAK,IAAI,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ;IACtD,CAAC,CAAC,QAAQ;IACV,CAAC,CAAC;QACE,GAAG,QAAQ;QACX,MAAM,EAAE,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;KAC1D,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.4",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"map-any": "^1.0.0",
|
|
49
49
|
"map-transform": "^1.0.4",
|
|
50
50
|
"ms": "^2.1.3",
|
|
51
|
-
"nanoid": "^
|
|
51
|
+
"nanoid": "^5.0.1",
|
|
52
52
|
"p-limit": "^4.0.0",
|
|
53
53
|
"p-pipe": "^4.0.0",
|
|
54
54
|
"p-progress": "^0.6.0",
|
|
@@ -59,9 +59,9 @@
|
|
|
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.
|
|
62
|
+
"integreat-transformers": "^1.0.1",
|
|
63
63
|
"integreat-transporter-http": "1.2.0",
|
|
64
64
|
"nock": "^13.3.3",
|
|
65
|
-
"sinon": "^
|
|
65
|
+
"sinon": "^16.0.0"
|
|
66
66
|
}
|
|
67
67
|
}
|