@resolveio/server-lib 5.2.4 → 5.2.5-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/index.d.ts

@@ -7,7 +7,8 @@ export declare class ResolveIOServer {
     private static _client;
     private static _clientDir;
     private static _dontRunSupport;
-    constructor(serverConfig: any, client: string, clientDir: any, _dontRunSupport?: any);
+    private static _sesMail;
+    constructor(serverConfig: any, client: string, clientDir: any, dontRunSupport?: boolean, sesMail?: boolean);
     static connectAndRun(): Promise<{}>;
     static getClientName(): string;
     static getMainServer(): ResolveIOMainServer;

package/index.js

@@ -37,12 +37,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var mongoose = require("mongoose");
 var ResolveIOServer = /** @class */ (function () {
-    function ResolveIOServer(serverConfig, client, clientDir, _dontRunSupport) {
+    function ResolveIOServer(serverConfig, client, clientDir, dontRunSupport, sesMail) {
+        if (dontRunSupport === void 0) { dontRunSupport = false; }
+        if (sesMail === void 0) { sesMail = true; }
         ResolveIOServer._serverConfig = serverConfig;
         ResolveIOServer._client = client;
         ResolveIOServer._clientDir = clientDir;
-        if (_dontRunSupport) {
-            ResolveIOServer._dontRunSupport = _dontRunSupport;
+        ResolveIOServer._sesMail = sesMail;
+        if (dontRunSupport) {
+            ResolveIOServer._dontRunSupport = dontRunSupport;
         }
     }
     ResolveIOServer.connectAndRun = function () {
@@ -62,7 +65,7 @@ var ResolveIOServer = /** @class */ (function () {
                                         return [4 /*yield*/, Promise.resolve().then(function () { return require('./server-app'); })];
                                     case 1:
                                         serverApp = (_a.sent()).default;
-                                        ResolveIOServer._mainServer = new serverApp(this, ResolveIOServer._serverConfig, this._clientDir);
+                                        ResolveIOServer._mainServer = new serverApp(this, ResolveIOServer._serverConfig, this._clientDir, this._sesMail);
                                         resolve();
                                         return [2 /*return*/];
                                 }
@@ -89,7 +92,7 @@ var ResolveIOServer = /** @class */ (function () {
                                 return [4 /*yield*/, Promise.resolve().then(function () { return require('./server-app'); })];
                             case 1:
                                 serverApp = (_a.sent()).default;
-                                ResolveIOServer._mainServer = new serverApp(this, ResolveIOServer._serverConfig, this._clientDir);
+                                ResolveIOServer._mainServer = new serverApp(this, ResolveIOServer._serverConfig, this._clientDir, this._sesMail);
                                 resolve();
                                 return [2 /*return*/];
                         }
@@ -120,6 +123,7 @@ var ResolveIOServer = /** @class */ (function () {
     ResolveIOServer._client = '';
     ResolveIOServer._clientDir = '';
     ResolveIOServer._dontRunSupport = false;
+    ResolveIOServer._sesMail = true;
     return ResolveIOServer;
 }());
 exports.ResolveIOServer = ResolveIOServer;

package/managers/method.manager.js

@@ -81,14 +81,30 @@ var MethodManager = /** @class */ (function () {
         cron_jobs_2.loadCronJobMethods(this);
         flags_1.loadFlagMethods(this);
         report_builder_1.loadReportBuilderMethods(this);
-        this._mailer = nodemailer.createTransport({
-            SES: new aws.SES({
-                apiVersion: '2010-12-01',
-                accessKeyId: serverConfig.AWSACCESSKEYID,
-                secretAccessKey: serverConfig.AWSSECRETACCESSKEY,
-                region: serverConfig.AWSSES_REGION
-            })
-        });
+        if (mainServer.sesMail) {
+            this._mailer = nodemailer.createTransport({
+                SES: new aws.SES({
+                    apiVersion: '2010-12-01',
+                    accessKeyId: serverConfig.AWSACCESSKEYID,
+                    secretAccessKey: serverConfig.AWSSECRETACCESSKEY,
+                    region: serverConfig.AWSSES_REGION
+                })
+            });
+        }
+        else {
+            this._mailer = nodemailer.createTransport({
+                host: this.serverConfig['MAIL_HOST'],
+                port: this.serverConfig['MAIL_PORT'],
+                secure: false,
+                auth: {
+                    user: this.serverConfig['MAIL_USERNAME'],
+                    pass: this.serverConfig['MAIL_PASSWORD']
+                },
+                tls: {
+                    ciphers: 'SSLv3'
+                }
+            });
+        }
         // this._imap = new imap({
         // 	user: this.serverConfig['ORDERS_EMAIL'],
         // 	password: this.serverConfig['ORDERS_PASSWORD'],

package/package.json

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

package/server-app.d.ts

@@ -14,6 +14,7 @@ export default class ResolveIOMainServer {
     private _clientDir;
     private _msgQueue;
     private _msgQueueRunning;
+    sesMail: boolean;
     private LOGGER;
     private _resolveioServer;
     private _subscriptionManager;
@@ -21,7 +22,7 @@ export default class ResolveIOMainServer {
     private _queueManager;
     private _cronManager;
     private _supportManager;
-    constructor(mainServer: any, serverConfig: any, clientDir: any);
+    constructor(mainServer: any, serverConfig: any, clientDir: any, sesMail: any);
     getWS(id_ws: string): any;
     getWSList(): any[];
     getCronManager(): CronManager;

package/server-app.js

@@ -61,9 +61,10 @@ var queue_method_manager_1 = require("./managers/queue-method.manager");
 var common_2 = require("./util/common");
 var log_method_latency_collection_1 = require("./collections/log-method-latency.collection");
 var ResolveIOMainServer = /** @class */ (function () {
-    function ResolveIOMainServer(mainServer, serverConfig, clientDir) {
+    function ResolveIOMainServer(mainServer, serverConfig, clientDir, sesMail) {
         this._msgQueue = [];
         this._msgQueueRunning = false;
+        this.sesMail = false;
         this.LOGGER = 'ERROR'; //ERROR / DEBUG
         if (this.LOGGER === 'DEBUG') {
             console.log('Starting ResolveIO Server');
@@ -71,6 +72,7 @@ var ResolveIOMainServer = /** @class */ (function () {
         this._resolveioServer = mainServer;
         this._serverConfig = serverConfig;
         this._clientDir = clientDir;
+        this.sesMail = sesMail;
         // Start express app
         this._app = express();
         // Use body parser for http call (login)