Merge pull request #24 from phillip-che/encryption-branch

Author: andrewjunggg

client/components/LoginFields.tsx

@@ -10,9 +10,10 @@ import { useSocket } from '@/context/socket.context';
 import { Divider } from '@mui/material';
 
 const LoginFields = () => {
-  const { socket, username, setUsername, roomID } = useSocket();
-  const [usernameInput, setUsernameInput] = useState<string>('');
-  const [roomIDInput, setRoomIDInput] = useState<string>('');
+    
+  const { socket, setUsername, roomID } = useSocket();
+  const [usernameInput, setUsernameInput] = useState<string>("");
+  const [roomIDInput, setRoomIDInput] = useState<string>("");
 
   const handleUsernameChange = (e: any) => {
     setUsernameInput(e.target.value);

client/context/socket.context.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { createContext, useContext, useState, useEffect, useRef } from 'react';
+import { createContext, useContext, useState, useEffect } from 'react';
 import io, { Socket } from 'socket.io-client';
 import EVENTS from '@/config/events';
 import crypto from 'crypto'
@@ -22,16 +22,15 @@ interface Context {
 }
 
 const SOCKET_URL =
-  process.env.NEXT_PUBLIC_SOCKET_URL || 'https://cypherchat.lol:4000';
+  process.env.NEXT_PUBLIC_SOCKET_URL || "http://localhost:4000";
 
 const socket = io(SOCKET_URL, {
   reconnection: true,
   upgrade: true,
   transports: ['websocket', 'polling'],
 });
 
-const aesKeyString = "fcba69ac69c7182417c68a5f6f78f6a24072156dd444013e69a2820f631164e7";
-const aesKey = Buffer.from(aesKeyString, 'hex');
+const aesKey = Buffer.from(process.env.NEXT_PUBLIC_AES_KEY_STRING as string, 'hex');
 
 const SocketContext = createContext<Context>({
   socket,

server/src/app.ts

@@ -62,7 +62,7 @@ httpServer.listen(port, () => {
 
     socket.on(EVENTS.CLIENT.SEND_MESSAGE, (data) => {
       console.log(`${data.username} sent a ${data.type} to room: ${data.roomID}`);
-
+      console.log(`Encrypted Message: ${data.body}`);
       socket.to(data.roomID).emit(EVENTS.SERVER.SEND_MESSAGE, 
         {
           type: data.type,