@sdflc/backend-helpers 1.0.31 → 1.0.32

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.
@@ -50,6 +50,7 @@ declare class BaseCore {
50
50
  * @returns Object with the jwtSecret and verifyTokenArgs
51
51
  */
52
52
  getJwtTokenSecretAndSettings(params: any): Promise<JwtTokenSecretAndSettings>;
53
+ findSpace(): Promise<any[]>;
53
54
  authenticate(params: any, opt?: BaseCoreActionsInterface): Promise<any[]>;
54
55
  }
55
56
  export { BaseCore };
package/build/BaseCore.js CHANGED
@@ -164,9 +164,9 @@ var BaseCore = /** @class */ (function () {
164
164
  };
165
165
  BaseCore.prototype.runAction = function (opt) {
166
166
  return __awaiter(this, void 0, void 0, function () {
167
- var _a, args, validate, doAuth, action, hasTransaction, doingWhat, sameRequest, step, setStep, actionOpt, _b, authResult, errMsg, validatedItems, valideResult, result_1, result, ex_1, what;
168
- return __generator(this, function (_c) {
169
- switch (_c.label) {
167
+ var _a, args, validate, doAuth, action, hasTransaction, doingWhat, sameRequest, step, setStep, actionOpt, _b, authResult, errMsg, _c, spaceResult, errMsg, validatedItems, valideResult, result_1, result, ex_1, what;
168
+ return __generator(this, function (_d) {
169
+ switch (_d.label) {
170
170
  case 0:
171
171
  _a = opt || {}, args = _a.args, validate = _a.validate, doAuth = _a.doAuth, action = _a.action, hasTransaction = _a.hasTransaction, doingWhat = _a.doingWhat;
172
172
  sameRequest = !!this.config.context.requestId && (args === null || args === void 0 ? void 0 : args.requestId) === this.config.context.requestId;
@@ -180,30 +180,37 @@ var BaseCore = /** @class */ (function () {
180
180
  sameRequest: sameRequest,
181
181
  hasTransaction: hasTransaction,
182
182
  };
183
- _c.label = 1;
183
+ _d.label = 1;
184
184
  case 1:
185
- _c.trys.push([1, 11, , 15]);
186
- if (!!sameRequest) return [3 /*break*/, 5];
185
+ _d.trys.push([1, 13, , 17]);
186
+ if (!!sameRequest) return [3 /*break*/, 7];
187
187
  if (!hasTransaction) return [3 /*break*/, 3];
188
188
  return [4 /*yield*/, this.getDb().startTransaction()];
189
189
  case 2:
190
- _c.sent();
191
- _c.label = 3;
190
+ _d.sent();
191
+ _d.label = 3;
192
192
  case 3:
193
193
  if (!(doAuth === true || (doAuth == null && this.config.doAuth))) return [3 /*break*/, 5];
194
194
  return [4 /*yield*/, this.authenticate(opt, actionOpt)];
195
195
  case 4:
196
- _b = _c.sent(), authResult = _b[0], errMsg = _b[1];
196
+ _b = _d.sent(), authResult = _b[0], errMsg = _b[1];
197
197
  if (!authResult) {
198
198
  return [2 /*return*/, new api_helpers_1.OpResult({ code: api_helpers_1.OP_RESULT_CODES.UNAUTHORIZED }).addError('', errMsg)];
199
199
  }
200
- _c.label = 5;
201
- case 5:
200
+ return [3 /*break*/, 7];
201
+ case 5: return [4 /*yield*/, this.findSpace()];
202
+ case 6:
203
+ _c = _d.sent(), spaceResult = _c[0], errMsg = _c[1];
204
+ if (spaceResult !== true) {
205
+ return [2 /*return*/, new api_helpers_1.OpResult({ code: api_helpers_1.OP_RESULT_CODES.UNAUTHORIZED }).addError('', errMsg)];
206
+ }
207
+ _d.label = 7;
208
+ case 7:
202
209
  validatedItems = {};
203
- if (!(typeof validate === 'function')) return [3 /*break*/, 8];
210
+ if (!(typeof validate === 'function')) return [3 /*break*/, 10];
204
211
  return [4 /*yield*/, validate(args, actionOpt)];
205
- case 6:
206
- valideResult = _c.sent();
212
+ case 8:
213
+ valideResult = _d.sent();
207
214
  result_1 = valideResult;
208
215
  if (Array.isArray(valideResult)) {
209
216
  result_1 = valideResult[0];
@@ -211,30 +218,30 @@ var BaseCore = /** @class */ (function () {
211
218
  }
212
219
  // If validator returned null then consider the validation passed
213
220
  result_1 = result_1 != null ? result_1 : true;
214
- if (!(result_1 !== true)) return [3 /*break*/, 8];
221
+ if (!(result_1 !== true)) return [3 /*break*/, 10];
215
222
  // if there was an error then `result` is expected to be an object with the same structure as the checkit library does
216
223
  return [4 /*yield*/, this.checkResult({ hasTransaction: hasTransaction, result: result_1, sameRequest: sameRequest })];
217
- case 7:
224
+ case 9:
218
225
  // if there was an error then `result` is expected to be an object with the same structure as the checkit library does
219
- _c.sent();
226
+ _d.sent();
220
227
  return [2 /*return*/, result_1.code != null ? result_1 : new api_helpers_1.OpResult({ code: api_helpers_1.OP_RESULT_CODES.VALIDATION_FAILED })];
221
- case 8: return [4 /*yield*/, action(args, __assign(__assign({}, actionOpt), { validatedItems: validatedItems }))];
222
- case 9:
223
- result = _c.sent();
228
+ case 10: return [4 /*yield*/, action(args, __assign(__assign({}, actionOpt), { validatedItems: validatedItems }))];
229
+ case 11:
230
+ result = _d.sent();
224
231
  return [4 /*yield*/, this.checkResult({ hasTransaction: hasTransaction, result: result, sameRequest: sameRequest })];
225
- case 10:
226
- _c.sent();
232
+ case 12:
233
+ _d.sent();
227
234
  return [2 /*return*/, result];
228
- case 11:
229
- ex_1 = _c.sent();
230
- if (!(!sameRequest && hasTransaction)) return [3 /*break*/, 13];
235
+ case 13:
236
+ ex_1 = _d.sent();
237
+ if (!(!sameRequest && hasTransaction)) return [3 /*break*/, 15];
231
238
  return [4 /*yield*/, this.getDb().rollbackTransaction()];
232
- case 12:
233
- _c.sent();
234
- _c.label = 13;
235
- case 13: return [4 /*yield*/, this.onException(args, __assign(__assign({}, actionOpt), { doingWhat: doingWhat, exception: ex_1 }))];
236
239
  case 14:
237
- _c.sent();
240
+ _d.sent();
241
+ _d.label = 15;
242
+ case 15: return [4 /*yield*/, this.onException(args, __assign(__assign({}, actionOpt), { doingWhat: doingWhat, exception: ex_1 }))];
243
+ case 16:
244
+ _d.sent();
238
245
  what = doingWhat;
239
246
  if (doingWhat !== step) {
240
247
  what = {
@@ -242,7 +249,7 @@ var BaseCore = /** @class */ (function () {
242
249
  };
243
250
  }
244
251
  return [2 /*return*/, this.exceptionFailure(ex_1, what)];
245
- case 15: return [2 /*return*/];
252
+ case 17: return [2 /*return*/];
246
253
  }
247
254
  });
248
255
  });
@@ -738,32 +745,49 @@ var BaseCore = /** @class */ (function () {
738
745
  });
739
746
  });
740
747
  };
741
- BaseCore.prototype.authenticate = function (params, opt) {
748
+ BaseCore.prototype.findSpace = function () {
742
749
  return __awaiter(this, void 0, void 0, function () {
743
- var context, space, authByToken, _a, jwtSecret, verifyTokenArgs, verifyResult, token;
744
- return __generator(this, function (_b) {
745
- switch (_b.label) {
750
+ var context, space;
751
+ return __generator(this, function (_a) {
752
+ switch (_a.label) {
746
753
  case 0:
747
754
  context = this.config.context;
748
755
  space = null;
749
- if (!this.config.spaceGw) return [3 /*break*/, 2];
756
+ if (!context.spaceGw) return [3 /*break*/, 2];
750
757
  if (!context.spaceId) {
751
758
  return [2 /*return*/, [false, 'Space not specified']];
752
759
  }
753
- return [4 /*yield*/, this.config.spaceGw.get(context.spaceId || '')];
760
+ return [4 /*yield*/, context.spaceGw.get(context.spaceId || '')];
754
761
  case 1:
755
762
  // Lookup space in case we have gateway
756
- space = _b.sent();
763
+ space = _a.sent();
757
764
  if (!space) {
758
765
  return [2 /*return*/, [false, 'Space not found']];
759
766
  }
760
767
  context.space = space;
761
- _b.label = 2;
762
- case 2:
768
+ _a.label = 2;
769
+ case 2: return [2 /*return*/, [true, space]];
770
+ }
771
+ });
772
+ });
773
+ };
774
+ BaseCore.prototype.authenticate = function (params, opt) {
775
+ return __awaiter(this, void 0, void 0, function () {
776
+ var context, authByToken, _a, spaceResult, space, _b, jwtSecret, verifyTokenArgs, verifyResult, token;
777
+ return __generator(this, function (_c) {
778
+ switch (_c.label) {
779
+ case 0:
780
+ context = this.config.context;
763
781
  authByToken = false;
782
+ return [4 /*yield*/, this.findSpace()];
783
+ case 1:
784
+ _a = _c.sent(), spaceResult = _a[0], space = _a[1];
785
+ if (spaceResult !== true) {
786
+ return [2 /*return*/, spaceResult];
787
+ }
764
788
  return [4 /*yield*/, this.getJwtTokenSecretAndSettings(params)];
765
- case 3:
766
- _a = _b.sent(), jwtSecret = _a.jwtSecret, verifyTokenArgs = _a.verifyTokenArgs;
789
+ case 2:
790
+ _b = _c.sent(), jwtSecret = _b.jwtSecret, verifyTokenArgs = _b.verifyTokenArgs;
767
791
  if (context.authorization && jwtSecret) {
768
792
  verifyResult = (0, userToken_1.verifyUserToken)(context.authorization, jwtSecret, verifyTokenArgs);
769
793
  if (verifyResult.didFail()) {
@@ -65,6 +65,9 @@ var BaseGateway = /** @class */ (function () {
65
65
  this.config = props;
66
66
  this.config.returnFields =
67
67
  Array.isArray(this.config.returnFields) && this.config.returnFields.length > 0 ? this.config.returnFields : ['*'];
68
+ this.config.activeStatuses = Array.isArray(this.config.activeStatuses)
69
+ ? this.config.activeStatuses
70
+ : [utils_1.STATUSES.ACTIVE];
68
71
  this.loader = typeof this.config.loader === 'function' ? this.config.loader : new DataCache_1.DataCache(this.config);
69
72
  }
70
73
  BaseGateway.prototype.setConfigPart = function (props) {
@@ -91,10 +94,12 @@ var BaseGateway = /** @class */ (function () {
91
94
  if (hasRemovedAt) {
92
95
  query.whereNull(constants_1.FIELDS.REMOVED_AT);
93
96
  }
94
- if (hasSpace) {
95
- query.where((_b = {}, _b[constants_1.FIELDS.SPACE_ID] = filterParams === null || filterParams === void 0 ? void 0 : filterParams[constants_1.FIELDS.SPACE_ID], _b));
97
+ if (hasSpace && ((filterParams === null || filterParams === void 0 ? void 0 : filterParams[constants_1.FIELDS.SPACE_ID]) != undefined || this.config.context.spaceId)) {
98
+ query.where((_b = {},
99
+ _b[constants_1.FIELDS.SPACE_ID] = (filterParams === null || filterParams === void 0 ? void 0 : filterParams[constants_1.FIELDS.SPACE_ID]) != undefined ? filterParams === null || filterParams === void 0 ? void 0 : filterParams[constants_1.FIELDS.SPACE_ID] : this.config.context.spaceId,
100
+ _b));
96
101
  }
97
- if (hasLang && (filterParams === null || filterParams === void 0 ? void 0 : filterParams[constants_1.FIELDS.LANG])) {
102
+ if (hasLang && (filterParams === null || filterParams === void 0 ? void 0 : filterParams[constants_1.FIELDS.LANG]) != undefined) {
98
103
  query.whereIn(constants_1.FIELDS.LANG, (0, lodash_1.castArray)(filterParams === null || filterParams === void 0 ? void 0 : filterParams[constants_1.FIELDS.LANG]));
99
104
  }
100
105
  if (filterParams === null || filterParams === void 0 ? void 0 : filterParams[this.getIdField()]) {
@@ -54,9 +54,13 @@ exports.DataCache = void 0;
54
54
  var dataloader_1 = __importDefault(require("dataloader"));
55
55
  var redis_dataloader_1 = __importDefault(require("redis-dataloader"));
56
56
  var utils_1 = require("@sdflc/utils");
57
+ var _1 = require(".");
57
58
  var DataCache = /** @class */ (function () {
58
59
  function DataCache(props) {
59
60
  var _a = props || {}, loaderFn = _a.loaderFn, keyPrefix = _a.keyPrefix, context = _a.context, buildKey = _a.buildKey, redisClient = _a.redisClient, table = _a.table;
61
+ if (!(props === null || props === void 0 ? void 0 : props.idField)) {
62
+ props.idField = _1.FIELDS.ID;
63
+ }
60
64
  this.config = props;
61
65
  this.buildKey = typeof buildKey === 'function' ? buildKey : utils_1.buildKey;
62
66
  this.batchLoaderDefault = this.batchLoaderDefault.bind(this);
@@ -91,11 +91,11 @@ var createApiContext = function (args) { return __awaiter(void 0, void 0, void 0
91
91
  req: req,
92
92
  };
93
93
  context.cores = Object.keys(cores || {}).reduce(function (acc, key) {
94
- acc[(0, lodash_1.camelCase)(key)] = new cores[key](__assign(__assign({}, coreContext), { context: context }));
94
+ acc[(0, lodash_1.camelCase)(key)] = new cores[key](__assign(__assign({}, coreContext), { context: __assign(__assign({}, context), ((coreContext === null || coreContext === void 0 ? void 0 : coreContext.context) || {})) }));
95
95
  return acc;
96
96
  }, {});
97
97
  context.gateways = Object.keys(gateways || {}).reduce(function (acc, key) {
98
- acc[(0, lodash_1.camelCase)(key)] = new gateways[key](__assign(__assign({}, gatewayContext), { context: context }));
98
+ acc[(0, lodash_1.camelCase)(key)] = new gateways[key](__assign(__assign({}, gatewayContext), { context: __assign(__assign({}, context), ((gatewayContext === null || gatewayContext === void 0 ? void 0 : gatewayContext.context) || {})) }));
99
99
  return acc;
100
100
  }, {});
101
101
  if (!(typeof extendContext === 'function')) return [3 /*break*/, 8];
@@ -161,6 +161,7 @@ var createContextDefault = function (args) { return __awaiter(void 0, void 0, vo
161
161
  extendContext: function (_a) {
162
162
  var context = _a.context, req = _a.req;
163
163
  context.db = db;
164
+ Object.assign(context, sharedContext);
164
165
  if (typeof extendContext === 'function') {
165
166
  extendContext({ context: context, req: req });
166
167
  }
@@ -176,7 +177,7 @@ var createContextDefault = function (args) { return __awaiter(void 0, void 0, vo
176
177
  case 1:
177
178
  extendCoreConext = _a.sent();
178
179
  _a.label = 2;
179
- case 2: return [2 /*return*/, __assign(__assign({ db: db, gatewayName: '', isProduction: isProduction, logger: logger, doAuth: doAuth, spaceGw: spaceGw, interserviceApiKey: interserviceApiKey, jwtSecret: jwtSecret, verifyTokenArgs: verifyTokenArgs }, (0, lodash_1.omit)(extendCoreConext, ['context'])), { context: __assign(__assign({}, sharedContext), (extendCoreConext.context || {})) })];
180
+ case 2: return [2 /*return*/, __assign({ db: db, gatewayName: '', isProduction: isProduction, logger: logger, doAuth: doAuth, spaceGw: spaceGw, interserviceApiKey: interserviceApiKey, jwtSecret: jwtSecret, verifyTokenArgs: verifyTokenArgs }, (extendCoreConext.context || {}))];
180
181
  }
181
182
  });
182
183
  }); },
@@ -191,12 +192,7 @@ var createContextDefault = function (args) { return __awaiter(void 0, void 0, vo
191
192
  case 1:
192
193
  extendGatewayConext = _a.sent();
193
194
  _a.label = 2;
194
- case 2: return [2 /*return*/, {
195
- db: db,
196
- isProduction: isProduction,
197
- logger: logger,
198
- context: __assign(__assign({}, sharedContext), (extendGatewayConext.context || {})),
199
- }];
195
+ case 2: return [2 /*return*/, __assign({ db: db, isProduction: isProduction, logger: logger }, (extendGatewayConext.context || {}))];
200
196
  }
201
197
  });
202
198
  }); },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sdflc/backend-helpers",
3
- "version": "1.0.31",
3
+ "version": "1.0.32",
4
4
  "description": "Set of helper functions and classes to simplify building backend apps within @sdflc ecosystem",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",