admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: rewrite auth (#364)

Browse Source 
* feat: wip rewrite auth

* feat: restructure folders and fix stories and tests

* feat: remove auth provider and fix tests
This commit is contained in:
Jérémy M
2023-06-23 17:49:50 +02:00
committed by GitHub
parent 1c7980b270
commit c6708b2c1f
54 changed files with 1268 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/core/auth/services/auth.service.ts
View File

@ -9,7 +9,7 @@ import { UserService } from 'src/core/user/user.service';
import { assert } from 'src/utils/assert';
import { RegisterInput } from '../dto/register.input';
import { PASSWORD_REGEX, compareHash, hashPassword } from '../auth.util';
import { VerifyEntity } from '../dto/verify.entity';
import { Verify } from '../dto/verify.entity';
import { TokenService } from './token.service';
export type UserPayload = {
@ -73,17 +73,17 @@ export class AuthService {
return user;
}
async verify(email: string): Promise<VerifyEntity> {
const data = await this.userService.findUnique({
async verify(email: string): Promise<Verify> {
const user = await this.userService.findUnique({
where: {
email,
},
});
assert(data, "This user doesn't exist", NotFoundException);
assert(user, "This user doesn't exist", NotFoundException);
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { passwordHash: _, ...user } = data;
// passwordHash is hidden for security reasons
user.passwordHash = '';
const accessToken = await this.tokenService.generateAccessToken(user.id);
const refreshToken = await this.tokenService.generateRefreshToken(user.id);

12
server/src/core/auth/services/token.service.ts
View File

@ -13,7 +13,7 @@ import { PrismaService } from 'src/database/prisma.service';
import { assert } from 'src/utils/assert';
import { addMilliseconds } from 'date-fns';
import ms from 'ms';
import { TokenEntity } from '../dto/token.entity';
import { AuthToken } from '../dto/token.entity';
import { TokenExpiredError } from 'jsonwebtoken';
@Injectable()
@ -24,7 +24,7 @@ export class TokenService {
private readonly prismaService: PrismaService,
) {}
async generateAccessToken(userId: string): Promise<TokenEntity> {
async generateAccessToken(userId: string): Promise<AuthToken> {
const expiresIn = this.configService.get<string>('ACCESS_TOKEN_EXPIRES_IN');
assert(expiresIn, '', InternalServerErrorException);
const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
@ -55,7 +55,7 @@ export class TokenService {
};
}
async generateRefreshToken(userId: string): Promise<TokenEntity> {
async generateRefreshToken(userId: string): Promise<AuthToken> {
const secret = this.configService.get('REFRESH_TOKEN_SECRET');
const expiresIn = this.configService.get<string>(
'REFRESH_TOKEN_EXPIRES_IN',
@ -86,7 +86,7 @@ export class TokenService {
};
}
async generateLoginToken(email: string): Promise<TokenEntity> {
async generateLoginToken(email: string): Promise<AuthToken> {
const secret = this.configService.get('LOGIN_TOKEN_SECRET');
const expiresIn = this.configService.get<string>('LOGIN_TOKEN_EXPIRES_IN');
assert(expiresIn, '', InternalServerErrorException);
@ -163,8 +163,8 @@ export class TokenService {
}
async generateTokensFromRefreshToken(token: string): Promise<{
accessToken: TokenEntity;
refreshToken: TokenEntity;
accessToken: AuthToken;
refreshToken: AuthToken;
}> {
const {
user,