From 01a48e0bca2712167238db408ee67b98c80d7f4e Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Thu, 13 Feb 2025 20:03:41 +0900
Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EC=A0=95?=
 =?UTF-8?q?=EC=A7=80=EB=90=9C=20=EA=B3=84=EC=A0=95=EC=9D=80=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A9=94=EC=9D=BC=20=EC=A0=84=EC=86=A1=EC=9D=84=20=EB=A7=89?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20api=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts             |  4 ++--
 src/views/PwChangeEmail.vue | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index 6ea94ad..532a04b 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -3,12 +3,12 @@ import Cookies from 'js-cookie'
 
 import { useMemberStore } from '@/stores/member'
 
-export const postPasswordEmailSend = async (name: string, email: string) => {
+export const postPasswordEmailSend = async (name: string, email: string, id: string) => {
   const request = {
     name: name,
     email: email
   }
-  const response = await axiosInstance.post('/api/new-password', request)
+  const response = await axiosInstance.post(`/api/new-password?nickname=${id}`, request)
   return response.data
 }
 
diff --git a/src/views/PwChangeEmail.vue b/src/views/PwChangeEmail.vue
index 0f8db59..1f77e3b 100644
--- a/src/views/PwChangeEmail.vue
+++ b/src/views/PwChangeEmail.vue
@@ -85,7 +85,13 @@ const closeFailModal = () => {
 }
 
 const handleCheck = async () => {
-  await postPasswordEmailSend(name.value, email.value)
-  isModalVisible.value = !isModalVisible.value
+  const id = email.value.split('@')[0]
+  try {
+    await postPasswordEmailSend(name.value, email.value, id)
+    isModalVisible.value = !isModalVisible.value
+  } catch {
+    messageHeader.value = '으에?'
+    messageBody.value = '으에?'
+  }
 }
 </script>

From 15045ead0e2fd3e7a377d1a621624fbfc1f069fa Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Fri, 14 Feb 2025 14:35:52 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8,=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=EC=9E=AC=EC=84=A4=EC=A0=95=EC=97=90=20=EB=8C=80=ED=95=9C=20?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EB=AA=A8=EB=8B=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/axios.ts          |  5 ++++
 src/views/LoginView.vue     | 60 +++++++++++--------------------------
 src/views/PwChangeEmail.vue |  9 ++----
 3 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index 38f1b2b..afb3e0f 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -52,6 +52,11 @@ const setInterceptors = (instance: AxiosInstance) => {
             if (error.response.data === 'AUTH_003') {
               Cookies.remove('refreshToken')
               setError('유효하지 않은 토큰입니다', '다시 로그인 해주세요', redirectToLogin)
+            } else if (error.response.data === 'AUTH_015') {
+              setError(
+                '정지된 계정입니다',
+                '로그인 시도 5회 초과로 계정이 정지되었습니다\n30분 후 다시 시도해주세요'
+              )
             }
             break
           case 403: {
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 1a1ad98..b9334d4 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -77,49 +77,25 @@ const closeModal = () => {
 }
 
 const handleLogin = async () => {
-  try {
-    const name = id.value.toString()
-    const res = await postLogin(name, password.value)
-    const role = await memberStore.updateMemberInfoWithToken()
+  const name = id.value.toString()
+  const res = await postLogin(name, password.value)
+  const role = await memberStore.updateMemberInfoWithToken()
 
-    if (!Cookies.get('refreshToken')) {
-      router.push('/pw-change')
-    } else if (res) {
-      switch (role) {
-        case 'ROLE_ADMIN':
-          router.push('/member-management')
-          break
-        case 'ROLE_MANAGER':
-          router.push('my-task')
-          break
-        case 'ROLE_USER':
-          router.push('/my-request')
-          break
-        default:
-          router.push('/')
-      }
-    }
-  } catch (error) {
-    if (axios.isAxiosError(error)) {
-      switch (error.response?.status) {
-        case 401:
-          if (error.response?.data == 'AUTH_015') {
-            messageHeader.value = '정지된 계정입니다'
-            messageBody.value =
-              '로그인 시도 5회 초과로 계정이 정지되었습니다\n30분 후 다시 시도해주세요'
-          } else {
-            messageHeader.value = '일치하는 정보가 없습니다'
-            messageBody.value = '아이디와 비밀번호를 다시 확인해주세요'
-          }
-          isModalVisible.value = !isModalVisible.value
-          break
-
-        case 404:
-          isModalVisible.value = !isModalVisible.value
-          messageHeader.value = '활성화 되어있지 않은 계정입니다'
-          messageBody.value = '접근 상태를 다시 확인하여주세요'
-          break
-      }
+  if (!Cookies.get('refreshToken')) {
+    router.push('/pw-change')
+  } else if (res) {
+    switch (role) {
+      case 'ROLE_ADMIN':
+        router.push('/member-management')
+        break
+      case 'ROLE_MANAGER':
+        router.push('my-task')
+        break
+      case 'ROLE_USER':
+        router.push('/my-request')
+        break
+      default:
+        router.push('/')
     }
   }
 }
diff --git a/src/views/PwChangeEmail.vue b/src/views/PwChangeEmail.vue
index 1f77e3b..17c9833 100644
--- a/src/views/PwChangeEmail.vue
+++ b/src/views/PwChangeEmail.vue
@@ -86,12 +86,7 @@ const closeFailModal = () => {
 
 const handleCheck = async () => {
   const id = email.value.split('@')[0]
-  try {
-    await postPasswordEmailSend(name.value, email.value, id)
-    isModalVisible.value = !isModalVisible.value
-  } catch {
-    messageHeader.value = '으에?'
-    messageBody.value = '으에?'
-  }
+  await postPasswordEmailSend(name.value, email.value, id)
+  isModalVisible.value = !isModalVisible.value
 }
 </script>

From 49b3db75f5e864d9a0dde542993960e6eba82516 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Fri, 14 Feb 2025 16:01:49 +0900
Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=EC=82=AC?=
 =?UTF-8?q?=EC=A7=84=20=EB=B3=80=EA=B2=BD=20=ED=9B=84=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=20=ED=81=B4=EB=A6=AD=EC=8B=9C=20=EB=A1=9C=EB=94=A9=20=EB=AA=A8?=
 =?UTF-8?q?=EB=8B=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/EditInformation.vue | 59 ++++++++++++++---------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue
index 261037b..2adb99b 100644
--- a/src/components/common/EditInformation.vue
+++ b/src/components/common/EditInformation.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="flex flex-col gap-y-6">
     <ModalView
-      :isOpen="isModalVisible"
+      :isOpen="isSuccessModalVisible"
       :type="'successType'"
-      @close="isModalVisible = !isModalVisible">
+      @close="isSuccessModalVisible = !isSuccessModalVisible">
       <template #header>정보가 수정되었습니다</template>
     </ModalView>
 
@@ -17,12 +17,12 @@
     </ModalView>
 
     <ModalView
-      :isOpen="isFailModalVisible"
-      :type="'failType'"
-      @click="failModalToggle"
-      @close="failModalToggle">
-      <template #header>{{ failHeader }}</template>
-      <template #body>{{ failBody }}</template>
+      :isOpen="isModalVisible"
+      :type="modalType"
+      @click="modalToggle"
+      @close="modalToggle">
+      <template #header>{{ modalHeader }}</template>
+      <template #body>{{ modalBody }}</template>
     </ModalView>
 
     <div class="profile">
@@ -154,12 +154,14 @@ const isInvalid = ref(false)
 const isFull = ref(false)
 const nameInput = ref<HTMLInputElement | null>(null)
 
-const isModalVisible = ref(false)
+const isSuccessModalVisible = ref(false)
 const isWarnningModalVisible = ref(false)
-const isFailModalVisible = ref(false)
+const isModalVisible = ref(false)
+
+const modalType = ref('')
 
-const failHeader = ref('')
-const failBody = ref('')
+const modalHeader = ref('')
+const modalBody = ref('')
 
 const nameError = ref('')
 
@@ -215,8 +217,8 @@ const warningModalToggle = () => {
   isWarnningModalVisible.value = !isWarnningModalVisible.value
 }
 
-const failModalToggle = () => {
-  isFailModalVisible.value = !isFailModalVisible.value
+const modalToggle = () => {
+  isModalVisible.value = !isModalVisible.value
 }
 
 const handleFileUpload = (event: Event) => {
@@ -228,23 +230,26 @@ const handleFileUpload = (event: Event) => {
     const fileExtension = fileName.split('.').pop()
 
     if (!fileExtension || !ALLOWED_FILE_EXTENSIONS.includes(fileExtension)) {
-      failHeader.value = '지원하지 않는 파일입니다'
-      failBody.value = 'jpg, jpeg, png, gif, bmp 파일만 업로드 가능합니다'
-      failModalToggle()
+      modalHeader.value = '지원하지 않는 파일입니다'
+      modalBody.value = 'jpg, jpeg, png, gif, bmp 파일만 업로드 가능합니다'
+      modalType.value = 'failType'
+      modalToggle()
       return
     }
     if (!ALLOWED_FILE_EXTENSIONS_IMAGE.includes(file.type)) {
-      failHeader.value = '파일 타입을 확인해주세요'
-      failBody.value = '파일 타입과 확장자명이 일치해야합니다'
-      failModalToggle()
+      modalHeader.value = '파일 타입을 확인해주세요'
+      modalBody.value = '파일 타입과 확장자명이 일치해야합니다'
+      modalType.value = 'failType'
+      modalToggle()
       return
     }
 
     const newFiles = Array.from(target.files).filter(file => file.size <= 5 * 1024 * 1024)
     if (newFiles.length !== target.files.length) {
-      failHeader.value = '이미지 용량을 확인해주세요'
-      failBody.value = '이미지 용량은 5mb까지 가능합니다'
-      failModalToggle()
+      modalHeader.value = '이미지 용량을 확인해주세요'
+      modalBody.value = '이미지 용량은 5mb까지 가능합니다'
+      modalType.value = 'failType'
+      modalToggle()
       return
     }
 
@@ -261,6 +266,11 @@ const handleFileDelete = () => {
 }
 
 const handleSubmit = async () => {
+  modalHeader.value = '정보 수정 중 입니다...'
+  modalBody.value = '잠시만 기다려주세요'
+  modalType.value = 'loadingType'
+  isModalVisible.value = true
+
   if (isInvalid.value == false && isFull.value == false) {
     const formData = new FormData()
     const memberInfo = {
@@ -281,7 +291,8 @@ const handleSubmit = async () => {
     }
 
     await patchEditInfo(formData)
-    isModalVisible.value = true
+    isModalVisible.value = false
+    isSuccessModalVisible.value = true
     await memberStore.updateMemberInfoWithToken()
   }
 }

From 51bdc50f483af86c153eaca5eeeecb7908a1f537 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Fri, 14 Feb 2025 16:03:51 +0900
Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EA=B3=B5?=
 =?UTF-8?q?=ED=86=B5=20=EC=97=90=EB=9F=AC=EC=97=90=20=EB=8C=80=ED=95=B4?=
 =?UTF-8?q?=EC=84=9C=20setError=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/axios.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index afb3e0f..92c5a46 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -49,7 +49,9 @@ const setInterceptors = (instance: AxiosInstance) => {
       } else if (error.response) {
         switch (error.response.status) {
           case 401:
-            if (error.response.data === 'AUTH_003') {
+            if (error.response.data === 'AUTH_016') {
+              setError('일치하는 정보가 없습니다', '아이디와 비밀번호를 다시 확인해주세요')
+            } else if (error.response.data === 'AUTH_003') {
               Cookies.remove('refreshToken')
               setError('유효하지 않은 토큰입니다', '다시 로그인 해주세요', redirectToLogin)
             } else if (error.response.data === 'AUTH_015') {

From 3642be64e54fe7bb2deff9eb634efba7f0194182 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Fri, 14 Feb 2025 19:07:17 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EC=A2=85?=
 =?UTF-8?q?=EB=A3=8C=20=EC=82=AC=EC=9C=A0=20=EB=AF=B8=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EC=8B=9C=20=EC=A2=85=EB=A3=8C=20=EC=82=AC=EC=9C=A0=20=EC=9E=85?=
 =?UTF-8?q?=EB=A0=A5=20=EB=AA=A8=EB=8B=AC=20=EB=8B=A4=EC=8B=9C=20=EB=9D=84?=
 =?UTF-8?q?=EC=9A=B0=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskStatusList.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/task-detail/TaskStatusList.vue b/src/components/task-detail/TaskStatusList.vue
index 2c25212..ed9ee78 100644
--- a/src/components/task-detail/TaskStatusList.vue
+++ b/src/components/task-detail/TaskStatusList.vue
@@ -55,6 +55,7 @@ const isModalVisible = ref({
   fail: false,
   success: false
 })
+const backModal = ref(false)
 
 const emit = defineEmits(['update:status'])
 const queryClient = useQueryClient()
@@ -74,7 +75,7 @@ const toggleModal = (key: keyof typeof isModalVisible.value) => {
 
 const closeModal = () => {
   const prevSuccess = isModalVisible.value.success
-  isModalVisible.value = { reject: false, fail: false, success: false }
+  isModalVisible.value = { reject: backModal.value ? true : false, fail: false, success: false }
   if (prevSuccess) queryClient.invalidateQueries({ queryKey: ['requested'] })
 }
 
@@ -92,8 +93,11 @@ const rejectRequest = async () => {
   if (rejectReason.value.length === 0) {
     toggleModal('fail')
     modalError.value = '종료 사유를 입력해주세요'
+    backModal.value = true
     return
   }
+
+  backModal.value = false
   await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, { reason: rejectReason.value })
   toggleModal('success')
   emit('update:status', 'TERMINATED')

From 77e78870ed5bb6ef283ce09b95df953b4a9ab278 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sat, 15 Feb 2025 00:22:27 +0900
Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EC=B4=88?=
 =?UTF-8?q?=EA=B8=B0=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8B=9C=20=EB=A6=AC?=
 =?UTF-8?q?=ED=94=84=EB=A0=88=EC=8B=9C=20=ED=86=A0=ED=81=B0=205=EB=B6=84?=
 =?UTF-8?q?=ED=9B=84=20=EB=A7=8C=EB=A3=8C=20=EC=95=88=EB=82=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PwChangeView.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/PwChangeView.vue b/src/views/PwChangeView.vue
index ebfdae6..6ed0add 100644
--- a/src/views/PwChangeView.vue
+++ b/src/views/PwChangeView.vue
@@ -21,7 +21,11 @@
       <TitleContainer
         v-else
         :title="'비밀번호\n재설정'"
-        content="새로운 비밀번호를 입력해주세요" />
+        :content="
+          !firstVisit
+            ? '새로운 비밀번호를 입력해주세요\n보안을 위해 링크는 5분 후 만료됩니다'
+            : '새로운 비밀번호를 입력해주세요'
+        " />
     </div>
     <form
       v-if="!isConfirmed"
@@ -124,6 +128,8 @@ const messageBody = ref('')
 const pw = ref('')
 const isConfirmed = ref(false)
 
+const firstVisit = ref(Cookies.get('accessToken') ? true : false)
+
 const handleCheck = async () => {
   await postPasswordCheck(pw.value)
   isConfirmed.value = true