Merge pull request #313 from Quickchive/feat/#312-use-redis

Feat/#312 use redis

package.json

@@ -55,6 +55,7 @@
     "cross-env": "^7.0.3",
     "crypto-js": "^4.1.1",
     "form-data": "^4.0.0",
+    "ioredis": "^5.3.2",
     "joi": "^17.6.0",
     "openai": "^3.3.0",
     "passport": "^0.6.0",

src/auth/auth.module.ts

@@ -1,11 +1,10 @@
-import { CacheModule, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';
 import { PassportModule } from '@nestjs/passport';
 import { AuthController } from './auth.controller';
 import { OAuthController } from './oauth.controller';
 import { AuthService } from './auth.service';
 import { JwtStrategy } from './jwt/jwt.strategy';
-import * as redisStore from 'cache-manager-redis-store';
 import { GoogleStrategy } from './passport/google/google.strategy';
 import { customJwtService } from './jwt/jwt.service';
 import { TWOHOUR } from './jwt/jwt.payload';
@@ -14,6 +13,7 @@ import { OAuthUtil } from './util/oauth.util';
 import { ContentsModule } from '../contents/contents.module';
 import { OAuthService } from './oauth.service';
 import { CategoryModule } from '../categories/category.module';
+import { RedisModule } from '../infra/redis/redis.module';
 
 const accessTokenExpiration = TWOHOUR;
 export const refreshTokenExpirationInCache = 60 * 60 * 24 * 365; // 1 year
@@ -31,12 +31,8 @@ export const verifyEmailExpiration = 60 * 5;
     }),
     UsersModule,
     ContentsModule,
-    CacheModule.register({
-      store: redisStore,
-      host: process.env.REDIS_HOST,
-      port: process.env.REDIS_PORT,
-    }),
     CategoryModule,
+    RedisModule,
   ],
   controllers: [AuthController, OAuthController],
   providers: [

src/auth/auth.service.ts

@@ -1,12 +1,9 @@
 import {
   BadRequestException,
-  CACHE_MANAGER,
-  Inject,
   Injectable,
   NotFoundException,
   UnauthorizedException,
 } from '@nestjs/common';
-import { Cache } from 'cache-manager';
 import { v4 as uuidv4 } from 'uuid';
 
 import { MailService } from '../mail/mail.service';
@@ -27,15 +24,16 @@ import { ValidateUserDto, ValidateUserOutput } from './dtos/validate-user.dto';
 import { ONEYEAR, Payload } from './jwt/jwt.payload';
 import { customJwtService } from './jwt/jwt.service';
 import { UserRepository } from '../users/repository/user.repository';
+import { RedisService } from '../infra/redis/redis.service';
+import { PASSWORD_CODE_KEY, REFRESH_TOKEN_KEY } from './constants';
 
 @Injectable()
 export class AuthService {
   constructor(
     private readonly jwtService: customJwtService,
     private readonly userRepository: UserRepository,
     private readonly mailService: MailService,
-    @Inject(CACHE_MANAGER)
-    private readonly cacheManager: Cache,
+    private readonly redisService: RedisService,
   ) {}
 
   async jwtLogin({
@@ -51,11 +49,14 @@ export class AuthService {
         user.id,
       );
       const refreshToken = await this.jwtService.generateRefreshToken(payload);
-      await this.cacheManager.set(refreshToken, user.id, {
-        ttl: auto_login
+
+      await this.redisService.set(
+        `${REFRESH_TOKEN_KEY}:${user.id}`,
+        refreshToken,
+        auto_login
           ? refreshTokenExpirationInCache
           : refreshTokenExpirationInCacheShortVersion,
-      });
+      );
 
       return {
         access_token: this.jwtService.sign(payload),
@@ -76,18 +77,15 @@ export class AuthService {
         throw new BadRequestException('Refresh token is required');
       }
 
-      const refreshTokenInCache: number | undefined =
-        await this.cacheManager.get(refreshToken);
+      const refreshTokenInCache: string | null = await this.redisService.get(
+        `${REFRESH_TOKEN_KEY}:${user.id}`,
+      );
 
-      if (refreshTokenInCache === undefined) {
+      if (!refreshTokenInCache) {
         throw new NotFoundException('Refresh token not found');
       }
 
-      if (refreshTokenInCache !== userId) {
-        throw new UnauthorizedException('Invalid refresh token');
-      }
-
-      await this.cacheManager.del(refreshToken);
+      await this.redisService.del(`${REFRESH_TOKEN_KEY}:${user.id}`);
 
       return {};
     } else {
@@ -107,19 +105,21 @@ export class AuthService {
     } catch (e) {
       throw new UnauthorizedException('Invalid refresh token');
     }
-    const refreshTokenInCache = await this.cacheManager.get(refreshToken);
+    const user = await this.userRepository.findOneBy({ id: decoded.sub });
+    if (!user) {
+      throw new NotFoundException('User not found');
+    }
+
+    const refreshTokenInCache = await this.redisService.get(
+      `${REFRESH_TOKEN_KEY}:${user.id}`,
+    );
 
     if (!refreshTokenInCache) {
       throw new NotFoundException('There is no refresh token');
     }
 
-    const user = await this.userRepository.findOneBy({ id: decoded.sub });
     const auto_login: boolean = decoded.period === ONEYEAR;
 
-    if (!user) {
-      throw new NotFoundException('User not found');
-    }
-
     const payload: Payload = this.jwtService.createPayload(
       user.email,
       auto_login,
@@ -128,12 +128,13 @@ export class AuthService {
     const accessToken = this.jwtService.sign(payload);
     const newRefreshToken = await this.jwtService.generateRefreshToken(payload);
 
-    await this.cacheManager.del(refreshToken);
-    await this.cacheManager.set(newRefreshToken, user.id, {
-      ttl: auto_login
+    await this.redisService.set(
+      `${REFRESH_TOKEN_KEY}:${user.id}`,
+      newRefreshToken,
+      auto_login
         ? refreshTokenExpirationInCache
         : refreshTokenExpirationInCacheShortVersion,
-    });
+    );
 
     return {
       access_token: accessToken,
@@ -151,9 +152,11 @@ export class AuthService {
       }
       // Email Verification
       const code: string = uuidv4();
-      await this.cacheManager.set(code, user.id, {
-        ttl: verifyEmailExpiration,
-      });
+      await this.redisService.set(
+        `${PASSWORD_CODE_KEY}:${code}`,
+        user.id.toString(),
+        verifyEmailExpiration,
+      );
 
       // send password reset email to user using mailgun
       this.mailService.sendResetPasswordEmail(user.email, user.name, code);

src/auth/constants.ts

@@ -0,0 +1,2 @@
+export const REFRESH_TOKEN_KEY = 'refresh_token';
+export const PASSWORD_CODE_KEY = 'password_code';