scheduler-node-models 1.2.117 → 1.2.119

package/config/index.d.ts

@@ -1,4 +1,4 @@
 export * from './logging';
-export * from './mariadb';
+export * from './sqldb';
 export * from './mongoconnect';
 export * from './logPosting';

package/config/index.js

@@ -15,6 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./logging"), exports);
-__exportStar(require("./mariadb"), exports);
+__exportStar(require("./sqldb"), exports);
 __exportStar(require("./mongoconnect"), exports);
 __exportStar(require("./logPosting"), exports);

package/config/logging.js

@@ -4,7 +4,7 @@ exports.logConnection = void 0;
 exports.createLogs = createLogs;
 exports.postLogEntry = postLogEntry;
 const general_1 = require("../general");
-const mariadb_1 = require("./mariadb");
+const sqldb_1 = require("./sqldb");
 exports.logConnection = {};
 async function createLogs(application) {
     exports.logConnection.log = new general_1.Logger(`${process.env.LOG_DIR}/${application}/process_${(new Date().toDateString())}.log`);
@@ -16,9 +16,9 @@ async function postLogEntry(application, message) {
     let conn;
     let logEntry = new general_1.LogEntry();
     try {
-        if (mariadb_1.mdbConnection.pool) {
+        if (sqldb_1.mdbConnection.pool) {
             // get a connection from the db.pool
-            conn = await mariadb_1.mdbConnection.pool.getConnection();
+            conn = await sqldb_1.mdbConnection.pool.getConnection();
             const entryDate = new Date();
             // execute a query for notices for the user
             const insert = `INSERT INTO logentries VALUES ( ?, ?, ?)`;

package/config/sqldb.d.ts

@@ -0,0 +1,5 @@
+import * as mariadb from 'mariadb';
+export declare const mdbConnection: {
+    pool?: mariadb.Pool;
+};
+export declare function createPool(): Promise<void>;

package/config/sqldb.js

@@ -0,0 +1,50 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mdbConnection = void 0;
+exports.createPool = createPool;
+const mariadb = __importStar(require("mariadb"));
+exports.mdbConnection = {};
+async function createPool() {
+    exports.mdbConnection.pool = await mariadb.createPool({
+        host: process.env.MYSQL_SERVER,
+        port: (process.env.MYSQL_PORT) ? Number(process.env.MYSQL_PORT) : 3306,
+        user: process.env.MYSQL_USER,
+        password: process.env.MYSQL_PASSWORD,
+        database: 'scheduler',
+        connectionLimit: 5
+    });
+    console.log('Connected to mariadb');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scheduler-node-models",
-  "version": "1.2.117",
+  "version": "1.2.119",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [

package/users/user.d.ts

@@ -1,4 +1,5 @@
 import { ISecurityQuestion, SecurityQuestion } from './question';
+import { IPermission, Permission } from './permission';
 /**
  * The user class and interface.
  */
@@ -16,11 +17,12 @@ export interface IUser {
     firstName: string;
     middleName?: string;
     lastName: string;
-    workgroups: string[];
+    workgroups?: string[];
     resettoken?: string;
     resettokenexp?: Date;
     additionalEmails?: string[];
     questions?: ISecurityQuestion[];
+    permissions?: IPermission[];
 }
 /**
  * This class represents a user and all the actions available to the user object.
@@ -52,6 +54,7 @@ export declare class User implements IUser {
     resettokenexp?: Date;
     additionalEmails: string[];
     questions: SecurityQuestion[];
+    permissions: Permission[];
     constructor(user?: IUser);
     /**
      * This function is used to sort this class' objects into an ordered list.  The order
@@ -147,4 +150,12 @@ export declare class User implements IUser {
      * @returns A boolean value for whether the answers match.
      */
     checkSecurityQuestion(id: number, value: string): boolean;
+    /**
+     * This function will be used to look to ensure the user has a particular job/permission
+     * for an application.  All checks are done with lower case strings.
+     * @param application The string value for the application
+     * @param job The string value the job and/or permission to check against.
+     * @returns The boolean value for the user having that permission group.
+     */
+    hasPermission(application: string, job: string): boolean;
 }

package/users/user.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = void 0;
 const bcrypt_ts_1 = require("bcrypt-ts");
 const question_1 = require("./question");
+const permission_1 = require("./permission");
 /**
  * This class represents a user and all the actions available to the user object.
  * The main class members are:
@@ -33,6 +34,7 @@ class User {
     resettokenexp;
     additionalEmails;
     questions;
+    permissions;
     constructor(user) {
         this.id = (user && user.id) ? user.id : '';
         if (this.id === '') {
@@ -46,7 +48,7 @@ class User {
         this.middleName = (user) ? user.middleName : undefined;
         this.lastName = (user) ? user.lastName : '';
         this.workgroups = [];
-        if (user) {
+        if (user && user.workgroups) {
             user.workgroups.forEach(wg => {
                 this.workgroups.push(wg);
             });
@@ -76,6 +78,20 @@ class User {
                 }));
             }
         }
+        this.permissions = [];
+        if (user && user.permissions) {
+            user.permissions.forEach(perm => {
+                this.permissions.push(new permission_1.Permission({
+                    application: perm.application,
+                    job: perm.job
+                }));
+            });
+        }
+        if (this.permissions.length === 0 && this.workgroups.length > 0) {
+            this.workgroups.forEach(wg => {
+                const parts = wg.split('-');
+            });
+        }
     }
     /**
      * This function is used to sort this class' objects into an ordered list.  The order
@@ -300,5 +316,22 @@ class User {
         });
         return answer;
     }
+    /**
+     * This function will be used to look to ensure the user has a particular job/permission
+     * for an application.  All checks are done with lower case strings.
+     * @param application The string value for the application
+     * @param job The string value the job and/or permission to check against.
+     * @returns The boolean value for the user having that permission group.
+     */
+    hasPermission(application, job) {
+        let answer = false;
+        this.permissions.forEach(perm => {
+            if (perm.application.toLowerCase() === application.toLowerCase()
+                && perm.job.toLowerCase() === job.toLowerCase()) {
+                answer = true;
+            }
+        });
+        return answer;
+    }
 }
 exports.User = User;