Merge branch 'main' of https://github.com/CS3219-AY2425S1/cs3219-ay2425s1-project-g16 into seed-question-data

Author: TabrizPlv

Makefile

@@ -1,7 +1,10 @@
+setup:
+	./scripts/install-deps.sh
+
 db-up:
 	./scripts/ensure-volume.sh
-	docker-compose --env-file .env.local up -d
+	docker compose --env-file .env.local up -d
 
 db-down:
-	docker-compose --env-file .env.local down
+	docker compose --env-file .env.local down
 

backend/user/src/controllers/auth/index.ts

@@ -4,6 +4,10 @@ import { COOKIE_NAME } from '@/lib/cookies';
 import {
   loginService,
   registerService,
+  checkEmailValidService,
+  checkUsernameValidService,
+  type IEmailValidPayload,
+  type IUsernameValidPayload,
   type ILoginPayload,
   type IRegisterPayload,
 } from '@/services/auth';
@@ -69,3 +73,29 @@ export const register: IRouteHandler = async (req, res) => {
     user: data.user, // Return user data if needed
   });
 };
+
+export const checkUsernameValid: IRouteHandler = async (req, res) => {
+  const { username }: IUsernameValidPayload = req.body;
+  if (!username) {
+    return res.status(StatusCodes.UNPROCESSABLE_ENTITY).json('Malformed Request');
+  }
+  const { code, data, error } = await checkUsernameValidService({ username });
+  if (error || code !== StatusCodes.OK || !data) {
+    const sanitizedErr = error?.message ?? 'An error occurred.';
+    return res.status(code).json(sanitizedErr);
+  }
+  return res.status(StatusCodes.OK).json(data);
+};
+
+export const checkEmailValid: IRouteHandler = async (req, res) => {
+  const { email }: IEmailValidPayload = req.body;
+  if (!email) {
+    return res.status(StatusCodes.UNPROCESSABLE_ENTITY).json('Malformed Request');
+  }
+  const { code, data, error } = await checkEmailValidService({ email });
+  if (error || code !== StatusCodes.OK || !data) {
+    const sanitizedErr = error?.message ?? 'An error occurred.';
+    return res.status(code).json(sanitizedErr);
+  }
+  return res.status(StatusCodes.OK).json(data);
+};

backend/user/src/routes/auth.ts

@@ -1,14 +1,15 @@
 import express from 'express';
 
-import { login, logout, register } from '@/controllers/auth';
+import { checkEmailValid, checkUsernameValid, login, logout, register } from '@/controllers/auth';
 import { limiter } from '@/lib/ratelimit';
 
 const router = express.Router();
 
 router.post('/login', login);
 router.post('/logout', logout);
 router.post('/register', register);
-
+router.post('/username-valid', checkUsernameValid);
+router.post('/email-valid', checkEmailValid);
 router.use(limiter);
 
 export default router;

backend/user/src/services/auth/index.ts

@@ -1,3 +1,4 @@
 export * from './login';
 export * from './register';
 export * from './types';
+export * from './validity_check';

backend/user/src/services/auth/validity_check.ts

@@ -0,0 +1,69 @@
+import { eq, sql } from 'drizzle-orm';
+import { StatusCodes } from 'http-status-codes';
+import { db, users } from '@/lib/db';
+import {
+  IUsernameValidResponse,
+  IUsernameValidPayload,
+  IEmailValidPayload,
+  IEmailValidResponse,
+} from './types';
+
+export const checkUsernameValidService = async (
+  payload: IUsernameValidPayload
+): Promise<IUsernameValidResponse> => {
+  const { username } = payload;
+
+  try {
+    const result = await db
+      .select({ count: sql<number>`count(*)` })
+      .from(users)
+      .where(eq(users.username, username));
+
+    const isValid = result[0].count === 0;
+
+    return {
+      code: StatusCodes.OK,
+      data: {
+        valid: isValid,
+      },
+    };
+  } catch (error) {
+    console.error('Error checking username availability:', error);
+    return {
+      code: StatusCodes.INTERNAL_SERVER_ERROR,
+      error: {
+        message: 'An error occurred while checking username availability',
+      },
+    };
+  }
+};
+
+export const checkEmailValidService = async (
+  payload: IEmailValidPayload
+): Promise<IEmailValidResponse> => {
+  const { email } = payload;
+
+  try {
+    const result = await db
+      .select({ count: sql<number>`count(*)` })
+      .from(users)
+      .where(eq(users.email, email));
+
+    const isValid = result[0].count === 0;
+
+    return {
+      code: StatusCodes.OK,
+      data: {
+        valid: isValid,
+      },
+    };
+  } catch (error) {
+    console.error('Error checking email availability:', error);
+    return {
+      code: StatusCodes.INTERNAL_SERVER_ERROR,
+      error: {
+        message: 'An error occurred while checking email availability',
+      },
+    };
+  }
+};

frontend/src/routes/login/logic.ts

@@ -9,7 +9,13 @@ import { useNavigate } from 'react-router-dom';
 
 export const loginFormSchema = z.object({
   username: z.string().min(1, getEmptyFieldErrorMessage('Username')),
-  password: z.string().min(1, getEmptyFieldErrorMessage('Password')),
+  password: z
+    .string()
+    .min(8, 'Password must be at least 8 characters')
+    .regex(/[A-Z]/, 'Password must contain at least one uppercase letter')
+    .regex(/[a-z]/, 'Password must contain at least one lowercase letter')
+    .regex(/[0-9]/, 'Password must contain at least one number')
+    .regex(/[^A-Za-z0-9]/, 'Password must contain at least one special character'),
 });
 
 type ILoginFormSchema = z.infer<typeof loginFormSchema>;