Add: rejoin restriction after user withdrawal

sparcs-kaist · Jan 22, 2025 · aff0f86 · aff0f86
1 parent d290945
commit aff0f86
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/src/modules/stores/mongo.ts b/src/modules/stores/mongo.ts
@@ -24,7 +24,7 @@ const userSchema = new Schema<User>({
   ongoingRoom: [{ type: Schema.Types.ObjectId, ref: "Room" }], // 참여중인 진행중인 방 배열
   doneRoom: [{ type: Schema.Types.ObjectId, ref: "Room" }], // 참여중인 완료된 방 배열
   withdraw: { type: Boolean, default: false }, //탈퇴 여부
-  withdrawAt: { type: Date }, //탈퇴 시각
+  withdrewAt: { type: Date }, //탈퇴 시각
   phoneNumber: { type: String }, // 전화번호 (2023FALL 이벤트부터 추가)
   ban: { type: Boolean, default: false }, //계정 정지 여부
   joinat: { type: Date, required: true }, //가입 시각

diff --git a/src/schedules/deleteUserInfo.js b/src/schedules/deleteUserInfo.js
@@ -7,7 +7,7 @@ module.exports = async () => {
     await userModel.updateMany(
       {
         withdraw: true,
-        withdrawAt: {
+        withdrewAt: {
           $lte: new Date(Date.now() - 5 * 365 * 24 * 60 * 60 * 1000),
         },
         name: { $ne: "" },

diff --git a/src/services/auth.js b/src/services/auth.js
@@ -36,6 +36,24 @@ const transUserData = (userData) => {
 };
 
 const joinus = async (req, userData) => {
+  const oldUser = await userModel
+    .findOne(
+      {
+        id: userData.id,
+        withdraw: true,
+      },
+      "withdrewAt"
+    )
+    .sort({ withdrewAt: -1 })
+    .lean();
+  if (oldUser && oldUser.withdrewAt) {
+    // 탈퇴 후 7일이 지나지 않았을 경우, 가입을 거부합니다.
+    const diff = req.timestamp - oldUser.withdrewAt.getTime();
+    if (diff < 7 * 24 * 60 * 60 * 1000) {
+      return false;
+    }
+  }
+
   const newUser = new userModel({
     id: userData.id, // NOTE: SSO uid
     name: userData.name,
@@ -51,6 +69,7 @@ const joinus = async (req, userData) => {
     email: userData.email,
   });
   await newUser.save();
+  return true;
 };
 
 const update = async (userData) => {
@@ -72,8 +91,13 @@ const tryLogin = async (req, res, userData, redirectOrigin, redirectPath) => {
       "_id name email subinfo id withdraw ban"
     );
     if (!user) {
-      await joinus(req, userData);
-      return tryLogin(req, res, userData, redirectOrigin, redirectPath);
+      if (await joinus(req, userData)) {
+        return tryLogin(req, res, userData, redirectOrigin, redirectPath);
+      } else {
+        const redirectUrl = new URL("/login/fail", redirectOrigin).href;
+        res.redirect(redirectUrl);
+        return;
+      }
     }
     if (
       user.name !== userData.name ||

diff --git a/src/services/users.ts b/src/services/users.ts
@@ -274,7 +274,7 @@ export const withdrawHandler: RequestHandler = async (req, res) => {
 
     // 회원 탈퇴 처리 (Soft Delete)
     user.withdraw = true;
-    user.withdrawAt = new Date(req.timestamp!);
+    user.withdrewAt = new Date(req.timestamp!);
 
     await user.save();
 

diff --git a/src/types/mongo.d.ts b/src/types/mongo.d.ts
@@ -16,7 +16,7 @@ export interface User extends Document<Types.ObjectId> {
   /** 계정 탈퇴 여부. */
   withdraw: boolean;
   /** 계정 탈퇴 시각. */
-  withdrawAt?: Date;
+  withdrewAt?: Date;
   /** 사용자의 전화번호. 2023 가을 이벤트부터 추가됨. */
   phoneNumber?: string;
   /** 계정 정지 여부. */