@resolveio/server-lib 5.2.24 → 5.2.25-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

@@ -189,16 +189,11 @@ var SubscriptionManager = /** @class */ (function () {
                         sub = that._subscriptions.filter(function (a) { return a.publication === publication && JSON.stringify(a.subscriptionData) === JSON.stringify(subscriptionData); })[0];
                         // If sub found (another user watching same data), add client to same sub
                         if (sub) {
-                            if (!sub.clients.some(function (a) { return a.id_user === ws['id_user'] && a.id_socket === ws['id_socket']; })) {
-                                sub.clients.push({
-                                    id_user: ws['id_user'],
-                                    messageId: messageId,
-                                    id_socket: ws['id_socket']
-                                });
-                            }
-                            else {
-                                // this._mainServer.getMethodManager().sendEmail('dev@resolveio.com', 'SERVER - Subscription Error Detected (Same socket and user) - ' + that.serverConfig['CLIENT_NAME'], 'Pub: ' + sub.publication + ', id_user: ' + ws['id_user']);
-                            }
+                            sub.clients.push({
+                                id_user: ws['id_user'],
+                                messageId: messageId,
+                                id_socket: ws['id_socket']
+                            });
                         }
                         // If sub not found, create new sub
                         else {

package/package.json

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