@resolveio/server-lib 5.2.35 → 5.2.36-newrole

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.
Files changed (8) hide show
  1. package/collections/user.collection.js +39 -32
  2. package/managers/subscription.manager.js +6 -0
  3. package/methods/accounts.js +2 -0
  4. package/methods/collections.js +87 -1
  5. package/methods/pdf.js +2 -0
  6. package/package.json +1 -1
  7. package/support-methods/collections.js +2 -0
  8. package/support-methods/support.js +13 -3
package/collections/user.collection.js CHANGED
@@ -22,13 +22,6 @@ var schema = {
22
22
  type: Date,
23
23
  optional: true
24
24
  },
25
- readonly: {
26
- type: Boolean,
27
- optional: true
28
- },
29
- active: {
30
- type: Boolean
31
- },
32
25
  attempts: {
33
26
  type: Number,
34
27
  optional: true
@@ -65,53 +58,67 @@ var schema = {
65
58
  type: String
66
59
  },
67
60
  roles: {
61
+ type: Object
62
+ },
63
+ 'roles.super_admin': {
64
+ type: Boolean
65
+ },
66
+ 'roles.approvals': {
68
67
  type: Array
69
68
  },
70
- 'roles.$': {
69
+ 'roles.approvals.$': {
70
+ type: Object
71
+ },
72
+ 'roles.approvals.$.name': {
71
73
  type: String
72
74
  },
73
- phonenumber: {
74
- type: String,
75
- optional: true
75
+ 'roles.approvals.$.type': {
76
+ type: String
76
77
  },
77
- other: {
78
- type: Object,
79
- blackbox: true,
80
- optional: true
78
+ 'roles.approvals.$.accounting_code': {
79
+ type: String
81
80
  },
82
- assets: {
83
- type: Array,
84
- optional: true
81
+ 'roles.groups': {
82
+ type: Array
85
83
  },
86
- 'assets.$': {
84
+ 'roles.groups.$': {
87
85
  type: Object
88
86
  },
89
- 'assets.$.type': {
87
+ 'roles.groups.$.name': {
90
88
  type: String
91
89
  },
92
- 'assets.$.id_asset': {
93
- type: String
90
+ 'roles.groups.$.views': {
91
+ type: Array
94
92
  },
95
- 'assets.$.asset_number': {
93
+ 'roles.groups.$.views.$': {
96
94
  type: String
97
95
  },
98
- 'assets.$.ownership': {
99
- type: String
96
+ 'roles.groups.$.yard': {
97
+ type: String,
98
+ optional: true
99
+ },
100
+ 'roles.notifications': {
101
+ type: Array
100
102
  },
101
- 'assets.$.ownership_driver': {
103
+ 'roles.notifications.$': {
102
104
  type: String
103
105
  },
104
- 'assets.$.date_start': {
105
- type: Date
106
+ 'roles.miscs': {
107
+ type: Array
106
108
  },
107
- 'assets.$.date_end': {
108
- type: Date,
109
- optional: true
109
+ 'roles.miscs.$': {
110
+ type: String
110
111
  },
111
- id_function: {
112
+ active: Boolean,
113
+ phonenumber: {
112
114
  type: String,
113
115
  optional: true
114
116
  },
117
+ other: {
118
+ type: Object,
119
+ optional: true,
120
+ blackbox: true
121
+ },
115
122
  customers: {
116
123
  type: Array,
117
124
  optional: true,
package/managers/subscription.manager.js CHANGED
@@ -127,6 +127,8 @@ var SubscriptionManager = /** @class */ (function () {
127
127
  }, 25);
128
128
  logged_in_users_collection_1.LoggedInUsers.find().then(function (loggedInUsers) {
129
129
  _this._loggedInUsers = loggedInUsers;
130
+ }, function (err) {
131
+ console.log(err);
130
132
  });
131
133
  setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
132
134
  var userCopy, i, loggedInUser;
@@ -439,6 +441,8 @@ var SubscriptionManager = /** @class */ (function () {
439
441
  var oplog = MongoOplog(that.serverConfig['OPLOG_URL']);
440
442
  oplog.tail().then(function () {
441
443
  console.log('tail started');
444
+ }, function (err) {
445
+ console.log(err);
442
446
  });
443
447
  oplog.on('insert', function (doc) {
444
448
  var nsArray = doc.ns.split('.');
@@ -511,6 +515,8 @@ var SubscriptionManager = /** @class */ (function () {
511
515
  var oplog = MongoOplog(that.serverConfig['RESOLVEIO_SUPPORT_OPLOG_URL']);
512
516
  oplog.tail().then(function () {
513
517
  console.log('tail started support');
518
+ }, function (err) {
519
+ console.log(err);
514
520
  });
515
521
  oplog.on('insert', function (doc) {
516
522
  var nsArray = doc.ns.split('.');
package/methods/accounts.js CHANGED
@@ -79,6 +79,8 @@ function loadAccountMethods(methodManager) {
79
79
  }
80
80
  }).then(function (val) {
81
81
  // console.log(val);
82
+ }, function (err) {
83
+ console.log(err);
82
84
  });
83
85
  resolve();
84
86
  return [2 /*return*/];
package/methods/collections.js CHANGED
@@ -198,7 +198,7 @@ function loadCollectionMethods(methodManager) {
198
198
  for (var i = 0; i < documents.length; i++) {
199
199
  _loop_1(i);
200
200
  }
201
- Promise.all(promises).then(function (vals) { return res(vals); });
201
+ Promise.all(promises).then(function (vals) { return res(vals); }, function (err) { return console.log(err); });
202
202
  });
203
203
  }
204
204
  },
@@ -256,9 +256,28 @@ function loadCollectionMethods(methodManager) {
256
256
  else {
257
257
  resolve(1);
258
258
  }
259
+ }, function (err) {
260
+ console.log(err);
259
261
  });
260
262
  }, function (err) {
261
263
  console.log(err);
264
+ index_1.ResolveIOServer.getMainDB().model(index_1.ResolveIOServer.getMainDB().model(collection)['versionCollection']).deleteMany({
265
+ $and: [
266
+ { '_id._id': currDoc._id },
267
+ { '_id.__v': { $lte: currDoc.__v - 4 } }
268
+ ]
269
+ }).exec().then(function () {
270
+ if (updates_1) {
271
+ index_1.ResolveIOServer.getMainDB().model(collection).updateOne({ _id: f_document['_id'] }, updates_1, { strict: false }).exec().then(function (res) {
272
+ resolve(res.nModified);
273
+ }, function (err) { return reject(err); });
274
+ }
275
+ else {
276
+ resolve(1);
277
+ }
278
+ }, function (err) {
279
+ console.log(err);
280
+ });
262
281
  });
263
282
  if (common_1.getBinarySize(JSON.stringify(f_document)) < 200000) {
264
283
  log_collection_1.Logs.create({
@@ -316,7 +335,11 @@ function loadCollectionMethods(methodManager) {
316
335
  ]
317
336
  }).exec().then(function () {
318
337
  resolve(res.nModified);
338
+ }, function (err) {
339
+ console.log(err);
319
340
  });
341
+ }, function (err) {
342
+ console.log(err);
320
343
  });
321
344
  }, function (err) { return reject(err); });
322
345
  }
@@ -400,9 +423,28 @@ function loadCollectionMethods(methodManager) {
400
423
  else {
401
424
  resolve(1);
402
425
  }
426
+ }, function (err) {
427
+ console.log(err);
403
428
  });
404
429
  }, function (err) {
405
430
  console.log(err);
431
+ index_1.ResolveIOServer.getMainDB().model(index_1.ResolveIOServer.getMainDB().model(collection)['versionCollection']).deleteMany({
432
+ $and: [
433
+ { '_id._id': currDoc._id },
434
+ { '_id.__v': { $lte: currDoc.__v - 4 } }
435
+ ]
436
+ }).exec().then(function () {
437
+ if (updates_2) {
438
+ index_1.ResolveIOServer.getMainDB().model(collection).updateOne({ _id: modifiedDoc_1._id }, updates_2, { strict: false }).exec().then(function (res) {
439
+ resolve(res.ok);
440
+ }, function (err) { return reject(err); });
441
+ }
442
+ else {
443
+ resolve(1);
444
+ }
445
+ }, function (err) {
446
+ console.log(err);
447
+ });
406
448
  });
407
449
  if (common_1.getBinarySize(JSON.stringify(updateParams)) < 200000) {
408
450
  log_collection_1.Logs.create({
@@ -460,6 +502,8 @@ function loadCollectionMethods(methodManager) {
460
502
  ]
461
503
  }).exec().then(function () {
462
504
  resolve(res.nModified);
505
+ }, function (err) {
506
+ console.log(err);
463
507
  });
464
508
  }, function (err) {
465
509
  console.log(err);
@@ -533,9 +577,28 @@ function loadCollectionMethods(methodManager) {
533
577
  else {
534
578
  resolve(1);
535
579
  }
580
+ }, function (err) {
581
+ console.log(err);
536
582
  });
537
583
  }, function (err) {
538
584
  console.log(err);
585
+ index_1.ResolveIOServer.getMainDB().model(index_1.ResolveIOServer.getMainDB().model(collection)['versionCollection']).deleteMany({
586
+ $and: [
587
+ { '_id._id': currDoc._id },
588
+ { '_id.__v': { $lte: currDoc.__v - 4 } }
589
+ ]
590
+ }).exec().then(function () {
591
+ if (updates_3) {
592
+ index_1.ResolveIOServer.getMainDB().model(collection).updateOne({ _id: f_document['_id'] }, updates_3, { strict: false }).exec().then(function (res) {
593
+ resolve(res.nModified);
594
+ }, function (err) { return reject(err); });
595
+ }
596
+ else {
597
+ resolve(1);
598
+ }
599
+ }, function (err) {
600
+ console.log(err);
601
+ });
539
602
  });
540
603
  if (common_1.getBinarySize(JSON.stringify(f_document)) < 200000) {
541
604
  log_collection_1.Logs.create({
@@ -587,6 +650,8 @@ function loadCollectionMethods(methodManager) {
587
650
  ]
588
651
  }).exec().then(function () {
589
652
  resolve(res.nModified);
653
+ }, function (err) {
654
+ console.log(err);
590
655
  });
591
656
  }, function (err) {
592
657
  console.log(err);
@@ -676,9 +741,28 @@ function loadCollectionMethods(methodManager) {
676
741
  else {
677
742
  resolve(1);
678
743
  }
744
+ }, function (err) {
745
+ console.log(err);
679
746
  });
680
747
  }, function (err) {
681
748
  console.log(err);
749
+ index_1.ResolveIOServer.getMainDB().model(index_1.ResolveIOServer.getMainDB().model(collection)['versionCollection']).deleteMany({
750
+ $and: [
751
+ { '_id._id': currDoc._id },
752
+ { '_id.__v': { $lte: currDoc.__v - 4 } }
753
+ ]
754
+ }).exec().then(function () {
755
+ if (updates_4) {
756
+ index_1.ResolveIOServer.getMainDB().model(collection).updateOne({ _id: modifiedDoc_2._id }, updates_4, { strict: false }).exec().then(function (res) {
757
+ resolve(res.ok);
758
+ }, function (err) { return reject(err); });
759
+ }
760
+ else {
761
+ resolve(1);
762
+ }
763
+ }, function (err) {
764
+ console.log(err);
765
+ });
682
766
  });
683
767
  if (common_1.getBinarySize(JSON.stringify(updateParams)) < 200000) {
684
768
  log_collection_1.Logs.create({
@@ -730,6 +814,8 @@ function loadCollectionMethods(methodManager) {
730
814
  ]
731
815
  }).exec().then(function () {
732
816
  resolve(res.nModified);
817
+ }, function (err) {
818
+ console.log(err);
733
819
  });
734
820
  }, function (err) {
735
821
  console.log(err);
package/methods/pdf.js CHANGED
@@ -109,6 +109,8 @@ function loadPDFMethods(methodManager) {
109
109
  reject('No tmp file');
110
110
  console.log('No tmp file ', tmpFileName);
111
111
  }
112
+ }, function (err) {
113
+ console.log(err);
112
114
  });
113
115
  }
114
116
  }, 1000);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@resolveio/server-lib",
3
- "version": "5.2.35",
3
+ "version": "5.2.36-newrole",
4
4
  "description": "",
5
5
  "main": "index.ts",
6
6
  "scripts": {
package/support-methods/collections.js CHANGED
@@ -234,6 +234,8 @@ function loadSupportCollectionMethods(supportManager) {
234
234
  ]
235
235
  }).exec();
236
236
  resolve(res.nModified);
237
+ }, function (err) {
238
+ console.log(err);
237
239
  });
238
240
  }, function (err) { return reject(err); });
239
241
  }
package/support-methods/support.js CHANGED
@@ -91,11 +91,15 @@ function loadSupportMethods(supportManager) {
91
91
  supportTicket['fileAttached'] = filesAttached;
92
92
  _this.sendEmail(supportTicket.client_user.email, 'ResolveIO - ' + supportTicket.support_ticket_number_string + ' Priority: ' + supportTicket.priority, '', template(supportTicket), filesAttached);
93
93
  }
94
+ }, function (err) {
95
+ console.log(err);
94
96
  });
95
97
  resolve(true);
96
98
  return [2 /*return*/];
97
99
  });
98
- }); });
100
+ }); }, function (err) {
101
+ console.log(err);
102
+ });
99
103
  resolve(true);
100
104
  }
101
105
  else {
@@ -167,11 +171,15 @@ function loadSupportMethods(supportManager) {
167
171
  supportTicket['fileAttached'] = filesAttached;
168
172
  _this.sendEmail(supportTicket.client_user.email, 'ResolveIO - ' + supportTicket.support_ticket_number_string + ' Priority: ' + supportTicket.priority, '', template(supportTicket), filesAttached);
169
173
  }
174
+ }, function (err) {
175
+ console.log(err);
170
176
  });
171
177
  resolve(true);
172
178
  return [2 /*return*/];
173
179
  });
174
- }); });
180
+ }); }, function (err) {
181
+ console.log(err);
182
+ });
175
183
  resolve(true);
176
184
  }
177
185
  else {
@@ -216,7 +224,9 @@ function loadSupportMethods(supportManager) {
216
224
  }
217
225
  return [2 /*return*/];
218
226
  });
219
- }); });
227
+ }); }, function (err) {
228
+ console.log(err);
229
+ });
220
230
  resolve(true);
221
231
  }
222
232
  else {