Skip to content
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.

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

Refresh Token 모듈 분리 #354

Merged
merged 8 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion nestjs-BE/server/src/auth/auth.controller.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AuthController } from './auth.controller';
import { RefreshToken, User } from '@prisma/client';
import { AuthService } from './auth.service';
import { UsersService } from '../users/users.service';
import { RefreshTokensService } from './refresh-tokens.service';
import { RefreshTokensService } from '../refresh-tokens/refresh-tokens.service';
import { ProfilesService } from '../profiles/profiles.service';
import { BadRequestException, NotFoundException } from '@nestjs/common';
import { ConfigModule } from '@nestjs/config';
Expand Down
2 changes: 1 addition & 1 deletion nestjs-BE/server/src/auth/auth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { UsersService } from '../users/users.service';
import { RefreshTokenDto } from './dto/refresh-token.dto';
import { ProfilesService } from '../profiles/profiles.service';
import { ApiTags, ApiResponse, ApiOperation } from '@nestjs/swagger';
import { RefreshTokensService } from './refresh-tokens.service';
import { RefreshTokensService } from '../refresh-tokens/refresh-tokens.service';
import { ConfigService } from '@nestjs/config';

@Controller('auth')
Expand Down
11 changes: 8 additions & 3 deletions nestjs-BE/server/src/auth/auth.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,21 @@ import { JwtStrategy } from './jwt.strategy';
import { APP_GUARD } from '@nestjs/core';
import { JwtAuthGuard } from './jwt-auth.guard';
import { ProfilesModule } from '../profiles/profiles.module';
import { RefreshTokensService } from './refresh-tokens.service';
import { RefreshTokensModule } from '../refresh-tokens/refresh-tokens.module';

@Module({
imports: [UsersModule, PassportModule, JwtModule, ProfilesModule],
imports: [
UsersModule,
PassportModule,
JwtModule,
ProfilesModule,
RefreshTokensModule,
],
controllers: [AuthController],
providers: [
AuthService,
JwtStrategy,
{ provide: APP_GUARD, useClass: JwtAuthGuard },
RefreshTokensService,
],
exports: [AuthService],
})
Expand Down
2 changes: 1 addition & 1 deletion nestjs-BE/server/src/auth/auth.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Test, TestingModule } from '@nestjs/testing';
import { AuthService } from './auth.service';
import { RefreshToken } from '@prisma/client';
import { JwtModule, JwtService } from '@nestjs/jwt';
import { RefreshTokensService } from './refresh-tokens.service';
import { RefreshTokensService } from '../refresh-tokens/refresh-tokens.service';
import { ConfigModule } from '@nestjs/config';

const fetchSpy = jest.spyOn(global, 'fetch');
Expand Down
2 changes: 1 addition & 1 deletion nestjs-BE/server/src/auth/auth.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Injectable, UnauthorizedException } from '@nestjs/common';
import { JwtService } from '@nestjs/jwt';
import { stringify } from 'qs';
import { RefreshTokensService } from './refresh-tokens.service';
import { RefreshTokensService } from '../refresh-tokens/refresh-tokens.service';
import { ConfigService } from '@nestjs/config';

@Injectable()
Expand Down
132 changes: 0 additions & 132 deletions nestjs-BE/server/src/auth/refresh-tokens.service.spec.ts

This file was deleted.

11 changes: 11 additions & 0 deletions nestjs-BE/server/src/refresh-tokens/refresh-tokens.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Module } from '@nestjs/common';
import { RefreshTokensService } from './refresh-tokens.service';
import { JwtModule } from '@nestjs/jwt';
import { PrismaModule } from '../prisma/prisma.module';

@Module({
imports: [JwtModule, PrismaModule],
providers: [RefreshTokensService],
exports: [RefreshTokensService],
})
export class RefreshTokensModule {}
94 changes: 94 additions & 0 deletions nestjs-BE/server/src/refresh-tokens/refresh-tokens.service.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import { Test, TestingModule } from '@nestjs/testing';
import { RefreshTokensService } from './refresh-tokens.service';
import { PrismaService } from '../prisma/prisma.service';
import { JwtModule } from '@nestjs/jwt';
import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
import { ConfigModule } from '@nestjs/config';
import { getExpiryDate } from '../utils/date';
import { v4 as uuid } from 'uuid';

jest.useFakeTimers();

describe('RefreshTokensService', () => {
let service: RefreshTokensService;
let prisma: PrismaService;

beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
imports: [JwtModule, ConfigModule.forRoot()],
providers: [
RefreshTokensService,
{
provide: PrismaService,
useValue: {
refreshToken: {
create: jest.fn(),
delete: jest.fn(),
},
},
},
],
}).compile();

service = module.get<RefreshTokensService>(RefreshTokensService);
prisma = module.get<PrismaService>(PrismaService);
});

afterEach(() => {
jest.clearAllTimers();
});

it('createRefreshToken created', async () => {
const TWO_WEEK = 14;

const testUserUuid = uuid();
const twoWeek = new Date();
twoWeek.setDate(twoWeek.getDate() + TWO_WEEK);

(prisma.refreshToken.create as jest.Mock).mockImplementation(
async ({ data }) => {
return {
id: 0,
token: data.token,
expiryDate: data.expiryDate,
userUuid: data.userUuid,
};
},
);

const token = await service.createRefreshToken(testUserUuid);

expect(token.token).toMatch(
/^[A-Za-z0-9-_]+?\.[A-Za-z0-9-_]+?\.[A-Za-z0-9-_]+$/,
);
expect(token.expiryDate.toISOString()).toBe(twoWeek.toISOString());
expect(token.userUuid).toBe(testUserUuid);
});

it('deleteRefreshToken deleted', async () => {
const testToken = {
id: 0,
token: 'Token',
expiryDate: getExpiryDate({ week: 2 }),
userUuid: 'userId',
};
(prisma.refreshToken.delete as jest.Mock).mockResolvedValue(testToken);

const token = service.deleteRefreshToken(testToken.token);

await expect(token).resolves.toEqual(testToken);
});

it('deleteRefreshToken not found', async () => {
(prisma.refreshToken.delete as jest.Mock).mockRejectedValue(
new PrismaClientKnownRequestError(
'An operation failed because it depends on one or more records that were required but not found. Record to delete not found.',
{ code: 'P2025', clientVersion: '' },
),
);

const token = service.deleteRefreshToken('Token');

await expect(token).resolves.toBeNull();
});
});
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Injectable } from '@nestjs/common';
import { JwtService } from '@nestjs/jwt';
import { PrismaService } from '../prisma/prisma.service';
import generateUuid from '../utils/uuid';
import { v4 as uuid } from 'uuid';
import { Prisma, RefreshToken } from '@prisma/client';
import { REFRESH_TOKEN_EXPIRY_DAYS } from '../config/magic-number';
import { ConfigService } from '@nestjs/config';
import { getExpiryDate } from '../utils/date';

@Injectable()
export class RefreshTokensService {
Expand All @@ -18,7 +18,7 @@ export class RefreshTokensService {
return this.prisma.refreshToken.create({
data: {
token: this.createToken(),
expiryDate: this.getExpiryDate(),
expiryDate: getExpiryDate({ week: 2 }),
userUuid,
},
});
Expand All @@ -44,21 +44,14 @@ export class RefreshTokensService {
}
}

createToken(): string {
private createToken(): string {
const refreshToken = this.jwtService.sign(
{ uuid: generateUuid() },
{ uuid: uuid() },
{
secret: this.configService.get<string>('JWT_REFRESH_SECRET'),
expiresIn: '14d',
},
);
return refreshToken;
}

getExpiryDate(): Date {
const currentDate = new Date();
const expiryDate = new Date(currentDate);
expiryDate.setDate(currentDate.getDate() + REFRESH_TOKEN_EXPIRY_DAYS);
return expiryDate;
}
}
15 changes: 15 additions & 0 deletions nestjs-BE/server/src/utils/date.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const WEEK_DAY = 7;

export function getExpiryDate({
week = 0,
day = 0,
}: {
week?: number;
day?: number;
}): Date {
const expiryDate = new Date();

expiryDate.setDate(expiryDate.getDate() + week * WEEK_DAY + day);

return expiryDate;
}
Loading