Merge pull request #79 from gsainfoteam/yhkim13/pgb-43

yhkim13/pgb-43 to develop

Author: BranKein

drizzle/schema/device.ts

@@ -1,4 +1,11 @@
-import { pgTable, text, timestamp, uuid, varchar } from "drizzle-orm/pg-core";
+import {
+  boolean,
+  pgTable,
+  text,
+  timestamp,
+  uuid,
+  varchar,
+} from "drizzle-orm/pg-core";
 import { relations } from "drizzle-orm";
 import { users } from "./users";
 import { userAlarmSetting } from "./user-alarm-setting";
@@ -12,7 +19,8 @@ CREATE TABLE "device" (
     "created_at" timestamp with time zone NOT NULL DEFAULT NOW(),
     "updated_at" timestamp with time zone NOT NULL DEFAULT NOW(),
     "device_id"  varchar(64)              NOT NULL,
-    "fcm_token"  text                     NOT NULL
+    "fcm_token"  text                     NOT NULL,
+    "logged_in" boolean                  NOT NULL DEFAULT FALSE
 );
 */
 export const device = pgTable("device", {
@@ -28,6 +36,7 @@ export const device = pgTable("device", {
     .defaultNow(),
   deviceId: varchar("device_id", { length: 64 }).notNull(),
   fcmToken: text("fcm_token").notNull(),
+  loggedIn: boolean("logged_in").notNull().default(false),
 });
 
 export const deviceRelations = relations(device, ({ one, many }) => ({

drizzle/schema/schema.sql

@@ -274,3 +274,5 @@ ALTER TABLE "user_consent"
 CREATE INDEX "idx_popo_chat_reservation_pot_fk_popo_chat_msg_type"
     ON "popo_chat_reservation" ("pot_fk", "popo_chat_msg_type");
 
+ALTER TABLE "device"
+    ADD COLUMN "logged_in" boolean NOT NULL DEFAULT FALSE;

src/database/entity/device.entity.ts

@@ -10,4 +10,5 @@ export class DeviceEntity {
   version: string;
   createdAt?: Date;
   updatedAt?: Date;
+  loggedIn: boolean;
 }

src/database/repository/device.repository.ts

@@ -56,7 +56,7 @@ export class DeviceRepository {
   SELECT d.fcm_token, uas.chat_push, uas.marketing_push, uas.pot_in_out_push
   FROM device AS d
     LEFT OUTER JOIN user_alarm_setting AS uas ON d.pk = uas.device_fk
-  WHERE d.user_fk in (?1);
+  WHERE d.user_fk in (?1) AND d.logged_in = true;
    */
   async findFcmTokensByUserFks(userFks: string[]) {
     return await this.dbService.db
@@ -68,7 +68,7 @@ export class DeviceRepository {
       })
       .from(device)
       .leftJoin(userAlarmSetting, eq(device.pk, userAlarmSetting.deviceFk))
-      .where(inArray(device.userFk, userFks));
+      .where(and(inArray(device.userFk, userFks), eq(device.loggedIn, true)));
   }
 
   async insert(
@@ -84,6 +84,7 @@ export class DeviceRepository {
         fcmToken: deviceEntity.fcmToken,
         os: deviceEntity.os,
         version: deviceEntity.version,
+        loggedIn: deviceEntity.loggedIn,
       })
       .returning();
 
@@ -103,6 +104,7 @@ export class DeviceRepository {
         os: deviceEntity.os,
         version: deviceEntity.version,
         updatedAt: new Date(),
+        loggedIn: deviceEntity.loggedIn,
       })
       .where(eq(device.pk, deviceEntity.pk));
   }
@@ -117,6 +119,7 @@ export class DeviceRepository {
       version: result.version,
       createdAt: result.createdAt,
       updatedAt: result.updatedAt,
+      loggedIn: result.loggedIn,
     };
   }
 }

src/database/repository/refresh-token.repository.ts

@@ -50,6 +50,12 @@ export class RefreshTokenRepository {
     return this.resultToRefreshTokenEntity(insertedRefreshToken);
   }
 
+  async deleteByOpaqueHash(opaqueHash: string, tx: TxType): Promise<void> {
+    await tx
+      .delete(refreshToken)
+      .where(eq(refreshToken.opaqueHash, opaqueHash));
+  }
+
   private resultToRefreshTokenEntity(result: any): RefreshTokenEntity {
     return {
       opaqueHash: result.opaqueHash,

src/user/dto/logout.dto.ts

@@ -0,0 +1,7 @@
+import { IsNotEmpty, IsString } from "class-validator";
+
+export class LogoutRequestDto {
+  @IsNotEmpty()
+  @IsString()
+  refresh_token: string;
+}

src/user/user.controller.ts

@@ -13,6 +13,7 @@ import { UserGuard } from "@src/auth/guard/user.guard";
 import { GetUser } from "@src/global/decorator/get-user.decorator";
 import { UserContext } from "@src/auth/user-context.entity";
 import { UpdateConsentDto } from "@src/user/dto/update-consent.dto";
+import { LogoutRequestDto } from "@src/user/dto/logout.dto";
 
 @Controller("/api/v1/user")
 export class UserController {
@@ -65,4 +66,13 @@ export class UserController {
   ): Promise<BaseResultDto> {
     return this.userService.consent(req, userCtx);
   }
+
+  @Post("/logout")
+  @UseGuards(UserGuard)
+  async logout(
+    @Body() req: LogoutRequestDto,
+    @GetUser() userCtx: UserContext,
+  ): Promise<BaseResultDto> {
+    return this.userService.logout(req, userCtx);
+  }
 }

src/user/user.service.ts

@@ -1,4 +1,8 @@
-import { Injectable } from "@nestjs/common";
+import {
+  ForbiddenException,
+  Injectable,
+  InternalServerErrorException,
+} from "@nestjs/common";
 import { LoginRequestDto, LoginResponseDto } from "@src/user/dto/login.dto";
 import { BaseResultDto } from "@src/global/dto/base-result.dto";
 import { SetDeviceInfoRequestDto } from "@src/user/dto/set-fcm.dto";
@@ -21,6 +25,8 @@ import { UserEntity } from "@src/database/entity/user.entity";
 import { UpdateConsentDto } from "@src/user/dto/update-consent.dto";
 import { UserConsentRepository } from "@src/database/repository/user-consent.repository";
 import { UserConsentEntity } from "@src/database/entity/user-consent.entity";
+import { LogoutRequestDto } from "@src/user/dto/logout.dto";
+import { RefreshTokenRepository } from "@src/database/repository/refresh-token.repository";
 
 @Injectable()
 export class UserService {
@@ -32,6 +38,7 @@ export class UserService {
     private readonly deviceRepository: DeviceRepository,
     private readonly userAlarmSettingRepository: UserAlarmSettingRepository,
     private readonly userConsentRepository: UserConsentRepository,
+    private readonly refreshTokenRepository: RefreshTokenRepository,
   ) {}
 
   async login(
@@ -105,27 +112,20 @@ export class UserService {
       userCtx.userId,
     );
     if (!device) {
-      throw new Error("Device not found"); // TODO
+      throw new ForbiddenException("Device not found");
     }
 
-    let updated = false;
-
     if (!!fcmToken) {
       device.fcmToken = fcmToken;
-      updated = true;
     }
     if (!!os) {
       device.os = os;
-      updated = true;
     }
     if (!!version) {
       device.version = version;
-      updated = true;
     }
 
-    if (!updated) {
-      return BaseResultDto.OK; // 변경된 정보가 없으면 바로 반환
-    }
+    device.loggedIn = true;
 
     await this.dbService.db.transaction(async (tx: TxType) => {
       await this.deviceRepository.update(device, tx);
@@ -263,6 +263,32 @@ export class UserService {
     return BaseResultDto.OK;
   }
 
+  async logout(
+    req: LogoutRequestDto,
+    userCtx: UserContext,
+  ): Promise<BaseResultDto> {
+    const device = await this.deviceRepository.findByPkAndUserFk(
+      userCtx.devicePk,
+      userCtx.userId,
+    );
+
+    if (!device) {
+      return BaseResultDto.OK;
+    }
+
+    device.loggedIn = false;
+
+    await this.dbService.db.transaction(async (tx: TxType) => {
+      await this.refreshTokenRepository.deleteByOpaqueHash(
+        req.refresh_token,
+        tx,
+      );
+      await this.deviceRepository.update(device, tx);
+    });
+
+    return BaseResultDto.OK;
+  }
+
   private async createNewUser(
     sub: string,
     name: string,
@@ -280,7 +306,7 @@ export class UserService {
     );
 
     if (!user) {
-      throw new Error("Failed to create new user"); // TODO
+      throw new InternalServerErrorException("Failed to create new user");
     }
 
     return user;
@@ -297,8 +323,9 @@ export class UserService {
         userFk: user.pk,
         fcmToken: "", // 초기값은 빈 문자열로 설정
         deviceId: deviceId,
-        os: "iOS", // OS 정보는 추후에 업데이트 필요
-        version: "0.0.1", // 초기 버전 정보
+        os: "", // OS 정보는 추후에 업데이트 필요
+        version: "", // 초기 버전 정보
+        loggedIn: false,
       },
       tx,
     );