fix traditional auth, added comments for proxy error, fix pool connection to mysql db from aiven

Author: vyue013

.gitignore

@@ -8,4 +8,5 @@ temp/
 .cert/
 ca.crt/
 ca.key/
-coverage/
+coverage/
+certs/

package-lock.json

@@ -1,11 +1,12 @@
 import mysql from 'mysql2';
 import fs from 'fs';
 import log from '../logger';
+import path from 'path';
 
 const dotenv = require('dotenv');
 dotenv.config();
 
-const { USER_DB_URL_MYSQL, USER_DB_USER_MYSQL, USER_DB_PW_MYSQL } = process.env;
+const { USER_DB_URL_MYSQL, USER_DB_USER_MYSQL, USER_DB_PW_MYSQL, DB_PORT } = process.env;
 
 // SSL data stored as environment variable for GitHub Actions access
 // Also stored in .cert file because Elastic Beanstalk has a ~4000 char limit for its environment variables
@@ -18,23 +19,41 @@ const { USER_DB_URL_MYSQL, USER_DB_USER_MYSQL, USER_DB_PW_MYSQL } = process.env;
 //     ? Buffer.from(process.env.SSL_CERT, 'base64').toString('ascii')
 //     : fs.readFileSync('./.cert/cert.pem').toString();
 
+// Load CA certificate
+const caCertPath = path.resolve(__dirname, '../certs/ca.pem'); // Make sure this file exists
+const caCert = fs.readFileSync(caCertPath, 'utf-8');
+
 const pool = mysql
   .createPool({
-    connectionLimit: 10,
     host: USER_DB_URL_MYSQL,
     user: USER_DB_USER_MYSQL,
     password: USER_DB_PW_MYSQL,
-    database: 'user',
+    port: Number(DB_PORT),
+    database: 'dbspy',
+    waitForConnections: true,
+    connectionLimit: 10,
+    queueLimit: 0,
+    ssl: {
+      rejectUnauthorized: true,
+      ca: caCert, // ✅ Provide Aiven's CA certificate
+    },
     // ssl: {
     //   key: SSL_KEY,
     //   cert: SSL_CERT,
     // },
   })
   .promise(); // wrap with promise API
-//connect used to be a var in the function below but it didn't do anything -Stephen
-pool.on('connection', () => {
-  log.info(`MySQL pool connection established`);
-});
+
+// Test Connection
+pool
+  .getConnection()
+  .then((connection) => {
+    log.info(`✅ MySQL pool connection established`);
+    connection.release();
+  })
+  .catch((err) => {
+    log.error(`❌ MySQL connection error:`, err);
+  });
 
 /**
  * User Database Schema

server/models/userModel.ts

@@ -97,6 +97,12 @@ const routes = (app: Express) => {
   // Status code being handled in middleware
   app.get('/api/retrieveSchema', retrieveSchema);
 
+  // TODO - look into this in vite.config.ts
+  // Added /api/ route to resolve vite http proxy error?
+  app.get('/api/', (req, res) => {
+    res.json({ message: 'Reached /api/ route' });
+  });
+
   app.get('/*', (_req, res) => {
     res.status(404).send('Not found');
   });

server/routes/index.ts

@@ -2,51 +2,53 @@ import mysql from 'mysql2';
 import dotenv from 'dotenv';
 dotenv.config();
 import log from '../logger/index';
-import { DataSource } from 'typeorm'
-import { User } from '../entities/user.entity'
+import { DataSource } from 'typeorm';
+import { User } from '../entities/user.entity';
 // // Connect to SQL db and create users table
 if (!process.env.USER_DB_URL) {
-  console.info('We are in the first error')
-  throw new Error('USER_DB_URL not found');}
+  console.info('We are in the first error');
+  throw new Error('USER_DB_URL not found');
+}
 const connection = mysql.createConnection(process.env.USER_DB_URL);
 
-// const loadData = () => {
-//   console.info('we are in loadData')
-//   console.log(process.env.USER_DB_URL);
-
-//   const createUserTable: string =
-//   `CREATE TABLE
-// 	'Users' (
-//       'id' int NOT NULL AUTO_INCREMENT,
-//       'full_name' varchar(240) NOT NULL,
-//       'sub' varchar(40) DEFAULT NULL,
-//       'email' varchar(240) NOT NULL,
-//       'picture' varchar(240) DEFAULT NULL,
-//       'pg_schema' text,
-//       'password' varchar(240) NOT NULL,
-//       PRIMARY KEY (id)
-//     ) ENGINE = InnoDB AUTO_INCREMENT = 40 DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci`;
-//   try {
-//     connection.query(createUserTable);
-//   } catch (err) {
-//     log.info(err);
-//   }
-// };
-
-// loadData();
+const loadData = async () => {
+  console.info('we are in loadData');
+  console.log(process.env.USER_DB_URL);
+  console.log('Connected to database:', connection.config.database);
 
+  const createUserTable: string = `CREATE TABLE
+  \`users\` (
+      \`id\` int NOT NULL AUTO_INCREMENT,
+      \`full_name\` varchar(240) NOT NULL,
+      \`sub\` varchar(40) DEFAULT NULL,
+      \`email\` varchar(240) NOT NULL,
+      \`picture\` varchar(240) DEFAULT NULL,
+      \`pg_schema\` text,
+      \`password\` varchar(240) NOT NULL,
+      PRIMARY KEY (\`id\`)
+    ) ENGINE = InnoDB AUTO_INCREMENT = 40 DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci`;
+  try {
+    console.log('🔹 Executing SQL Query...');
+    await connection.promise().query(createUserTable);
+    console.log('data seeded!!');
+  } catch (err) {
+    log.info(err);
+  } finally {
+    connection.end(); // Close connection after execution
+  }
+};
 
+loadData();
 
 const MysqlDataSource = new DataSource({
-  type: "mysql",
-  host: "process.env.USER_DB_URL",
+  type: 'mysql',
+  host: process.env.USER_DB_URL,
   port: 3306,
-  username: "admin",
-  password: "Codesmith",
-  database: "dbSpy",
-  entities: [
-      User
-  ],
-})
+  username: process.env.USER_DB_USER,
+  password: process.env.USER_DB_PW,
+  database: 'dbspy',
+  entities: [User],
+});
 
-process.exit(0);
+// TODO - do we still need this? Prevented db from seeding
+// process.exit(0);

server/seed/seed.ts

@@ -54,7 +54,8 @@ export default function Login() {
     const rootUrl: string = 'https://accounts.google.com/o/oauth2/v2/auth';
 
     const options: Options = {
-      redirect_uri: 'http://db-spy.io/display/',
+      // redirect_uri: 'http://db-spy.io/display/',
+      redirect_uri: 'http://localhost:8080/display/',
       client_id:
         '1050970973422-4am2mv6e621f83lggfcjubkl3hqtoj0k.apps.googleusercontent.com',
       access_type: 'offline',
@@ -76,7 +77,8 @@ export default function Login() {
   const getGithub = (): void => {
     const rootUrl: string = 'https://github.com/login/oauth/authorize';
     const options: Options = {
-      redirect_uri: 'http://db-spy.io/display/',
+      // redirect_uri: 'http://db-spy.io/display/',
+      redirect_uri: 'http://localhost:8080/display/',
       client_id: '18d4ecdcc6ed1cb25240',
       state: 'randomstring',
       allow_signup: 'true',

src/pages/Login.tsx

@@ -11,10 +11,12 @@ export default defineConfig({
     host: true,
     proxy: {
       '/api/': {
-        target: 'http://localhost:3000/',
+        // TODO - vite proxy error
+        // Vite is unable to recognize localhost IPv6 equivalent, so have to change target to the loopback address for IPv4 (http://localhost:3000/ -> http://127.0.0.1:3000/)
+        target: 'http://127.0.0.1:3000/',
         changeOrigin: true,
         secure: false,
-      }
+      },
     },
   },
   build: {