Merge branch 'main' into enhancement/api-gateway

Author: jq1836

.env.sample

@@ -4,24 +4,29 @@ COMPOSE_PATH_SEPARATOR=:
 COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
 
 ## Frontend variables
-FRONTEND_PORT=
+FRONTEND_PORT=3000
 # BASE_URI only needs to be provided if hosting outside of cluster
 BASE_URI=
 
 ## Question service variables
-QUESTION_SVC_PORT=
+QUESTION_SVC_PORT=8000
 QUESTION_SVC_DB_URI=
 
 ## User service variables
-USER_SVC_PORT=
+USER_SVC_PORT=3001
 USER_SVC_DB_URI=
 JWT_SECRET=
 EMAIL_ADDRESS=
 EMAIL_PASSWORD=
 
 ## Matching service variables
-MATCHING_SVC_PORT=
-MATCHING_SVC_REDIS_PORT=
+MATCHING_SVC_PORT=6969
+
+## Redis variables
+REDIS_PORT=6379
+
+## Redisinsight variables
+REDIS_INSIGHT_PORT=5540
 
 ## API Gateway variables
 API_GATEWAY_PORT=

docker-compose.yml

@@ -31,6 +31,10 @@ services:
       context: ./matching-service
     environment:
       - PORT=$MATCHING_SVC_PORT
+      - REDIS_HOST=redis
+      - REDIS_PORT=$REDIS_PORT
+    depends_on:
+      - redis
 
   api-gateway:
     image: nginx:1.26
@@ -53,3 +57,15 @@ services:
   redis:
     image: redis:7.4-alpine
     restart: always
+    ports:
+      - $REDIS_PORT:$REDIS_PORT
+
+  # access RedisInsight at http://localhost:5540
+  # connect to redis on redis insight at redis:6379
+  redisinsight:
+    image: redis/redisinsight:latest
+    restart: always
+    ports:
+      - $REDIS_INSIGHT_PORT:$REDIS_INSIGHT_PORT  # Expose RedisInsight UI on port 5540
+    depends_on:
+      - redis

frontend/components/auth/reset-password-form.tsx

@@ -3,6 +3,7 @@
 import { useState } from "react";
 import { useRouter } from "next/navigation";
 import { resetPassword } from "@/lib/reset-password";
+import { isPasswordComplex } from "@/lib/password";
 import { useToast } from "@/components/hooks/use-toast";
 
 import { Button } from "@/components/ui/button";
@@ -24,14 +25,22 @@ export function ResetPasswordForm({ token }: { token: string }) {
 
   const handleSubmit = async (event: React.FormEvent) => {
     event.preventDefault();
-    // TODO: Add validation for password
     if (password !== passwordConfirmation) {
       toast({
         title: "Password Mismatch",
         description: "The passwords you entered do not match",
       });
       return;
     }
+    if (!isPasswordComplex(passwordConfirmation)) {
+      toast({
+        title: "Weak Password",
+        description:
+          "Password must be at least 8 characters long, include 1 uppercase letter and 1 special character.",
+      });
+      return;
+    }
+
     const res = await resetPassword(token, password);
     if (!res.ok) {
       toast({

frontend/components/auth/sign-up-form.tsx

@@ -5,6 +5,7 @@ import { useState } from "react";
 import { useRouter } from "next/navigation";
 import { toast } from "@/components/hooks/use-toast";
 import { signUp } from "@/lib/signup";
+import { isPasswordComplex } from "@/lib/password";
 
 import { Button } from "@/components/ui/button";
 import {
@@ -34,6 +35,14 @@ export function SignUpForm() {
       });
       return;
     }
+    if (!isPasswordComplex(passwordConfirmation)) {
+      toast({
+        title: "Weak Password",
+        description:
+          "Password must be at least 8 characters long, include 1 uppercase letter and 1 special character.",
+      });
+      return;
+    }
     const res = await signUp(username, email, password);
     if (!res.ok) {
       toast({

frontend/components/questions/question-form-modal.tsx

@@ -30,14 +30,16 @@ interface QuestionFormModalProps {
 }
 
 const QuestionFormModal: React.FC<QuestionFormModalProps> = ({ ...props }) => {
+  const initialQuestionState: Question = {
+    id: "",
+    title: "",
+    category: "",
+    complexity: "easy",
+    description: "",
+  };
+
   const [question, setQuestion] = useState<Question>(
-    props.initialData || {
-      id: "",
-      title: "",
-      category: "",
-      complexity: "easy",
-      description: "",
-    }
+    props.initialData || initialQuestionState
   );
 
   useEffect(() => {
@@ -50,6 +52,16 @@ const QuestionFormModal: React.FC<QuestionFormModalProps> = ({ ...props }) => {
     e.preventDefault();
 
     props.handleSubmit(question);
+    setQuestion(initialQuestionState);
+  };
+
+  const handleExit = () => {
+    if (props.initialData) {
+      setQuestion(props.initialData);
+    } else {
+      setQuestion(initialQuestionState);
+    }
+    props.setShowModal(false);
   };
 
   return (
@@ -136,10 +148,7 @@ const QuestionFormModal: React.FC<QuestionFormModalProps> = ({ ...props }) => {
                 {props.isAdmin && (
                   <Button type="submit">{props.submitButtonText}</Button>
                 )}
-                <Button
-                  variant="destructive"
-                  onClick={() => props.setShowModal(false)}
-                >
+                <Button variant="destructive" onClick={handleExit}>
                   Exit
                 </Button>
               </DialogFooter>

frontend/components/user-settings/user-settings.tsx

@@ -25,6 +25,8 @@ import { useAuth } from "@/app/auth/auth-context";
 import { cn } from "@/lib/utils";
 import { User, UserSchema } from "@/lib/schemas/user-schema";
 import { AuthType, userServiceUri } from "@/lib/api-uri";
+import { isPasswordComplex } from "@/lib/password";
+import { userServiceUri } from "@/lib/api-uri";
 
 const fetcher = async (url: string): Promise<User> => {
   // Retrieve the JWT token from localStorage
@@ -300,16 +302,6 @@ export default function UserSettings({ userId }: { userId: string }) {
     }
   }, [newPassword, confirmPassword]);
 
-  const isPasswordComplex = (password: string) => {
-    const minLength = 8;
-    const hasUpperCase = /[A-Z]/.test(password);
-    const hasSpecialChar = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]+/.test(
-      password
-    );
-
-    return password.length >= minLength && hasUpperCase && hasSpecialChar;
-  };
-
   if (isLoading) {
     return <LoadingScreen />;
   }

frontend/lib/password.ts

@@ -0,0 +1,9 @@
+export const isPasswordComplex = (password: string) => {
+  const minLength = 8;
+  const hasUpperCase = /[A-Z]/.test(password);
+  const hasSpecialChar = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]+/.test(
+    password
+  );
+
+  return password.length >= minLength && hasUpperCase && hasSpecialChar;
+};

matching-service/.gitignore

@@ -1,3 +1,2 @@
 .venv
-app/__pycache__
-app/routers/__pycache__
+**/__pycache__