mandarina-server 1.3.4 → 1.5.1
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.
|
@@ -87,18 +87,20 @@ var CustomAction = /** @class */ (function () {
|
|
|
87
87
|
case 1:
|
|
88
88
|
user = _a.sent();
|
|
89
89
|
roles = (user && user.roles) || [];
|
|
90
|
-
if (roles.includes('nobody')) {
|
|
91
|
-
throw new Error('Action not allowed');
|
|
92
|
-
}
|
|
93
90
|
permissions = actions[action].permission || [];
|
|
94
|
-
if (permissions.includes('
|
|
95
|
-
|
|
96
|
-
console.warn(user && user.id, action);
|
|
97
|
-
console.warn(user && user.roles, permissions);
|
|
98
|
-
console.log('***************222***************');
|
|
99
|
-
// return await actions[action].action(_, args, context, info)
|
|
91
|
+
if (permissions.includes('nobody')) {
|
|
92
|
+
throw new Error('Action not allowed');
|
|
100
93
|
}
|
|
101
|
-
|
|
94
|
+
if (!(permissions.includes('everybody') || permissions.some(function (permission) { return roles.includes(permission); }))) return [3 /*break*/, 3];
|
|
95
|
+
console.log('***************111***************');
|
|
96
|
+
console.warn(user && user.id, action);
|
|
97
|
+
console.warn(user && user.roles, permissions);
|
|
98
|
+
console.log('***************222***************');
|
|
99
|
+
return [4 /*yield*/, actions[action].action(_, args, context, info)];
|
|
100
|
+
case 2:
|
|
101
|
+
//throw new Error(`Action "${action}" not allowed for this user`)
|
|
102
|
+
return [2 /*return*/, _a.sent()];
|
|
103
|
+
case 3: return [2 /*return*/];
|
|
102
104
|
}
|
|
103
105
|
});
|
|
104
106
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomAction.js","sourceRoot":"","sources":["../../src/Action/CustomAction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA4E;AAC5E,yEAAsE;AACtE,iEAA8D;AAG9D,2DAAqC;AAIrC;IAUI;;;;;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/build/Table/Table.d.ts
CHANGED
|
@@ -26,7 +26,7 @@ export declare class Table {
|
|
|
26
26
|
getDefaultActions(type: operationType): {
|
|
27
27
|
[resolverName: string]: (_: any, args: any, context: Context, info: any) => void;
|
|
28
28
|
};
|
|
29
|
-
insertWhereIntoInfo: (info: GraphQLResolveInfo, user: UserType | null | undefined, isSingleMutation: boolean | undefined, action:
|
|
29
|
+
insertWhereIntoInfo: (info: GraphQLResolveInfo, user: UserType | null | undefined, isSingleMutation: boolean | undefined, action: "update" | "read" | "create" | "delete", operationName: string) => {
|
|
30
30
|
fields: string[];
|
|
31
31
|
query: any;
|
|
32
32
|
queryString: string;
|
package/package.json
CHANGED
|
@@ -61,19 +61,20 @@ export class CustomAction {
|
|
|
61
61
|
result[action] = async (_: any, args: any, context: any, info: any): Promise<any> => {
|
|
62
62
|
const user = await Mandarina.config.getUser(context)
|
|
63
63
|
const roles=(user && user.roles ) || []
|
|
64
|
-
|
|
64
|
+
|
|
65
|
+
const permissions: string[]= actions[action].permission || []
|
|
66
|
+
if (permissions.includes('nobody')){
|
|
65
67
|
throw new Error('Action not allowed')
|
|
66
68
|
}
|
|
67
|
-
const permissions: string[]= actions[action].permission || []
|
|
68
69
|
if (permissions.includes('everybody') || permissions.some(permission=>roles.includes(permission))){
|
|
69
70
|
console.log('***************111***************')
|
|
70
71
|
console.warn(user && user.id,action)
|
|
71
72
|
console.warn(user && user.roles,permissions)
|
|
72
73
|
console.log('***************222***************')
|
|
74
|
+
//throw new Error(`Action "${action}" not allowed for this user`)
|
|
73
75
|
|
|
74
|
-
|
|
76
|
+
return await actions[action].action(_, args, context, info)
|
|
75
77
|
}
|
|
76
|
-
throw new Error(`Action "${action}" not allowed for this user`)
|
|
77
78
|
};
|
|
78
79
|
});
|
|
79
80
|
|