Feature/spgo 14

Makefile

@@ -1,5 +1,10 @@
 proto:
-	protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto.cmd -I=./src/proto --ts_proto_out=./src/auth src/proto/auth.proto --ts_proto_opt=nestJs=true --ts_proto_opt=fileSuffix=.pb
+	protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto -I=./src/proto --ts_proto_out=./src/auth src/proto/auth.proto --ts_proto_opt=nestJs=true --ts_proto_opt=fileSuffix=.pb
 
 server:
 	yarn start:dev
+
+prisma:
+	yarn prisma generate
+	yarn prisma db push --accept-data-loss
+	yarn prisma migrate dev

package.json

@@ -30,7 +30,7 @@
     "@nestjs/microservices": "^10.2.5",
     "@nestjs/passport": "^10.0.2",
     "@nestjs/platform-express": "^9.0.0",
-    "@prisma/client": "^5.2.0",
+    "@prisma/client": "^5.3.1",
     "@types/bcrypt": "^5.0.0",
     "@types/passport-jwt": "^3.0.9",
     "bcrypt": "^5.1.1",

src/auth/auth.controller.ts

@@ -2,7 +2,7 @@ import { Controller } from '@nestjs/common';
 import { GrpcMethod } from '@nestjs/microservices';
 import {
   LoginRequest,
-  LoginResponse,
+  LoginResponse, LogoutRequest, LogoutResponse,
   RegisterRequest,
   RegisterResponse,
   ValidateGoogleRequest,
@@ -24,6 +24,13 @@ export class AuthController {
     return this.authService.register(request);
   }
 
+
+  @GrpcMethod('AuthService', 'Logout')
+  logout(request: LogoutRequest): Promise<LogoutResponse> {
+    return this.authService.logout(request);
+  }
+
+
   @GrpcMethod('AuthService', 'ValidateGoogle')
   validateGoogle(
     request: ValidateGoogleRequest,

src/auth/auth.module.ts

@@ -3,15 +3,14 @@
 import { UserRepository } from '../repository/user.repository';
 import { AuthService } from './auth.service';
 import { AuthController } from './auth.controller';
-import { APP_FILTER } from '@nestjs/core';
-import { GrpcServerExceptionFilter } from 'nestjs-grpc-exceptions';
 import { JwtModule, JwtService } from '@nestjs/jwt';
 import { AccessTokenStrategy } from './strategies/accessToken.strategy';
 import { ConfigService } from '@nestjs/config';
+import { BlacklistRepository } from 'src/repository/blacklist.repository';
 
 @Module({
   imports: [PrismaModule, JwtModule.register({})],
-  providers: [AuthService, UserRepository, AccessTokenStrategy, ConfigService],
+  providers: [AuthService, UserRepository, AccessTokenStrategy, ConfigService, BlacklistRepository],
   controllers: [AuthController],
 })
-export class AuthModule {}
+export class AuthModule { }

src/auth/auth.pb.ts

@@ -1,8 +1,8 @@
 /* eslint-disable */
-import { GrpcMethod, GrpcStreamMethod } from '@nestjs/microservices';
-import { Observable } from 'rxjs';
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
 
-export const protobufPackage = 'auth';
+export const protobufPackage = "auth";
 
 export interface RegisterRequest {
   firstName: string;
@@ -52,6 +52,14 @@ export interface RefreshTokenResponse {
   credential: Credential | undefined;
 }
 
+export interface LogoutRequest {
+  credential: Credential | undefined;
+}
+
+export interface LogoutResponse {
+  isDone: boolean;
+}
+
 export interface ValidateGoogleRequest {
   user: GoogleUser | undefined;
 }
@@ -60,7 +68,7 @@ export interface ValidateGoogleResponse {
   credential: Credential | undefined;
 }
 
-export const AUTH_PACKAGE_NAME = 'auth';
+export const AUTH_PACKAGE_NAME = "auth";
 
 export interface AuthServiceClient {
   login(request: LoginRequest): Observable<LoginResponse>;
@@ -69,70 +77,40 @@ export interface AuthServiceClient {
 
   register(request: RegisterRequest): Observable<RegisterResponse>;
 
-  validateGoogle(
-    request: ValidateGoogleRequest,
-  ): Observable<ValidateGoogleResponse>;
+  logout(request: LogoutRequest): Observable<LogoutResponse>;
+
+  validateGoogle(request: ValidateGoogleRequest): Observable<ValidateGoogleResponse>;
 }
 
 export interface AuthServiceController {
-  login(
-    request: LoginRequest,
-  ): Promise<LoginResponse> | Observable<LoginResponse> | LoginResponse;
+  login(request: LoginRequest): Promise<LoginResponse> | Observable<LoginResponse> | LoginResponse;
 
   refreshToken(
     request: RefreshTokenRequest,
-  ):
-    | Promise<RefreshTokenResponse>
-    | Observable<RefreshTokenResponse>
-    | RefreshTokenResponse;
-
-  register(
-    request: RegisterRequest,
-  ):
-    | Promise<RegisterResponse>
-    | Observable<RegisterResponse>
-    | RegisterResponse;
+  ): Promise<RefreshTokenResponse> | Observable<RefreshTokenResponse> | RefreshTokenResponse;
+
+  register(request: RegisterRequest): Promise<RegisterResponse> | Observable<RegisterResponse> | RegisterResponse;
+
+  logout(request: LogoutRequest): Promise<LogoutResponse> | Observable<LogoutResponse> | LogoutResponse;
 
   validateGoogle(
     request: ValidateGoogleRequest,
-  ):
-    | Promise<ValidateGoogleResponse>
-    | Observable<ValidateGoogleResponse>
-    | ValidateGoogleResponse;
+  ): Promise<ValidateGoogleResponse> | Observable<ValidateGoogleResponse> | ValidateGoogleResponse;
 }
 
 export function AuthServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = [
-      'login',
-      'refreshToken',
-      'register',
-      'validateGoogle',
-    ];
+    const grpcMethods: string[] = ["login", "refreshToken", "register", "logout", "validateGoogle"];
     for (const method of grpcMethods) {
-      const descriptor: any = Reflect.getOwnPropertyDescriptor(
-        constructor.prototype,
-        method,
-      );
-      GrpcMethod('AuthService', method)(
-        constructor.prototype[method],
-        method,
-        descriptor,
-      );
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("AuthService", method)(constructor.prototype[method], method, descriptor);
     }
     const grpcStreamMethods: string[] = [];
     for (const method of grpcStreamMethods) {
-      const descriptor: any = Reflect.getOwnPropertyDescriptor(
-        constructor.prototype,
-        method,
-      );
-      GrpcStreamMethod('AuthService', method)(
-        constructor.prototype[method],
-        method,
-        descriptor,
-      );
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("AuthService", method)(constructor.prototype[method], method, descriptor);
     }
   };
 }
 
-export const AUTH_SERVICE_NAME = 'AuthService';
+export const AUTH_SERVICE_NAME = "AuthService";

src/auth/auth.service.spec.ts

@@ -3,12 +3,13 @@
 import { JwtService } from '@nestjs/jwt';
 import { ConfigService } from '@nestjs/config';
 import { UserRepository } from '../repository/user.repository';
+import { BlacklistRepository } from '../repository/blacklist.repository';
 describe('AuthService', () => {
   let service: AuthService;
   const mockJwtService = {
     sign: jest.fn(),
   };
   const mockBlacklistService = {
     insertToken: jest.fn(),
     check: jest.fn(),
   };
@@ -20,6 +21,9 @@
   const mockConfigService = {
     get: jest.fn(),
   }
+  const mockBlacklistRepository = {
+    addOutdatedToken: jest.fn(),
+  }
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [AuthService,
@@ -36,6 +40,10 @@
         {
           provide: ConfigService,
           useValue: mockConfigService,
+        },
+        {
+          provide: BlacklistRepository,
+          useValue: mockBlacklistRepository,
         }
       ],
     }).compile();

src/auth/auth.service.ts

@@ -8,6 +8,8 @@
   Credential,
   LoginRequest,
   LoginResponse,
+  LogoutRequest,
+  LogoutResponse,
   RefreshTokenRequest,
   RefreshTokenResponse,
   RegisterRequest,
@@ -20,14 +22,17 @@
 import { $Enums, Prisma } from '@prisma/client';
 import { v4 as uuidv4 } from 'uuid';
 import { Role } from '@prisma/client';
+import { BlacklistRepository } from '../repository/blacklist.repository';
+import { JwtPayload } from './strategies/accessToken.strategy';
 
 @Injectable()
 export class AuthService implements AuthServiceController {
   constructor(
     private userRepo: UserRepository,
+    private blacklistRepo: BlacklistRepository,
     private jwtService: JwtService,
     private configService: ConfigService,
-  ) {}
+  ) { }
 
   public async login(request: LoginRequest): Promise<LoginResponse> {
     try {
@@ -81,7 +86,7 @@
   }
 
   public async refreshToken(
     request: RefreshTokenRequest,
   ): Promise<RefreshTokenResponse> {
     return null;
   }
@@ -210,4 +215,44 @@
       throw err;
     }
   }
+
+
+  public async logout(request: LogoutRequest): Promise<LogoutResponse> {
+
+    try {
+      await this.blacklistRepo.addOutdatedToken({
+        outDatedAccessToken: request.credential.accessToken,
+      })
+
+      let credential = this.jwtService.decode(request.credential.refreshToken) as JwtPayload;
+      let userId = credential.sub
+
+      await this.userRepo.update(userId, {
+        refreshToken: null,
+      })
+
+
+
+
+    } catch (e) {
+      if (e instanceof Prisma.PrismaClientKnownRequestError) {
+
+        console.log(
+          'There is a unique constraint violation, a blacklist should not outdated twice!'
+        )
+
+      }
+      throw new RpcException({
+        code: status.INTERNAL,
+        message: e.message,
+      });
+
+    }
+
+
+    const response: LogoutResponse = { isDone: true };
+    return response;
+
+  }
+
 }

src/auth/strategies/accessToken.strategy.ts

@@ -8,7 +8,7 @@ type RegisteredClaims = {
   issuedAt: Date;
 };
 
-type JwtPayload = {
+export type JwtPayload = {
   sub: string;
   registeredClaims: RegisteredClaims;
 };

src/database/migrations/20230921140038_/migration.sql

@@ -0,0 +1,7 @@
+-- CreateTable
+CREATE TABLE "Blacklist" (
+    "outDatedRefreshToken" TEXT NOT NULL
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Blacklist_outDatedRefreshToken_key" ON "Blacklist"("outDatedRefreshToken");

src/database/migrations/20230921195223_add_out_dated_access_token_column/migration.sql

@@ -0,0 +1,17 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `outDatedRefreshToken` on the `Blacklist` table. All the data in the column will be lost.
+  - A unique constraint covering the columns `[outDatedAccessToken]` on the table `Blacklist` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `outDatedAccessToken` to the `Blacklist` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropIndex
+DROP INDEX "Blacklist_outDatedRefreshToken_key";
+
+-- AlterTable
+ALTER TABLE "Blacklist" DROP COLUMN "outDatedRefreshToken",
+ADD COLUMN     "outDatedAccessToken" TEXT NOT NULL;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Blacklist_outDatedAccessToken_key" ON "Blacklist"("outDatedAccessToken");

src/database/schema.prisma

@@ -35,3 +35,7 @@ enum Status {
   ACTIVE
   BANNED
 }
+
+model Blacklist {
+  outDatedAccessToken String @unique
+}

src/proto/auth.proto

@@ -6,6 +6,7 @@ service AuthService {
   rpc Login(LoginRequest) returns (LoginResponse) {}
   rpc RefreshToken(RefreshTokenRequest) returns (RefreshTokenResponse) {}
   rpc Register(RegisterRequest) returns (RegisterResponse) {}
+  rpc Logout(LogoutRequest) returns (LogoutResponse) {}
   rpc ValidateGoogle(ValidateGoogleRequest) returns (ValidateGoogleResponse) {}
 }
 
@@ -57,10 +58,17 @@ message RefreshTokenResponse {
   Credential credential = 1;
 }
 
+message LogoutRequest {
+  Credential credential = 1;
+}
+
+message LogoutResponse {
+  bool is_done = 1;
+}
 message ValidateGoogleRequest {
   GoogleUser user = 1;
 }
 
 message ValidateGoogleResponse {
   Credential credential = 1;
-}
+}

src/repository/blacklist.repository.ts

@@ -0,0 +1,15 @@
+import { Injectable } from '@nestjs/common';
+import { PrismaClient, Status, Blacklist } from '@prisma/client';
+import { PrismaService } from '../prisma/service/prisma.service';
+import { Prisma } from '@prisma/client';
+
+@Injectable()
+export class BlacklistRepository {
+    constructor(private db: PrismaService) { }
+
+    async addOutdatedToken(outDatedToken: Prisma.BlacklistCreateInput): Promise<Blacklist> {
+        return await this.db.blacklist.create({
+            data: outDatedToken,
+        })
+    }
+}