@resolveio/server-lib 4.5.1 → 4.5.2-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/fixtures/init.js

@@ -37,8 +37,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var app_version_collection_1 = require("../collections/app-version.collection");
 var logged_in_users_collection_1 = require("../collections/logged-in-users.collection");
-var active_subscription_collection_1 = require("../collections/active-subscription.collection");
 var mongoose_1 = require("mongoose");
+var active_subscription_collection_1 = require("../collections/active-subscription.collection");
 function loadServerInit() {
     return __awaiter(this, void 0, void 0, function () {
         var appVersion;

package/package.json

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

package/server-app.js

@@ -64,6 +64,7 @@ var ResolveIOMainServer = /** @class */ (function () {
     function ResolveIOMainServer(mainServer, serverConfig, clientDir) {
         this._msgQueue = [];
         this._msgQueueRunning = false;
+        console.log('Starting ResolveIO Server');
         this._resolveioServer = mainServer;
         this._serverConfig = serverConfig;
         this._clientDir = clientDir;
@@ -75,8 +76,10 @@ var ResolveIOMainServer = /** @class */ (function () {
         this._app.use(bodyParser.urlencoded({ limit: '5mb', extended: true }));
         // Set port
         this._port = process.env.PORT || serverConfig['PORT'];
+        console.log('Setup ports');
         // Create http server and websock server
         this.createServer();
+        console.log('Create server');
         // Set CORS
         this._app.use(function (req, res, next) {
             // Website you wish to allow to connect
@@ -93,9 +96,11 @@ var ResolveIOMainServer = /** @class */ (function () {
             // Pass to next layer of middleware
             next();
         });
+        console.log('Setup cors');
         // Set up http login route
         auth_1.setupAuthRoutes(this, this._app, serverConfig);
         health_1.setupHealthRoutes(this._app, serverConfig);
+        console.log('Setup express routes');
     }
     ResolveIOMainServer.prototype.getWS = function (id_ws) {
         var res = null;
@@ -140,6 +145,7 @@ var ResolveIOMainServer = /** @class */ (function () {
                 var infoData, token;
                 var _this = this;
                 return __generator(this, function (_a) {
+                    console.log('Verify Client', info, cb);
                     infoData = info.req.headers['sec-websocket-protocol'].split(/,/);
                     if (info.origin !== this._serverConfig['ROOT_URL'] && info.origin !== this._serverConfig['SEC_ROOT_URL'] && info.origin !== this._serverConfig['RESOLVEIO_URL'] && info.origin !== this._serverConfig['RESOLVEIO_SECONDARY_URL']) {
                         cb(false, 401, 'Unauthorized');
@@ -208,12 +214,14 @@ var ResolveIOMainServer = /** @class */ (function () {
             __setOptions.apply(this, arguments);
             return this;
         };
+        console.log('Start Managers');
         // Start Managers
         this._subscriptionManager = new subscription_manager_1.SubscriptionManager(this, this._wss, this._serverConfig);
         this._methodManager = new method_manager_1.MethodManager(this, this._serverConfig, this._clientDir);
         this._supportManager = new support_manager_1.SupportManager(this, this._serverConfig, this._clientDir);
         this._cronManager = new cron_manager_1.CronManager(this);
         this._queueManager = new queue_method_manager_1.QueueMethodManager(this);
+        console.log('End Managers');
         this.listen();
         mongoose.set('useFindAndModify', false);
         // mongoose.set('useCreateIndexes', true);
@@ -240,6 +248,7 @@ var ResolveIOMainServer = /** @class */ (function () {
             ws['user_readonly'] = req.user_readonly;
             ws['id_socket'] = uuid();
             ws['retryCnt'] = 0;
+            console.log('Connection from: ' + req.user);
             // Use for keeping connection alive (ping/pong)
             ws['isAlive'] = true;
             ws.on('pong', function () {
@@ -257,6 +266,7 @@ var ResolveIOMainServer = /** @class */ (function () {
                 var _a, _b, socketData, data, messageDate, messageId, type, subType, pub;
                 var _this = this;
                 return __generator(this, function (_c) {
+                    console.log('Message from: ' + ws['user'], message);
                     socketData = JSON.parse(message, common_1.dateReviver);
                     data = common_2.deepCopy(socketData);
                     if (data[0] === 'ping') {