mandarina-server 2.8.4 → 2.9.0
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.
|
@@ -92,12 +92,12 @@ var CustomAction = /** @class */ (function () {
|
|
|
92
92
|
if (permissions.includes('nobody')) {
|
|
93
93
|
throw new Error('Action not allowed');
|
|
94
94
|
}
|
|
95
|
-
if (permissions.includes('everybody')
|
|
96
|
-
console.log(
|
|
95
|
+
if (!permissions.includes('everybody') && !permissions.some(function (p) { return roles.includes(p); })) {
|
|
96
|
+
console.log("***************", "Action \"".concat(action, "\" not allowed for this user"), "***************");
|
|
97
97
|
console.warn(user && user.id, action);
|
|
98
98
|
console.warn(user && user.roles, permissions);
|
|
99
|
-
console.log(
|
|
100
|
-
|
|
99
|
+
console.log("*****************************************************************************");
|
|
100
|
+
throw new Error("Action \"".concat(action, "\" not allowed for this user"));
|
|
101
101
|
}
|
|
102
102
|
return [4 /*yield*/, actions[action].action(_, args, context, info)];
|
|
103
103
|
case 2:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomAction.js","sourceRoot":"","sources":["../../src/Action/CustomAction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAwF;AACxF,yEAAsE;AACtE,iEAA8D;AAC9D,2DAAqC;AAIrC;IAaI;;;;;OAKG;IACH,sBAAY,MAAuB,EAAE,aAA4B;QAC7D,YAAY,CAAC,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI,EAAE,CAAC;QACtD,IAAI,MAAM,YAAY,eAAM,EAAE;YAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;YACpB,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;SACtD;aAAM;YACH,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;SACtB;QAED,IAAI,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACnC,MAAM,IAAI,qCAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1C;QACD,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;QACpC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC7C,CAAC;IAGM,wBAAW,GAAlB,UAAmB,IAAY;QAC3B,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAC/B,MAAM,IAAI,6CAAqB,CAAC,IAAI,CAAC,CAAC;SACzC;QAED,OAAO,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,gCAAS,GAAT;QACI,OAAO,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;IAClD,CAAC;IAGD,iCAAU,GAAV;QAAA,
|
|
1
|
+
{"version":3,"file":"CustomAction.js","sourceRoot":"","sources":["../../src/Action/CustomAction.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mandarina-server",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.9.0",
|
|
4
4
|
"description": "Mandarina for server side",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"@types/lodash": ">=4.14.192",
|
|
24
24
|
"@types/node": ">=12.0.10",
|
|
25
25
|
"lodash": ">=4.17.21",
|
|
26
|
-
"mandarina": "2.
|
|
26
|
+
"mandarina": "2.9.0",
|
|
27
27
|
"prisma-binding": ">=2.3.15"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"graphql-yoga": "^5.17.0",
|
|
34
34
|
"jest": "^30.2.0",
|
|
35
35
|
"ts-jest": "29.4.5",
|
|
36
|
-
"mandarina": "2.
|
|
36
|
+
"mandarina": "2.9.0",
|
|
37
37
|
"prisma-binding": "^2.3.15",
|
|
38
38
|
"typescript": "4.9.5"
|
|
39
39
|
},
|
|
@@ -67,12 +67,18 @@ export class CustomAction {
|
|
|
67
67
|
if (permissions.includes('nobody')){
|
|
68
68
|
throw new Error('Action not allowed')
|
|
69
69
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
70
|
+
if (!permissions.includes('everybody') && !permissions.some(p => roles.includes(p))) {
|
|
71
|
+
console.log(
|
|
72
|
+
"***************",
|
|
73
|
+
`Action "${action}" not allowed for this user`,
|
|
74
|
+
"***************"
|
|
75
|
+
);
|
|
76
|
+
console.warn(user && user.id, action);
|
|
77
|
+
console.warn(user && user.roles, permissions);
|
|
78
|
+
console.log(
|
|
79
|
+
"*****************************************************************************"
|
|
80
|
+
);
|
|
81
|
+
throw new Error(`Action "${action}" not allowed for this user`)
|
|
76
82
|
}
|
|
77
83
|
|
|
78
84
|
const result = await actions[action].action(_, args, context, info)
|