@resolveio/server-lib 5.1.6 → 5.1.7-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 (4) hide show
  1. package/collections/user.collection.js +39 -32
  2. package/fixtures/init.js +1 -1
  3. package/managers/subscription.manager.js +6 -8
  4. package/package.json +1 -1
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/fixtures/init.js CHANGED
@@ -37,8 +37,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
37
37
  Object.defineProperty(exports, "__esModule", { value: true });
38
38
  var app_version_collection_1 = require("../collections/app-version.collection");
39
39
  var logged_in_users_collection_1 = require("../collections/logged-in-users.collection");
40
- var active_subscription_collection_1 = require("../collections/active-subscription.collection");
41
40
  var mongoose_1 = require("mongoose");
41
+ var active_subscription_collection_1 = require("../collections/active-subscription.collection");
42
42
  function loadServerInit() {
43
43
  return __awaiter(this, void 0, void 0, function () {
44
44
  var appVersion;
package/managers/subscription.manager.js CHANGED
@@ -507,7 +507,7 @@ var SubscriptionManager = /** @class */ (function () {
507
507
  var _this = this;
508
508
  var that = this;
509
509
  setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
510
- var uniqueOplog_1, uniquePubs, needIds_1, _loop_2, i, _loop_3, i, i, oplog, _loop_4, j, state_1;
510
+ var uniqueOplog_1, uniquePubs, needIds_1, _loop_2, i, _loop_3, i, i, oplog, _loop_4, j;
511
511
  var _this = this;
512
512
  return __generator(this, function (_a) {
513
513
  switch (_a.label) {
@@ -600,7 +600,7 @@ var SubscriptionManager = /** @class */ (function () {
600
600
  else {
601
601
  uniqueOplog_1.splice(i, 1);
602
602
  }
603
- return [2 /*return*/, "break"];
603
+ return [2 /*return*/, "continue"];
604
604
  }
605
605
  }
606
606
  if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 2];
@@ -616,7 +616,7 @@ var SubscriptionManager = /** @class */ (function () {
616
616
  else {
617
617
  uniqueOplog_1.splice(i, 1);
618
618
  }
619
- return [2 /*return*/, "break"];
619
+ return [2 /*return*/, "continue"];
620
620
  }
621
621
  return [3 /*break*/, 3];
622
622
  case 2:
@@ -629,7 +629,7 @@ var SubscriptionManager = /** @class */ (function () {
629
629
  else {
630
630
  uniqueOplog_1.splice(i, 1);
631
631
  }
632
- return [2 /*return*/, "break"];
632
+ return [2 /*return*/, "continue"];
633
633
  }
634
634
  }
635
635
  else {
@@ -640,7 +640,7 @@ var SubscriptionManager = /** @class */ (function () {
640
640
  else {
641
641
  uniqueOplog_1.splice(i, 1);
642
642
  }
643
- return [2 /*return*/, "break"];
643
+ return [2 /*return*/, "continue"];
644
644
  }
645
645
  _c.label = 3;
646
646
  case 3: return [2 /*return*/];
@@ -653,9 +653,7 @@ var SubscriptionManager = /** @class */ (function () {
653
653
  if (!(j < that._subscriptions.length)) return [3 /*break*/, 9];
654
654
  return [5 /*yield**/, _loop_4(j)];
655
655
  case 7:
656
- state_1 = _a.sent();
657
- if (state_1 === "break")
658
- return [3 /*break*/, 9];
656
+ _a.sent();
659
657
  _a.label = 8;
660
658
  case 8:
661
659
  j++;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@resolveio/server-lib",
3
- "version": "5.1.6",
3
+ "version": "5.1.7-newrole",
4
4
  "description": "",
5
5
  "main": "index.ts",
6
6
  "scripts": {