Skip to content

Commit 26ad3c9

Browse files
committed
fix: improve return auth service
1 parent dac6a27 commit 26ad3c9

File tree

2 files changed

+10
-25
lines changed

2 files changed

+10
-25
lines changed

src/controllers/Auth/controller.ts

+9-25
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ routes.post(
1111
asyncHandler(async function signUp(req: Request, res: Response) {
1212
const formData = req.getBody()
1313

14-
const { message, data } = await AuthService.signUp(formData)
15-
const buildResponse = BuildResponse.get({ message, data })
14+
const data = await AuthService.signUp(formData)
15+
const buildResponse = BuildResponse.get(data)
1616

1717
return res.status(201).json(buildResponse)
1818
})
@@ -22,25 +22,12 @@ routes.post(
2222
'/auth/sign-in',
2323
asyncHandler(async function signIn(req: Request, res: Response) {
2424
const formData = req.getBody()
25-
const {
26-
accessToken,
27-
expiresIn,
28-
tokenType,
29-
refreshToken,
30-
user,
31-
} = await AuthService.signIn(formData)
32-
const buildResponse = BuildResponse.get({
33-
message: 'Login successfully',
34-
accessToken,
35-
expiresIn,
36-
tokenType,
37-
refreshToken,
38-
user,
39-
})
25+
const data = await AuthService.signIn(formData)
26+
const buildResponse = BuildResponse.get(data)
4027

4128
return res
42-
.cookie('token', accessToken, {
43-
maxAge: Number(expiresIn) * 1000, // 7 Days
29+
.cookie('token', data.accessToken, {
30+
maxAge: Number(data.expiresIn) * 1000, // 7 Days
4431
httpOnly: true,
4532
path: '/v1',
4633
secure: process.env.NODE_ENV === 'production',
@@ -55,13 +42,10 @@ routes.post(
5542
asyncHandler(async function authRefreshToken(req: Request, res: Response) {
5643
const { email, refreshToken } = req.getBody()
5744

58-
const {
59-
accessToken,
60-
expiresIn,
61-
tokenType,
62-
} = await RefreshTokenService.getAccessToken(email, refreshToken)
45+
const data = await RefreshTokenService.getAccessToken(email, refreshToken)
46+
const buildResponse = BuildResponse.get(data)
6347

64-
return res.status(200).json({ accessToken, expiresIn, tokenType })
48+
return res.status(200).json(buildResponse)
6549
})
6650
)
6751

src/controllers/Auth/service.ts

+1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ class AuthService {
125125
await createDirectory(userData.id)
126126

127127
return {
128+
message: 'Login successfully',
128129
accessToken,
129130
expiresIn,
130131
tokenType: 'Bearer',

0 commit comments

Comments
 (0)