@resolveio/server-lib 5.2.28 → 5.2.29-newrole

package/collections/user.collection.js

@@ -22,13 +22,6 @@ var schema = {
         type: Date,
         optional: true
     },
-    readonly: {
-        type: Boolean,
-        optional: true
-    },
-    active: {
-        type: Boolean
-    },
     attempts: {
         type: Number,
         optional: true
@@ -65,53 +58,67 @@ var schema = {
         type: String
     },
     roles: {
+        type: Object
+    },
+    'roles.super_admin': {
+        type: Boolean
+    },
+    'roles.approvals': {
         type: Array
     },
-    'roles.$': {
+    'roles.approvals.$': {
+        type: Object
+    },
+    'roles.approvals.$.name': {
         type: String
     },
-    phonenumber: {
-        type: String,
-        optional: true
+    'roles.approvals.$.type': {
+        type: String
     },
-    other: {
-        type: Object,
-        blackbox: true,
-        optional: true
+    'roles.approvals.$.accounting_code': {
+        type: String
     },
-    assets: {
-        type: Array,
-        optional: true
+    'roles.groups': {
+        type: Array
     },
-    'assets.$': {
+    'roles.groups.$': {
         type: Object
     },
-    'assets.$.type': {
+    'roles.groups.$.name': {
         type: String
     },
-    'assets.$.id_asset': {
-        type: String
+    'roles.groups.$.views': {
+        type: Array
     },
-    'assets.$.asset_number': {
+    'roles.groups.$.views.$': {
         type: String
     },
-    'assets.$.ownership': {
-        type: String
+    'roles.groups.$.yard': {
+        type: String,
+        optional: true
+    },
+    'roles.notifications': {
+        type: Array
     },
-    'assets.$.ownership_driver': {
+    'roles.notifications.$': {
         type: String
     },
-    'assets.$.date_start': {
-        type: Date
+    'roles.miscs': {
+        type: Array
     },
-    'assets.$.date_end': {
-        type: Date,
-        optional: true
+    'roles.miscs.$': {
+        type: String
     },
-    id_function: {
+    active: Boolean,
+    phonenumber: {
         type: String,
         optional: true
     },
+    other: {
+        type: Object,
+        optional: true,
+        blackbox: true
+    },
     customers: {
         type: Array,
         optional: true,

package/managers/subscription.manager.js

@@ -128,15 +128,38 @@ var SubscriptionManager = /** @class */ (function () {
         logged_in_users_collection_1.LoggedInUsers.find().then(function (loggedInUsers) {
             _this._loggedInUsers = loggedInUsers;
         });
-        setInterval(function () {
-            var userCopy = common_1.deepCopy(_this._loggedInUsers);
-            for (var i = _this._loggedInUsers.length - 1; i >= 0; i--) {
-                var loggedInUser = userCopy[i];
-                if (!loggedInUser.updatedAt || moment().diff(moment(loggedInUser.updatedAt), 'minutes', true) > 1) {
-                    _this.unsubscribeAll(_this._mainServer.getWS(loggedInUser.id_ws));
+        setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
+            var userCopy, i, loggedInUser;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        userCopy = common_1.deepCopy(this._loggedInUsers);
+                        i = this._loggedInUsers.length - 1;
+                        _a.label = 1;
+                    case 1:
+                        if (!(i >= 0)) return [3 /*break*/, 7];
+                        loggedInUser = userCopy[i];
+                        if (!(!loggedInUser.updatedAt || moment().diff(moment(loggedInUser.updatedAt), 'minutes', true) > 1)) return [3 /*break*/, 6];
+                        if (!this._mainServer.getWS(loggedInUser.id_ws)) return [3 /*break*/, 2];
+                        this.unsubscribeAll(this._mainServer.getWS(loggedInUser.id_ws));
+                        return [3 /*break*/, 6];
+                    case 2: return [4 /*yield*/, logged_in_users_collection_1.LoggedInUsers.findById(loggedInUser._id)];
+                    case 3:
+                        if (!_a.sent()) return [3 /*break*/, 5];
+                        return [4 /*yield*/, logged_in_users_collection_1.LoggedInUsers.deleteOne({ _id: loggedInUser._id }).exec()];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5:
+                        this._loggedInUsers.splice(i, 1);
+                        _a.label = 6;
+                    case 6:
+                        i--;
+                        return [3 /*break*/, 1];
+                    case 7: return [2 /*return*/];
                 }
-            }
-        }, 60000);
+            });
+        }); }, 60000);
     }
     // Add all files to publications private object
     SubscriptionManager.prototype.publications = function (method) {
@@ -351,7 +374,6 @@ var SubscriptionManager = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         that = this;
-                        if (!ws) return [3 /*break*/, 3];
                         return [4 /*yield*/, logged_in_users_collection_1.LoggedInUsers.findOne({ id_ws: ws['id_socket'] })];
                     case 1:
                         loggedInUser = _a.sent();
@@ -395,8 +417,7 @@ var SubscriptionManager = /** @class */ (function () {
                             }
                         });
                         ws.terminate();
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "5.2.28",
+  "version": "5.2.29-newrole",
   "description": "",
   "main": "index.ts",
   "scripts": {