ndacremont/lego
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: use memberService module in controllers

Browse Source
This commit is contained in:
Nemo D'ACREMONT 2024-11-08 11:45:42 +01:00
parent f1d41e6960
commit 061ec56e72
No known key found for this signature in database
GPG Key ID: 6E5BCE8022FA8276
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
back-end/src/controllers/auth.controller.ts
View File

@ -3,7 +3,7 @@ import bcrypt from 'bcrypt';
import { SignJWT } from 'jose';
import { JWT_ISSUER, JWT_AUDIENCE, JWT_SECRET, JWT_EXPIRATION, JWT_SECRET_KEY } from '../config/auth.config';
import { Member, User } from '../types/member';
import { getMember, createMember, userAdapter } from './member.controller';
import memberService from '../services/member.service';
import { Either, eitherLeft, eitherRight } from '../utils/utils';
const register = (req: Request, res: Response) => {
@ -22,7 +22,7 @@ const register = (req: Request, res: Response) => {
res.status(500).send();
return;
}
const member: Either<Member, string> = await createMember(name, hash);
const member: Either<Member, string> = await memberService.createMember(name, hash);
if (member.hasRight) {
res.status(401).send(member.right);
return;
@ -33,7 +33,7 @@ const register = (req: Request, res: Response) => {
.setIssuer(JWT_ISSUER)
.setExpirationTime(JWT_EXPIRATION)
.sign(JWT_SECRET_KEY);
res.status(200).send({ member: userAdapter(member.left), token: token});
res.status(200).send({ member: memberService.userAdapter(member.left), token: token});
});
});
};
@ -44,7 +44,7 @@ const login = async (req: Request, res: Response) => {
return;
}
const name: string = req.body.name;
const member: Either<Member, string> = await getMember(name);
const member: Either<Member, string> = await memberService.getMember(name);
if (member.hasRight) {
res.send(member.right).send();
return;
@ -64,7 +64,7 @@ const login = async (req: Request, res: Response) => {
.setIssuer(JWT_ISSUER)
.setExpirationTime(JWT_EXPIRATION)
.sign(JWT_SECRET_KEY);
res.status(200).send({ member: userAdapter(member.left), token: token});
res.status(200).send({ member: memberService.userAdapter(member.left), token: token});
});
};

4
back-end/src/middlewares/auth.middleware.ts
View File

@ -1,7 +1,7 @@
import { Request, Response } from 'express';
import { jwtVerify } from 'jose';
import { JWT_SECRET_KEY } from '../config/auth.config';
import { getMember } from '../controllers/member.controller';
import memberService from '../services/member.service';
import { Member } from '../types/member';
import { Either } from '../utils/utils';
@ -20,7 +20,7 @@ const getUsername = async (req: Request, res: Response, next: () => void) => {
try {
const { payload } = await jwtVerify(token, JWT_SECRET_KEY);
const name: string = payload.name as string;
const member: Either<Member, string> = await getMember(name);
const member: Either<Member, string> = await memberService.getMember(name);
if (!member.hasRight) {
res.locals.user = {