mandarina-server 1.7.3 → 1.7.5

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.
@@ -80,7 +80,7 @@ var CustomAction = /** @class */ (function () {
80
80
  var result = {};
81
81
  Object.keys(actions).forEach(function (action) {
82
82
  result[action] = function (_, args, context, info) { return __awaiter(_this, void 0, void 0, function () {
83
- var user, roles, permissions;
83
+ var user, roles, permissions, result;
84
84
  return __generator(this, function (_a) {
85
85
  switch (_a.label) {
86
86
  case 0: return [4 /*yield*/, Mandarina_1.default.config.getUser(context)];
@@ -98,17 +98,18 @@ var CustomAction = /** @class */ (function () {
98
98
  console.log('*****************************************************************************');
99
99
  //throw new Error(`Action "${action}" not allowed for this user`)
100
100
  }
101
- if (!CustomAction.hook) return [3 /*break*/, 3];
101
+ return [4 /*yield*/, actions[action].action(_, args, context, info)];
102
+ case 2:
103
+ result = _a.sent();
104
+ context.result = result;
105
+ if (!CustomAction.hook) return [3 /*break*/, 4];
102
106
  context.schemaName = this.name;
103
107
  context.name = action;
104
108
  return [4 /*yield*/, CustomAction.hook(_, args, context, info)];
105
- case 2:
109
+ case 3:
106
110
  _a.sent();
107
- delete context.schemaName;
108
- delete context.name;
109
- _a.label = 3;
110
- case 3: return [4 /*yield*/, actions[action].action(_, args, context, info)];
111
- case 4: return [2 /*return*/, _a.sent()];
111
+ _a.label = 4;
112
+ case 4: return [2 /*return*/, result];
112
113
  }
113
114
  });
114
115
  }); };
@@ -1 +1 @@
1
- {"version":3,"file":"CustomAction.js","sourceRoot":"","sources":["../../src/Action/CustomAction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CustomAction.js","sourceRoot":"","sources":["../../src/Action/CustomAction.ts"],"names":[],"mappings":"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"}
@@ -28,7 +28,7 @@ export declare class Table {
28
28
  getDefaultActions(type: operationType): {
29
29
  [resolverName: string]: (_: any, args: any, context: Context, info: any) => void;
30
30
  };
31
- insertWhereIntoInfo: (info: GraphQLResolveInfo, user: UserType | null | undefined, isSingleMutation: boolean | undefined, action: ActionType, operationName: string) => {
31
+ insertWhereIntoInfo: (info: GraphQLResolveInfo, user: UserType | null | undefined, isSingleMutation: boolean | undefined, action: "read" | "create" | "update" | "delete", operationName: string) => {
32
32
  fields: string[];
33
33
  queryString: string;
34
34
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mandarina-server",
3
- "version": "1.7.3",
3
+ "version": "1.7.5",
4
4
  "description": "Mandarina for server side",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -74,15 +74,15 @@ export class CustomAction {
74
74
  console.log('*****************************************************************************')
75
75
  //throw new Error(`Action "${action}" not allowed for this user`)
76
76
  }
77
+
78
+ const result = await actions[action].action(_, args, context, info)
79
+ context.result = result
77
80
  if (CustomAction.hook) {
78
81
  context.schemaName= this.name
79
82
  context.name= action
80
83
  await CustomAction.hook(_, args, context, info)
81
- delete context.schemaName
82
- delete context.name
83
84
  }
84
- return await actions[action].action(_, args, context, info)
85
-
85
+ return result
86
86
  };
87
87
  });
88
88