Skip to content

Implement Email OTP Verification for User Registration #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+1,571 −304
Open

Implement Email OTP Verification for User Registration #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adf8fff
Add OTP to verify user
Kaidama97 Sep 18, 2025
31ecaaf
Refactor OTP
Kaidama97 Sep 19, 2025
50cfebb
feat: implement email OTP verification for user registration
Kaidama97 Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
340 changes: 233 additions & 107 deletions backend/user-service/controller/auth-controller.js
View file
Open in desktop

Large diffs are not rendered by default.

112 changes: 36 additions & 76 deletions backend/user-service/controller/user-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import argon2 from "argon2";
import { isValidObjectId } from "mongoose";
import { UserRepository } from "../model/user-repository.js";
import {
USER_ERRORS,
sendUserErrorResponse,
sendErrorResponse,
} from "../errors/index.js";

export async function createUser(req, res) {
try {
Expand All @@ -9,22 +14,19 @@ export async function createUser(req, res) {
if (existingUser) {
const conflict =
existingUser.username === username ? "username" : "email";
return res.status(409).json({
message: `User with this ${conflict} already exists`,
error: "USER_EXISTS",
return sendUserErrorResponse(res, USER_ERRORS.USER_EXISTS, conflict, {
field: conflict,
});
}
const hashedPassword = await argon2.hash(password, {
type: argon2.argon2id,
memoryCost: parseInt(process.env.ARGON2_MEMORY_COST) || 65536, // 64 MB
timeCost: parseInt(process.env.ARGON2_TIME_COST) || 3,
parallelism: parseInt(process.env.ARGON2_PARALLELISM) || 4,
hashLength: parseInt(process.env.ARGON2_HASH_LENGTH) || 32,
saltLength: parseInt(process.env.ARGON2_SALT_LENGTH) || 16,
memoryCost: parseInt(process.env.ARGON2_MEMORY_COST),
timeCost: parseInt(process.env.ARGON2_TIME_COST),
parallelism: parseInt(process.env.ARGON2_PARALLELISM),
hashLength: parseInt(process.env.ARGON2_HASH_LENGTH),
saltLength: parseInt(process.env.ARGON2_SALT_LENGTH),
});

// Create user data object
const userData = {
username,
email: email.toLowerCase(),
Expand All @@ -39,25 +41,22 @@ export async function createUser(req, res) {
);

return res.status(201).json({
message: `User ${username} created successfully`,
data: formatUserResponse(createdUser),
message: `User ${username} created successfully. Please login to verify your email address.`,
data: {
user: formatUserResponse(createdUser),
},
});
} catch (err) {
console.error("Create user error:", err);

if (err.code === 11000) {
const field = Object.keys(err.keyPattern)[0];
return res.status(409).json({
message: `User with this ${field} already exists`,
error: "DUPLICATE_KEY",
return sendUserErrorResponse(res, USER_ERRORS.DUPLICATE_KEY, field, {
field,
});
}

return res.status(500).json({
message: "Failed to create user",
error: "SERVER_ERROR",
});
return sendUserErrorResponse(res, USER_ERRORS.SERVER_ERROR);
}
}

Expand All @@ -67,10 +66,7 @@ export async function getUserProfile(req, res) {

const user = await _findUserById(userId);
if (!user) {
return res.status(404).json({
message: `User not found`,
error: "USER_NOT_FOUND",
});
return sendErrorResponse(res, USER_ERRORS.USER_NOT_FOUND);
}

return res.status(200).json({
Expand All @@ -79,10 +75,7 @@ export async function getUserProfile(req, res) {
});
} catch (err) {
console.error("Error in getUserProfile:", err);
return res.status(500).json({
message: "Database or server error",
error: "INTERNAL_SERVER_ERROR",
});
return sendErrorResponse(res, USER_ERRORS.INTERNAL_SERVER_ERROR);
}
}

Expand All @@ -91,18 +84,12 @@ export async function getUser(req, res) {
const userId = req.params.id;
const tokenUserId = req.userId;
if (userId !== tokenUserId) {
return res.status(403).json({
message: "Access denied. You can only access your own user data.",
error: "UNAUTHORIZED_ACCESS",
});
return sendErrorResponse(res, USER_ERRORS.UNAUTHORIZED_ACCESS);
}

const user = await _findUserById(userId);
if (!user) {
return res.status(404).json({
message: `User not found`,
error: "USER_NOT_FOUND",
});
return sendErrorResponse(res, USER_ERRORS.USER_NOT_FOUND);
}

return res.status(200).json({
Expand All @@ -111,10 +98,7 @@ export async function getUser(req, res) {
});
} catch (err) {
console.error("Get user error:", err);
return res.status(500).json({
message: "Failed to retrieve user",
error: "SERVER_ERROR",
});
return sendErrorResponse(res, USER_ERRORS.RETRIEVE_SERVER_ERROR);
}
}

Expand All @@ -125,28 +109,19 @@ export async function updateUser(req, res) {

const user = await _findUserById(userId);
if (!user) {
return res.status(404).json({
message: "User not found",
error: "USER_NOT_FOUND",
});
return sendErrorResponse(res, USER_ERRORS.USER_NOT_FOUND);
}
if (username && username !== user.username) {
const existingUser = await _findUserByUsername(username);
if (existingUser && existingUser.id !== userId) {
return res.status(409).json({
message: "Username already exists",
error: "USERNAME_EXISTS",
});
return sendErrorResponse(res, USER_ERRORS.USERNAME_EXISTS);
}
}

if (email && email !== user.email) {
const existingUser = await _findUserByEmail(email);
if (existingUser && existingUser.id !== userId) {
return res.status(409).json({
message: "Email already exists",
error: "EMAIL_EXISTS",
});
return sendErrorResponse(res, USER_ERRORS.EMAIL_EXISTS);
}
}
const updateData = {};
Expand All @@ -160,11 +135,11 @@ export async function updateUser(req, res) {
if (password) {
const hashedPassword = await argon2.hash(password, {
type: argon2.argon2id,
memoryCost: parseInt(process.env.ARGON2_MEMORY_COST) || 65536,
timeCost: parseInt(process.env.ARGON2_TIME_COST) || 3,
parallelism: parseInt(process.env.ARGON2_PARALLELISM) || 4,
hashLength: parseInt(process.env.ARGON2_HASH_LENGTH) || 32,
saltLength: parseInt(process.env.ARGON2_SALT_LENGTH) || 16,
memoryCost: parseInt(process.env.ARGON2_MEMORY_COST),
timeCost: parseInt(process.env.ARGON2_TIME_COST),
parallelism: parseInt(process.env.ARGON2_PARALLELISM),
hashLength: parseInt(process.env.ARGON2_HASH_LENGTH),
saltLength: parseInt(process.env.ARGON2_SALT_LENGTH),
});
updatedUser = await UserRepository.updatePassword(userId, hashedPassword);
if (Object.keys(updateData).length > 0) {
Expand All @@ -180,10 +155,7 @@ export async function updateUser(req, res) {
});
} catch (err) {
console.error("Update user error:", err);
return res.status(500).json({
message: "Failed to update user",
error: "SERVER_ERROR",
});
return sendErrorResponse(res, USER_ERRORS.UPDATE_SERVER_ERROR);
}
}

Expand All @@ -194,10 +166,7 @@ export async function updateUserPrivilege(req, res) {

const user = await _findUserById(userId);
if (!user) {
return res.status(404).json({
message: "User not found",
error: "USER_NOT_FOUND",
});
return sendErrorResponse(res, USER_ERRORS.USER_NOT_FOUND);
}

const updatedUser = await UserRepository.updatePrivilege(userId, isAdmin);
Expand All @@ -208,10 +177,7 @@ export async function updateUserPrivilege(req, res) {
});
} catch (err) {
console.error("Update user privilege error:", err);
return res.status(500).json({
message: "Failed to update user privilege",
error: "SERVER_ERROR",
});
return sendErrorResponse(res, USER_ERRORS.PRIVILEGE_SERVER_ERROR);
}
}

Expand All @@ -221,10 +187,7 @@ export async function deleteUser(req, res) {

const user = await _findUserById(userId);
if (!user) {
return res.status(404).json({
message: "User not found",
error: "USER_NOT_FOUND",
});
return sendErrorResponse(res, USER_ERRORS.USER_NOT_FOUND);
}
if (process.env.NODE_ENV === "production") {
await UserRepository.softDelete(userId);
Expand All @@ -239,10 +202,7 @@ export async function deleteUser(req, res) {
}
} catch (err) {
console.error("Delete user error:", err);
return res.status(500).json({
message: "Failed to delete user",
error: "SERVER_ERROR",
});
return sendErrorResponse(res, USER_ERRORS.DELETE_SERVER_ERROR);
}
}

Expand All @@ -255,6 +215,7 @@ export function formatUserResponse(user) {
email: user.email,
isAdmin: user.isAdmin,
isActive: user.isActive,
isVerified: user.isVerified,
createdAt: user.createdAt,
updatedAt: user.updatedAt,
lastLogin: user.lastLogin,
Expand All @@ -268,7 +229,6 @@ export function formatUserResponse(user) {
};
}

// Helper functions for database operations
async function _findUserByUsernameOrEmail(username, email) {
return await UserRepository.findByUsernameOrEmail(username, email);
}
Expand Down
25 changes: 2 additions & 23 deletions backend/user-service/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,10 @@ services:
container_name: peerprep-user-service
ports:
- "3001:3001"
env_file:
- .env.docker
environment:
- NODE_ENV=production
- PORT=3001
- REDIS_URL=redis://redis:6379
# MongoDB connection (you'll need to update these)
- DB_CLOUD_URI=${DB_CLOUD_URI}
- DB_LOCAL_URI=mongodb://host.docker.internal:27017/peerprepUserServiceDB
- ENV=${ENV:-PROD}
# JWT Configuration
- JWT_SECRET=${JWT_SECRET}
- JWT_REFRESH_SECRET=${JWT_REFRESH_SECRET}
- JWT_EXPIRES_IN=${JWT_EXPIRES_IN:-15m}
- JWT_REFRESH_EXPIRES_IN=${JWT_REFRESH_EXPIRES_IN:-7d}
# Cookie Configuration
- COOKIE_DOMAIN=${COOKIE_DOMAIN:-localhost}
- COOKIE_SECURE=${COOKIE_SECURE:-false}
- COOKIE_SAME_SITE=${COOKIE_SAME_SITE:-lax}
# Security Configuration
- ARGON2_MEMORY_COST=${ARGON2_MEMORY_COST:-65536}
- ARGON2_TIME_COST=${ARGON2_TIME_COST:-3}
- ARGON2_PARALLELISM=${ARGON2_PARALLELISM:-4}
- ARGON2_HASH_LENGTH=${ARGON2_HASH_LENGTH:-32}
- ARGON2_SALT_LENGTH=${ARGON2_SALT_LENGTH:-16}
# CORS Configuration
- ALLOWED_ORIGINS=${ALLOWED_ORIGINS:-http://localhost:3000,http://localhost:3001,http://localhost:3002}
depends_on:
- redis
networks:
Expand Down
Loading