Update

Author: Adam Robins

.env

@@ -1 +1,2 @@
-SECRET_KEY=KEY
+SECRET_KEY=KEY
+MONGODB_URI=mongodb://127.0.0.1:27017/benderirc

main.ts

@@ -55,7 +55,7 @@ app.use("/login", Express.static("public/login/login.html"));
 
 app.post("/join/dm/:nick", isLoggedIn, async (req, res) => {
   const nick = req.params.nick;
-  var dms = await MongooseDal.getDirectMessagesForUser(UserSettings.nick, nick);
+  var dms = await MongooseDal.getDirectMessagesForUser("tes", nick);
   res.send({ nick: nick, messages: dms?.messages || [] });
 });
 
@@ -75,7 +75,7 @@ app.post("/channel/join", isLoggedIn, async (req, res) => {
     active: true,
     name: req.body.channel,
     description: "Test Channel",
-    owner: UserSettings.nick, // TODO: This should ideally be the logged-in user's nick
+    owner: "UserSettings.nick", // TODO: This should ideally be the logged-in user's nick
     created_at: new Date(),
     updated_at: new Date(),
     messages: [],

models/user.ts

@@ -38,4 +38,5 @@ const userSchema = new Schema<IUser>({
 
 const User = model<IUser>('User', userSchema);
 
-export default User;
+export default User;
+export { IUser }; // Export interfaces for use in other modules

public/login/login.html

@@ -42,7 +42,7 @@ <h1 class="text-xl mb-8">Login</h1>
         var password = document.getElementById('password').value;
 
         // POST with axios to /login
-        axios.post('http://127.0.0.1:3000/user/login', {
+        axios.post('http://127.0.0.1:3000/api/user/login', {
             username: username,
             password: password
         }).then((response) => {

router/index.ts

@@ -1,5 +1,4 @@
 import express from 'express';
-import express from 'express';
 // import { channelRouter } from './channel'; // Not currently used
 import { nickservRouter } from './nickserv';
 import { chanservRouter } from './chanserv';

services/mongo.ts

@@ -1,12 +1,34 @@
 // Mongoose controller
 import mongoose from "mongoose";
+import { log } from "mercedlogger";
 import { Channel, DirectMessages, IChannel, IMessage } from "../models/channel";
 import { MessageQueue, IMessageQueue } from "../models/messageQueue";
 
 // MONGODB MONGOOS DAL CLASS
 const MongooseDal = {
     connect: async () => {
-        return await mongoose.connect("mongodb://127.0.0.1:27017/benderirc");
+        const defaultURI = "mongodb://127.0.0.1:27017/benderirc";
+        let connectionString = process.env.MONGODB_URI;
+
+        if (connectionString) {
+            log.red("MongoDB URI found in environment variables.");
+        } else {
+            connectionString = defaultURI;
+            log.red(`MONGODB_URI not set in environment. Using default: ${connectionString}`);
+        }
+
+        // Basic sanitization to avoid logging credentials if present in the URI
+        const safeLogURI = connectionString.includes('@') ? `mongodb://${connectionString.split('@').pop()}` : connectionString;
+        log.cyan(`Attempting to connect to MongoDB at ${safeLogURI}...`);
+        
+        try {
+            await mongoose.connect(connectionString);
+            log.cyan("MongoDB Connected Successfully to " + safeLogURI);
+        } catch (error) {
+            log.red("MongoDB Connection Error:", error.message);
+            // Re-throw the error or handle it as per application's error handling strategy
+            throw error; 
+        }
     },
     createChannel: async (channel: IChannel) => {
         // Create only if the channel doesn't have the same name

services/userService.ts

@@ -1,7 +1,7 @@
 import dotenv from 'dotenv';
 dotenv.config();
 
-// import { SaveUser, GetUser, UserModel } from '../models/userSchema'; // Temporarily commented out
+import User, { IUser } from '../models/user';
 import bcrypt from "bcryptjs";
 import jwt from "jsonwebtoken";
 import { log } from "mercedlogger";
@@ -10,43 +10,39 @@ const SECRET_KEY = process.env.SECRET_KEY ? process.env.SECRET_KEY : "SECRET_KEY
 log.magenta("SECRET KEY FOUND : " + SECRET_KEY);
 
 const register = async (req, callback) => {
-    // try {
-    //     const { username, email, password } = req;
-    //     const pw = await bcrypt.hash(password, 12);
-    //     const user = new UserModel(username, email, pw); // UserModel is from the deleted file
-    //     const token = createJWT(user);
-    //     log.magenta("REGISTER", 'User Created Successfully' + username);
-    //     await SaveUser(user); // SaveUser is from the deleted file
+    try {
+        const { username, email, password } = req;
+        const pw = await bcrypt.hash(password, 12);
+        const user = new User({ username, email, password: pw });
+        const token = createJWT(user);
+        log.magenta("REGISTER", 'User Created Successfully' + username);
+        await user.save();
 
-    //     callback(null, { token });
-    // } catch (error) {
-    //     log.red("REGISTER", 'Could not register' + error);
-    //     callback({ error: error.message }, null);
-    // }
-    log.warn("userService.register is currently disabled due to missing models/userSchema.ts");
-    callback({ error: "Registration is temporarily disabled." }, null);
+        callback(null, { token });
+    } catch (error) {
+        log.red("REGISTER", 'Could not register' + error);
+        callback({ error: error.message }, null);
+    }
 }
 
 const login = async (req, callback) => {
-    // try {
-    //     const { username, password } = req;
-    //     const user = await GetUser(username); // GetUser is from the deleted file
-    //     if (await bcrypt.compare(password, user.password)) {
-    //         const token = createJWT(user);
-    //         callback(null, { token: token, username: user.username });
-    //     } else {
-    //         callback({ error: "Invalid Credentials" });
-    //     }
-    // } catch (error) {
-    //     callback({ error: error.message }, null);
-    // }
-    log.warn("userService.login is currently disabled due to missing models/userSchema.ts");
-    callback({ error: "Login is temporarily disabled." }, null);
+    try {
+        const { username, password } = req;
+        const user = await User.findOne({ username: username });
+        if (user && await bcrypt.compare(password, user.password)) {
+            const token = createJWT(user);
+            callback(null, { token: token, username: user.username });
+        } else {
+            callback({ error: "Invalid Credentials" });
+        }
+    } catch (error) {
+        callback({ error: error.message }, null);
+    }
 }
 
-const createJWT = (user) => { // user type here was UserModel, will need adjustment if used
+const createJWT = (user: IUser) => {
     return jwt.sign(
-        { user }, // This 'user' object structure might need to align with actual User model from models/user.ts
+        { user },
         SECRET_KEY,
         { expiresIn: "24h" }
     );