@resolveio/server-lib 2.0.0 → 2.0.1-newrole

package/collections/queue-flag.collection.js

@@ -26,7 +26,7 @@ var DefaultSchema = new mongoose_1.Schema(schema, {
     versionKey: false,
     timestamps: true
 });
-DefaultSchema.index({ createdAt: 1 }, { expireAfterSeconds: 15 });
+DefaultSchema.index({ createdAt: 1 }, { expireAfterSeconds: 60 });
 exports.QueueFlags = index_1.ResolveIOServer.getMainDB().model('queue-flags', DefaultSchema);
 exports.QueueFlags['simplschema'] = new simpl_schema_1.default(schema);
 schema._id = {

package/collections/user.collection.js

@@ -21,13 +21,6 @@ var schema = {
         type: Date,
         optional: true
     },
-    readonly: {
-        type: Boolean,
-        optional: true
-    },
-    active: {
-        type: Boolean
-    },
     attempts: {
         type: Number,
         optional: true
@@ -64,60 +57,73 @@ 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
     },
-    'assets.$.ownership_driver': {
+    'roles.notifications': {
+        type: Array
+    },
+    '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,
+    id_customer: {
         type: String,
         optional: true
     },
     customer: {
         type: String,
-        optional: true,
+        optional: true
     },
-    id_customer: {
+    customer_type: {
         type: String,
-        optional: true,
+        optional: true
+    },
+    phonenumber: {
+        type: String,
+        optional: true
     }
 };
 var DefaultSchema = new mongoose_1.Schema(schema, {

package/fixtures/init.js

@@ -37,7 +37,6 @@ 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");
-// import { ActiveSubscriptions } from '../collections/active-subscription.collection';
 var mongoose_1 = require("mongoose");
 function loadServerInit() {
     return __awaiter(this, void 0, void 0, function () {

package/managers/method.manager.js

@@ -295,7 +295,7 @@ var MethodManager = /** @class */ (function () {
                     data: 'Internal Error'
                 };
                 _this._mainServer.getQueueManager().addMethodResponse(updateCopy, serverRes);
-                return reject('No Method: ' + update.method);
+                return resolve('No Method: ' + update.method);
             }
             if ((update.method_data.length > 1 || update.method_data[0]) && !that._methods[update.method].skipValidation) {
                 if (!that._methods[update.method].check) {
@@ -307,7 +307,7 @@ var MethodManager = /** @class */ (function () {
                         data: 'Internal Error'
                     };
                     _this._mainServer.getQueueManager().addMethodResponse(updateCopy, serverRes);
-                    return reject('No Check Function For Method ' + update.method);
+                    return resolve('No Check Function For Method ' + update.method);
                 }
                 else if (!that._methods[update.method].check._schema) {
                     console.error('No Check Schema For Method ' + update.method);
@@ -318,7 +318,7 @@ var MethodManager = /** @class */ (function () {
                         data: 'Internal Error'
                     };
                     _this._mainServer.getQueueManager().addMethodResponse(updateCopy, serverRes);
-                    return reject('No Check Schema For Method ' + update.method);
+                    return resolve('No Check Schema For Method ' + update.method);
                 }
                 else {
                     var valObj = {};
@@ -340,7 +340,7 @@ var MethodManager = /** @class */ (function () {
                                 data: 'Internal Error'
                             };
                             _this._mainServer.getQueueManager().addMethodResponse(updateCopy, serverRes);
-                            return reject('Error in Method Check (' + update.method + ')');
+                            return resolve('Error in Method Check (' + update.method + ')');
                         }
                     }
                 }
@@ -348,8 +348,8 @@ var MethodManager = /** @class */ (function () {
             var timeout = setTimeout(function () {
                 console.error('Timeout on method', update);
                 _this.callMethodInternal.call(_this, 'insertErrorLog', 'Timeout on method: ', [update]);
-                reject('Timeout');
-            }, 10000);
+                resolve('Timeout');
+            }, 5000);
             // console.log('Run Method', update.method);
             (_a = that._methods[update.method].function).call.apply(_a, [Object.assign({}, that, MethodManager.prototype, { id_user: update.id_user, user: update.user, id_ws: update.id_ws })].concat(update.method_data)).then(function (res) {
                 var serverRes = {
@@ -368,7 +368,7 @@ var MethodManager = /** @class */ (function () {
                 };
                 _this._mainServer.getQueueManager().addMethodResponse(updateCopy, serverRes);
                 clearTimeout(timeout);
-                reject(serverRes);
+                resolve(serverRes);
             });
         });
     };

package/models/user.model.d.ts

@@ -1,14 +1,30 @@
 import { CollectionDocument } from './collection-document.model';
 export interface UserModel extends CollectionDocument {
-    attempts: number;
-    last: Date;
-    services?: any;
     fullname: string;
+    roles: UserRoleModel;
     username?: string;
     email?: string;
-    roles?: string[];
     active?: boolean;
-    readonly?: boolean;
+    services?: any;
+    id_customer?: string;
+    customer?: string;
+    customer_type?: string;
     phonenumber?: string;
-    other?: object;
+}
+export interface UserRoleModel {
+    super_admin: boolean;
+    approvals: UserRoleApprovalModel[];
+    groups: UserRoleGroupModel[];
+    notifications: string[];
+    miscs: string[];
+}
+export interface UserRoleApprovalModel {
+    accounting_code: string;
+    type: string;
+    name: string;
+}
+export interface UserRoleGroupModel {
+    name: string;
+    views: string[];
+    yard?: string;
 }

package/package.json

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