Skip to content

Commit 9ffd324

Browse files
abhishek-nexgen-devabhishek-nexgen-dev
authored
Merge pull request #39 from youneedgreg/backend-auth-update
Update: Update Backend Auth Module for Signup Flow (Model, Controller, Validator, Types)
2 parents 3f707a7 + 71ec928 commit 9ffd324

12 files changed

Lines changed: 149 additions & 65 deletions

File tree

‎LocalMind-Backend/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"@types/mongoose": "^5.11.97",
5656
"@types/morgan": "^1.9.10",
5757
"argon2": "^0.44.0",
58+
"bcrypt": "^5.1.1",
5859
"axios": "^1.12.2",
5960
"bcrypt": "^6.0.0",
6061
"chalk": "^5.6.2",

‎LocalMind-Backend/src/api/v1/user/__test__/user.test.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ describe('User Registration Tests', () => {
3838
}
3939

4040
try {
41-
const res = await axios.post(`${env.BACKEND_URL}/user/register`, {
42-
name: 'Test User',
41+
const res = await axios.post(`${env.BACKEND_URL}/auth/signup`, {
42+
firstName: 'Test User',
43+
birthPlace: 'Test City',
44+
location: 'Test Country',
4345
email: testEmail,
4446
password: 'Test@1234',
4547
})
@@ -70,8 +72,10 @@ describe('User Registration Tests', () => {
7072
}
7173

7274
try {
73-
const res = await axios.post(`${env.BACKEND_URL}/user/register`, {
74-
name: 'Duplicate User',
75+
const res = await axios.post(`${env.BACKEND_URL}/auth/signup`, {
76+
firstName: 'Duplicate User',
77+
birthPlace: 'Duplicate City',
78+
location: 'Duplicate Country',
7579
email: testEmail,
7680
password: 'Test@1234',
7781
})
@@ -81,7 +85,7 @@ describe('User Registration Tests', () => {
8185
throw Error('Should not be able to register with existing email')
8286
} catch (error: any) {
8387
expect(error.response).toBeDefined()
84-
expect(error.response.status).toBe(404)
88+
expect(error.response.status).toBe(409)
8589
expect(error.response.data.message).toMatch(/already exists/i)
8690
}
8791
}, 10000)

‎LocalMind-Backend/src/api/v1/user/user.constant.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ enum UserConstant {
6060
INVALID_INPUT = 'User is not available in request',
6161
INVALID_CREDENTIALS = 'Invalid credentials',
6262
NAME_REQUIRED = 'Name is required!',
63+
FIRST_NAME_REQUIRED = 'First name is required',
64+
BIRTH_PLACE_REQUIRED = 'Birth place is required',
65+
LOCATION_REQUIRED = 'Location is required',
66+
INVALID_ROLE = 'Invalid user role',
67+
INVALID_PORTFOLIO_URL = 'Portfolio URL is invalid',
68+
BIO_TOO_LONG = 'Bio exceeds the maximum allowed length',
6369

6470
// ✅ DATABASE & SERVER ERRORS
6571

@@ -84,3 +90,15 @@ enum UserConstant {
8490
}
8591

8692
export default UserConstant
93+
94+
export const AllowedUserRoles = ['user', 'admin', 'creator'] as const
95+
96+
export const PasswordConfig = {
97+
minLength: 8,
98+
maxLength: 20,
99+
saltRounds: 10,
100+
}
101+
102+
export const BioConfig = {
103+
maxLength: 500,
104+
}

‎LocalMind-Backend/src/api/v1/user/user.controller.ts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,17 @@ class UserController {
3030
try {
3131
const validatedData = await userRegisterSchema.parseAsync(req.body)
3232

33-
if (!req.body.password) {
34-
throw new Error(UserConstant.PASSWORD_REQUIRED)
33+
const existingUser = await UserUtils.findUserByEmail(validatedData.email)
34+
35+
if (existingUser) {
36+
throw new Error(UserConstant.EMAIL_ALREADY_EXISTS)
3537
}
3638

3739
const user = await userService.createUser(validatedData)
3840

39-
const userObj = {
40-
id: user._id,
41-
name: user.name,
42-
email: user.email,
43-
role: user.role,
44-
}
41+
42+
const userObj = UserUtils.sanitizeUser(user)
43+
4544

4645
const token = UserUtils.generateToken({
4746
userId: String(user._id),
@@ -87,6 +86,10 @@ class UserController {
8786

8887
SendResponse.success(res, UserConstant.LOGIN_USER_SUCCESS, { user, token }, StatusConstant.OK)
8988
} catch (err: any) {
89+
if (err?.name === 'ZodError') {
90+
SendResponse.error(res, err.message || UserConstant.INVALID_CREDENTIALS, 400, err)
91+
return
92+
}
9093
SendResponse.error(res, err.message || UserConstant.INVALID_CREDENTIALS, 401, err)
9194
}
9295
}
@@ -110,7 +113,6 @@ class UserController {
110113
}
111114

112115
const userObj: Partial<IUser> = { ...user }
113-
delete userObj.password
114116

115117
SendResponse.success(res, UserConstant.USER_PROFILE_SUCCESS, userObj, 200)
116118
} catch (err: any) {

‎LocalMind-Backend/src/api/v1/user/user.middleware.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class UserMiddleware {
1212
throw new Error(UserConstant.TOKEN_MISSING)
1313
}
1414

15-
const decodedData: IUser | null = UserUtils.verifyToken(token)
15+
const decodedData: Partial<IUser> | null = UserUtils.verifyToken(token)
1616

1717
if (!decodedData) {
1818
throw new Error(UserConstant.INVALID_TOKEN)

‎LocalMind-Backend/src/api/v1/user/user.model.ts‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
import mongoose, { Schema, Model } from 'mongoose'
22
import { IUser } from './user.type'
3+
import { AllowedUserRoles } from './user.constant'
34

45
const userSchema: Schema<IUser> = new Schema<IUser>(
56
{
6-
name: {
7+
firstName: {
78
type: String,
89
required: true,
10+
trim: true,
911
},
1012
email: {
1113
type: String,
1214
required: true,
1315
unique: true,
1416
index: true,
17+
lowercase: true,
18+
trim: true,
1519
},
1620
password: {
1721
type: String,
@@ -20,8 +24,29 @@ const userSchema: Schema<IUser> = new Schema<IUser>(
2024
},
2125
role: {
2226
type: String,
27+
enum: AllowedUserRoles,
2328
default: 'user',
2429
},
30+
birthPlace: {
31+
type: String,
32+
required: true,
33+
trim: true,
34+
},
35+
location: {
36+
type: String,
37+
required: true,
38+
trim: true,
39+
},
40+
portfolioUrl: {
41+
type: String,
42+
default: null,
43+
trim: true,
44+
},
45+
bio: {
46+
type: String,
47+
default: null,
48+
trim: true,
49+
},
2550
apikey: {
2651
type: String,
2752
default: null,

‎LocalMind-Backend/src/api/v1/user/user.routes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import userController from './user.controller'
55
import userMiddleware from './user.middleware'
66

77
router.post('/v1/auth/signup', userController.register)
8+
router.post('/v1/user/login', userController.login)
89

9-
router.post('/v1/auth/login', userController.login)
1010

1111
router.get('/v1/auth/apiKey/generate', userMiddleware.middleware, userController.apiEndPointCreater)
1212
router.get('/v1/auth/profile', userMiddleware.middleware, userController.profile)

‎LocalMind-Backend/src/api/v1/user/user.service.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ class userService {
2828
const user = await User.create({
2929
...data,
3030
password: hashPassword,
31+
role: data.role || 'user',
32+
portfolioUrl: data.portfolioUrl ?? null,
33+
bio: data.bio ?? null,
3134
})
3235
return user
3336
}

‎LocalMind-Backend/src/api/v1/user/user.type.ts‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1+
import { AllowedUserRoles } from './user.constant'
2+
3+
export type UserRole = (typeof AllowedUserRoles)[number]
4+
15
export interface IUser {
2-
_id?: string | undefined
3-
name?: string | null
6+
_id?: string
7+
firstName: string
48
email: string
59
password?: string
6-
role?: string
10+
role?: UserRole
11+
birthPlace: string
12+
location: string
13+
portfolioUrl?: string | null
14+
bio?: string | null
715
apikey?: string | null
816
model?: string | null
917
modelApiKey?: string | null
18+
createdAt?: Date
19+
updatedAt?: Date
1020
}

‎LocalMind-Backend/src/api/v1/user/user.utils.ts‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import jwt, { SignOptions } from 'jsonwebtoken'
22
import { env } from '../../../constant/env.constant'
33
import { IUser } from './user.type'
44
import User from './user.model'
5+
import bcrypt from 'bcrypt'
56
import * as argon2 from 'argon2'
6-
import UserConstant from './user.constant'
7+
import UserConstant, { PasswordConfig } from './user.constant'
78

89
export interface JwtPayload {
910
userId: string
@@ -21,7 +22,7 @@ class UserUtils {
2122
} as SignOptions)
2223
}
2324

24-
public static verifyToken(token: string): IUser | null {
25+
public static verifyToken(token: string): Partial<IUser> | null {
2526
try {
2627
const decoded = jwt.verify(token, this.JWT_SECRET)
2728

@@ -61,11 +62,11 @@ class UserUtils {
6162
if (!PassMatch) {
6263
throw new Error(UserConstant.INVALID_PASSWORD)
6364
}
64-
const userObj: IUser = user.toObject()
65-
delete (userObj as { password?: string }).password
66-
delete (userObj as { createdAt?: Date }).createdAt
67-
delete (userObj as { updatedAt?: Date }).updatedAt
68-
delete (userObj as { __v?: number }).__v
65+
const userObj = this.sanitizeUser(user)
66+
67+
if (!userObj) {
68+
throw new Error(UserConstant.USER_NOT_FOUND)
69+
}
6970

7071
const token = this.generateToken({
7172
userId: String(user._id),
@@ -84,22 +85,16 @@ class UserUtils {
8485

8586
public static async findById(userId: string): Promise<IUser | null> {
8687
const user = await User.findById(userId)
87-
return user
88+
return this.sanitizeUser(user) as IUser | null
8889
}
8990

9091
public static async passwordHash(password: string): Promise<string> {
91-
return await argon2.hash(password)
92+
return bcrypt.hash(password, PasswordConfig.saltRounds)
9293
}
9394

9495
public static async findUserByEmail(email: string): Promise<Partial<IUser> | null> {
9596
const user = await User.findOne({ email })
96-
if (!user) return null
97-
const userObj = user.toObject() as IUser
98-
delete (userObj as { password?: string }).password
99-
delete (userObj as { createdAt?: Date }).createdAt
100-
delete (userObj as { updatedAt?: Date }).updatedAt
101-
delete (userObj as { __v?: number }).__v
102-
return userObj
97+
return this.sanitizeUser(user)
10398
}
10499

105100
private static async passwordMatching({
@@ -109,7 +104,24 @@ class UserUtils {
109104
dbPass: string
110105
userPass: string
111106
}): Promise<boolean> {
112-
return await argon2.verify(dbPass, userPass)
107+
const isBcryptMatch = await bcrypt.compare(userPass, dbPass)
108+
if (isBcryptMatch) return true
109+
110+
try {
111+
return await argon2.verify(dbPass, userPass)
112+
} catch {
113+
return false
114+
}
115+
}
116+
public static sanitizeUser(user: IUser | null): Partial<IUser> | null {
117+
if (!user) return null
118+
const userObj = typeof (user as any).toObject === 'function' ? (user as any).toObject() : { ...user }
119+
120+
delete (userObj as { password?: string }).password
121+
delete (userObj as { __v?: number }).__v
122+
delete (userObj as { apikey?: string | null }).apikey
123+
delete (userObj as { modelApiKey?: string | null }).modelApiKey
124+
return userObj as Partial<IUser>
113125
}
114126
public static maskApiKey(apiKey: string): string {
115127
if (!apiKey || apiKey.length < 8) return '*'

0 commit comments

Comments
 (0)