Bump jws from 3.2.2 to 3.2.3

Bumps [jws](https://github.com/brianloveswords/node-jws) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/brianloveswords/node-jws/releases)
- [Changelog](https://github.com/auth0/node-jws/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brianloveswords/node-jws/compare/v3.2.2...v3.2.3)

---
updated-dependencies:
- dependency-name: jws
  dependency-version: 3.2.3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

package-lock.json

@@ -1256,12 +1256,12 @@
       }
     },
     "node_modules/jws": {
-      "version": "3.2.2",
+      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.3.tgz",
-      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "integrity": "sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==",
       "license": "MIT",
       "dependencies": {
-        "jwa": "^1.4.1",
+        "jwa": "^1.4.2",
         "safe-buffer": "^5.0.1"
       }
     },
@@ -1554,6 +1554,7 @@
       "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
       "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "pg-connection-string": "^2.9.1",
         "pg-pool": "^3.10.1",

services/dbconnector/connectionManager.js

@@ -2,7 +2,9 @@
 
 require('dotenv').config();
 const sql = require('mssql');
+const oracledb = require('oracledb');
 const mysql = require('mysql2/promise');
+const { Client } = require('pg');
 
 /**
  * Gets a connection based on the configured database type.
@@ -16,8 +18,14 @@ async function getConnection() {
     switch (dbType) {
         case 'MSSQL':
             return await sql.connect(config);
+        case 'ORACLE':
+            return await oracledb.getConnection(config);
         case 'MARIADB':
             return await mysql.createConnection(config);
+        case 'POSTGRES':
+            const client = new Client(config);
+            await client.connect();
+            return client;
         default:
             throw new Error('Unsupported database type');
     }
@@ -42,6 +50,12 @@ function getDBConfig(dbType) {
                     trustServerCertificate: true
                 }
             };
+        case 'ORACLE':
+            return {
+                user: process.env.DB_USER,
+                password: process.env.DB_PASSWORD,
+                connectString: process.env.ORACLE_CONNECTION_STRING
+            };
         case 'MARIADB':
             return {
                 host: process.env.DB_SERVER,
@@ -51,6 +65,14 @@ function getDBConfig(dbType) {
                 database: process.env.DB_DATABASE,
                 namedPlaceholders: true
             };
+        case 'POSTGRES':
+            return {
+                host: process.env.DB_SERVER,
+                port: parseInt(process.env.DB_PORT, 10) || 5432,
+                user: process.env.DB_USER,
+                password: process.env.DB_PASSWORD,
+                database: process.env.DB_DATABASE
+            };
         default:
             throw new Error('Unsupported database type');
     }

services/dbconnector/paramLibrary.js

@@ -28,11 +28,15 @@ async function formatQueryParams(params) {
         case 'MSSQL':
             formattedParams = formatMSSQLParams(params, paramsConfig.mssql);
             break;
-
+        case 'ORACLE':
+            formattedParams = formatOracleParams(params, paramsConfig.oracle);
+            break;
         case 'MARIADB':
             formattedParams = formatMariaDBParams(params, paramsConfig.mariaDB);
             break;
-
+        case 'POSTGRES':
+            formattedParams = formatPostgresParams(params, paramsConfig.postgres);
+            break;
         default:
             throw new Error('Unsupported database type');
     }
@@ -87,6 +91,51 @@ function formatMSSQLParams(params, config) {
     return formattedParams;
 }
 
+/**
+ * Formats query parameters for Oracle.
+ *
+ * @param {Object} params - An object containing the parameters to format.
+ * @param {Object} config - Database-specific configuration from JSON.
+ * @returns {Object} Formatted parameters.
+ */
+function formatOracleParams(params, config) {
+    const formattedParams = {};
+    for (const key in params) {
+        if (!config[key]) {
+            console.warn(`Parameter '${key}' not defined in the configuration.`);
+            continue;
+        }
+
+        const paramConfig = config[key];
+        let type;
+
+        switch (paramConfig.type.toLowerCase()) {
+            case 'string':
+                type = oracledb.STRING;
+                break;
+            case 'varchar2':
+                if (!paramConfig.maxLength) {
+                    throw new Error(`Parameter '${key}' is missing maxLength in configuration.`);
+                }
+                type = oracledb.VARCHAR2(paramConfig.maxLength);
+                break;
+            case 'clob':
+                type = oracledb.CLOB;
+                break;
+            case 'number':
+                type = oracledb.NUMBER;
+                break;
+            case 'boolean':
+                type = oracledb.BOOLEAN;
+                break;
+            default:
+                throw new Error(`Unsupported parameter type: ${paramConfig.type} for parameter '${key}'`);
+        }
+
+        formattedParams[key] = { type, value: params[key] };
+    }
+    return formattedParams;
+}
 
 /**
  * Formats query parameters for MariaDB.
@@ -137,5 +186,51 @@ function formatMariaDBParams(params, config) {
     return formattedParams;
 }
 
+/**
+ * Formats query parameters for PostgreSQL.
+ *
+ * @param {Object} params - An object containing the parameters to format.
+ * @param {Object} config - Database-specific configuration from JSON.
+ * @returns {Object} Formatted parameters.
+ */
+function formatPostgresParams(params, config) {
+    const formattedParams = {};
+    for (const key in params) {
+        if (!config[key]) {
+            console.warn(`Parameter '${key}' not defined in the configuration.`);
+            continue;
+        }
+
+        const paramConfig = config[key];
+        let type;
+
+        switch (paramConfig.type.toLowerCase()) {
+            case 'uuid':
+                type = 'uuid';
+                break;
+            case 'varchar':
+                if (!paramConfig.length) {
+                    throw new Error(`Parameter '${key}' is missing length in configuration.`);
+                }
+                type = { type: 'VARCHAR', length: paramConfig.length };
+                break;
+            case 'text':
+                type = 'text';
+                break;
+            case 'int':
+                type = 'int';
+                break;
+            case 'boolean':
+                type = 'boolean';
+                break;
+            default:
+                throw new Error(`Unsupported parameter type: ${paramConfig.type} for parameter '${key}'`);
+        }
+
+        formattedParams[key] = { type, value: params[key] };
+    }
+    return formattedParams;
+}
+
 module.exports = { formatQueryParams };
 

services/dbconnector/paramsConfig.json

@@ -4,7 +4,6 @@
         "Name": { "type": "nvarchar", "maxLength": 255 },
         "Description": { "type": "nvarchar", "maxLength": 255 },
         "Building": { "type": "nvarchar", "maxLength": 255 },
-        "Bin": { "type": "nvarchar", "maxLength": 255 },
         "Owner": { "type": "nvarchar", "maxLength": 255 },
         "Role": { "type": "nvarchar", "maxLength": 255 },
         "Location": { "type": "nvarchar", "maxLength": 255 },
@@ -15,14 +14,34 @@
         "Username": { "type": "nvarchar", "maxLength": 50 },
         "AuthenticatedUsername": { "type": "nvarchar", "maxLength": 50 },
         "UITheme": { "type": "nvarchar", "maxLength": 50 },
-        "Bio": { "type": "nvarchar", "maxlength": 255 },
+        "Bio": { "type": "text" },
         "PasswordHash": { "type": "text" },
-        "Image": { "type": "nvarchar", "maxLength": 255 },
+        "Image": { "type": "text" },
-        "AvatarURL": { "type": "nvarchar", "maxlength": 255  },
+        "AvatarURL": { "type": "text" },
         "SQL_USER": { "type": "bit" },
-        "Text": { "type": "nvarchar", "maxLength": 255 },
+        "Text": { "type": "nvarchar", "maxLength": 255 }
-        "Quantity": { "type": "int" },
+    },
-        "RequestPayload": { "type": "text" }
+    "oracle": {
+        "ID": { "type": "string" },
+        "Name": { "type": "varchar2", "maxLength": 255 },
+        "Description": { "type": "varchar2", "maxLength": 255 },
+        "Text": { "type": "varchar2", "maxLength": 255 },
+        "Building": { "type": "varchar2", "maxLength": 255 },
+        "Owner": { "type": "varchar2", "maxLength": 255 },
+        "Role": { "type": "varchar2", "maxLength": 255 },
+        "Location": { "type": "varchar2", "maxLength": 255 },
+        "Route": { "type": "varchar2", "maxLength": 255 },
+        "Email": { "type": "varchar2", "maxLength": 255 },
+        "DisplayName": { "type": "varchar2", "maxLength": 255 },
+        "Team": { "type": "varchar2", "maxLength": 255 },
+        "Username": { "type": "varchar2", "maxLength": 50 },
+        "AuthenticatedUsername": { "type": "varchar2", "maxLength": 50 },
+        "UITheme": { "type": "varchar2", "maxLength": 50 },
+        "Bio": { "type": "clob" },
+        "PasswordHash": { "type": "clob" },
+        "Image": { "type": "clob" },
+        "AvatarURL": { "type": "clob" },
+        "SQL_USER": { "type": "boolean" }
     },
     "mariaDB": {
         "ID": { "type": "uuid" },
@@ -45,5 +64,27 @@
         "Image": { "type": "text" },
         "AvatarURL": { "type": "text" },
         "SQL_USER": { "type": "boolean" }
+    },
+    "postgres": {
+        "ID": { "type": "uuid" },
+        "Name": { "type": "varchar", "length": 255 },
+        "Description": { "type": "varchar", "length": 255 },
+        "Text": { "type": "varchar", "length": 255 },
+        "Building": { "type": "varchar", "length": 255 },
+        "Owner": { "type": "varchar", "length": 255 },
+        "Role": { "type": "varchar", "length": 255 },
+        "Location": { "type": "varchar", "length": 255 },
+        "Route": { "type": "varchar", "length": 255 },
+        "Email": { "type": "varchar", "length": 255 },
+        "DisplayName": { "type": "varchar", "length": 255 },
+        "Team": { "type": "varchar", "length": 255 },
+        "Username": { "type": "varchar", "length": 50 },
+        "AuthenticatedUsername": { "type": "varchar", "length": 50 },
+        "UITheme": { "type": "varchar", "length": 50 },
+        "Bio": { "type": "text" },
+        "PasswordHash": { "type": "text" },
+        "Image": { "type": "text" },
+        "AvatarURL": { "type": "text" },
+        "SQL_USER": { "type": "boolean" }
     }
 }

services/dbconnector/queryConstructor.js

@@ -117,9 +117,14 @@ function generateCreateQuery(dbType, table, params) {
                 .map(key => `@${key}`)
                 .join(', ');
             break;
+        case 'POSTGRES':
+            placeholders = Object.keys(params).map(() => '?').join(', '); // Use ? for PostgreSQL
+            break;
         case 'MARIADB':
             placeholders = Object.keys(params).map(() => `?`).join(', '); // Use ? for MariaDB
             break;
+        case 'ORACLE':
+            throw new Error('CREATE operation is not supported for ORACLE in this implementation.');
         default:
             throw new Error('Unsupported database type for this operation!');     
     }
@@ -156,6 +161,22 @@ function generateReadQuery(dbType, table, params) {
                         condition = `${key} = @${key}`;
                     }
                     break;
+                case 'ORACLE':
+                    if (params.partialMatch) {
+                        condition = `${key} LIKE '%' || :${key} || '%'`;
+                        params[key] = `%${params[key]}%`; // Add % wildcard in params
+                    } else {
+                        condition = `${key} = :${key}`;
+                    }
+                    break;
+                case 'POSTGRES':
+                    if (params.partialMatch) {
+                        condition = `${key} LIKE $1`;
+                        params[key] = `%${params[key]}%`; // Add % wildcard in params
+                    } else {
+                        condition = `${key} = $1`;
+                    }
+                    break;
                 case 'MARIADB':
                     if (params.partialMatch) {
                         condition = `${key} LIKE ?`;
@@ -210,6 +231,9 @@ async function generateUpdateQuery(dbType, table, params) {
         case 'MSSQL':
             whereClause = `WHERE ID = @ID`;
             break;
+        case 'POSTGRES':
+            whereClause = `WHERE ID = $2`;
+            break;
         case 'MARIADB':
             whereClause = `WHERE ID = ?`;
             break;
@@ -234,8 +258,12 @@ async function generateDeleteQuery(dbType, table, params) {
     switch (dbType.toUpperCase()) {
         case 'MSSQL':
             return `DELETE FROM ${table} WHERE ID = @ID;`;
+        case 'POSTGRES':
+            return `DELETE FROM ${table} WHERE ID = $1;`; // Use $1 for PostgreSQL
         case 'MARIADB':
             return `DELETE FROM ${table} WHERE ID = ?;`;
+        case 'ORACLE':
+            throw new Error('DELETE operation is not supported for ORACLE in this implementation.');
         default:
             throw new Error('Unsupported database type!');
     }
@@ -251,10 +279,57 @@ async function generateTestQuery(dbType) {
     switch (dbType.toUpperCase()) {
         case 'MSSQL':
             return `SELECT @@SPID;`;
+        case 'POSTGRES':
+            return `SELECT pg_backend_pid();`; // Use $1 for PostgreSQL
         case 'MARIADB':
             return `SELECT CONNECTION_ID();`;
+        case 'ORACLE':
+            return `SELECT SYS_CONTEXT('USERENV', 'SESSIONID') FROM dual;`;
         default:
             throw new Error('Unsupported database type!');
     }
 }
+/*
+*
+* I intend to implement "compare" functionality but haven't yet decided how to do so. This is some spitballed code that I came up with for this exercise, and I hope to complete work on it in the future.
+/**
+ * Generates a COMPARE SQL query string based on database type, table, and parameters.
+ *
+ * @param {string} dbType - Type of database (e.g., 'MSSQL', 'ORACLE').
+ * @param {Object} params - Parameters for the SQL query.
+ * @returns {string} The constructed COMPARE SQL query string.
+ *
+function generateCompareQuery(dbType, table, params) {
+    const { compareTable, idField } = params;
+    
+    switch (dbType.toUpperCase()) {
+        case 'MSSQL':
+            return `
+                SELECT a.*
+                FROM ${table} a
+                JOIN ${compareTable} b ON a.${idField} = b.${idField}
+            `;
+        case 'ORACLE':
+            return `
+                SELECT a.*
+                FROM ${table} a
+                JOIN ${compareTable} b ON a.${idField} = b.${idField}
+            `;
+        case 'POSTGRES':
+            return `
+                SELECT a.*
+                FROM ${table} a
+                JOIN ${compareTable} b ON a.${idField} = b.${idField}
+            `;
+        case 'MARIADB':
+            return `
+                SELECT a.*
+                FROM ${table} a
+                JOIN ${compareTable} b ON a.${idField} = b.${idField}
+            `;
+        default:
+            throw new Error('Unsupported database type');
+    }
+}*/
+
 module.exports = { generateQuery };

services/dbconnector/queryExecutor.js

@@ -32,11 +32,21 @@ async function executeQuery(table, operation, params) {
                 console.log('Formatted parameters for MSSQL:', formattedParams); // Log the formatted parameters
                 result = await executeMSSQLQuery(connection, query, formattedParams);
                 break;
+            case 'ORACLE':
+                console.log('Executing Oracle query:', query); // Debugging log
+                console.log('Formatted parameters for Oracle:', formattedParams); // Log the formatted parameters
+                result = await executeOracleQuery(connection, query, formattedParams);
+                break;
             case 'MARIADB':
                 console.log('Executing MariaDB query:', query); // Debugging log
                 console.log('Formatted parameters for MariaDB:', formattedParams); // Log the formatted parameters
                 result = await executeMariaDBQuery(connection, query, formattedParams);
                 break;
+            case 'POSTGRES':
+                console.log('Executing PostgreSQL query:', query); // Debugging log
+                console.log('Formatted parameters for PostgreSQL:', formattedParams); // Log the formatted parameters
+                result = await executePostgresQuery(connection, query, formattedParams);
+                break;
             default:
                 throw new Error('Unsupported database type');
         }
@@ -81,6 +91,30 @@ async function executeMSSQLQuery(connection, query, params) {
     }
 }
 
+async function executeOracleQuery(connection, query, params) {
+    const binds = {};
+
+    // Bind each parameter with its name and value
+    Object.keys(params).forEach((key, index) => {
+        binds[`param${index + 1}`] = { type: params[key].type, val: params[key].value };
+    });
+
+    const options = {
+        outFormat: require('oracledb').OUT_FORMAT_OBJECT
+    };
+
+    try {
+        console.log('Executing Oracle query:', query); // Debugging log
+        console.log('Binding parameters for Oracle:', binds); // Debugging log
+        const result = await connection.execute(query, binds, options);
+        return { recordset: result.rows, affectedRows: result.rowsAffected };
+
+    } catch (error) {
+        console.error('Error executing Oracle query:', error.message);
+        throw error;
+    }
+}
+
 async function executeMariaDBQuery(connection, query, params) {
     try {
         // Extract parameter values in order
@@ -96,4 +130,20 @@ async function executeMariaDBQuery(connection, query, params) {
     }
 }
 
+async function executePostgresQuery(connection, query, params) {
+    try {
+        // Extract parameter values in order
+        const paramValues = Object.keys(params).map(key => params[key].value);
+
+        console.log('Executing PostgreSQL query:', query); // Debugging log
+        console.log('Binding parameters for PostgreSQL:', paramValues); // Debugging log
+
+        const result = await connection.query(query, paramValues);
+        return { recordset: result.rows };
+    } catch (error) {
+        console.error('Error executing PostgreSQL query:', error.message);
+        throw error;
+    }
+}
+
 module.exports = { executeQuery };