From 7ba008b5f7937bf00b0a94cd842e586ea25bcc59 Mon Sep 17 00:00:00 2001
From: Lee-Dongwook <dlehddnr0713@gmail.com>
Date: Mon, 25 Sep 2023 20:37:50 +0900
Subject: [PATCH 1/5] =?UTF-8?q?feat(find=20password)=20=EB=B9=84=EB=B0=80?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=B0=BE=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StartPage/StartAnimationPage.js           | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/client/src/components/StartPage/StartAnimationPage.js b/client/src/components/StartPage/StartAnimationPage.js
index 60ba6efc..9ee5b952 100644
--- a/client/src/components/StartPage/StartAnimationPage.js
+++ b/client/src/components/StartPage/StartAnimationPage.js
@@ -241,6 +241,8 @@ function StartAnimation() {
   const [showModal, setShowModal] = useState(false);
   
   const [firstShowModal, setFirstShowModal] = useState(false);
+
+  const [passwordModal, setPasswordModal] = useState(false);
   
   const [name, setName] = useState("1"); //이름
   
@@ -290,6 +292,14 @@ function StartAnimation() {
     }
   };
 
+  const handlePasswordModalOpen = () => {
+    setPasswordModal(true)
+  }
+
+  const handlePasswordModalClose = () => {
+    setPasswordModal(false)
+  }
+
   const handleNameChange = (event) => setName(event.target.value);
   
   const handleGenderChange = (event) => setGender(event.target.value);
@@ -524,7 +534,26 @@ function StartAnimation() {
               </Button>
               </Form>
             </Modal.Body>
-            <Modal.Footer></Modal.Footer>
+            <Modal.Footer>
+              <Button
+                onClick={handlePasswordModalOpen}
+              >
+                비밀번호 찾기
+              </Button>
+              <Modal
+               show={passwordModal}
+               onHide={handlePasswordModalClose}
+              >
+              <Modal.Header closeButton>
+                <Modal.Title>Find Password</Modal.Title>
+              </Modal.Header>
+              <Modal.Body>
+                <Form>
+                  <Form.Control />
+                </Form>
+              </Modal.Body>
+              </Modal>
+            </Modal.Footer>
           </Modal>
           </td>
           <td>

From 6702de8a17a1b3578e9b8b42519b6ce2b6a12e8e Mon Sep 17 00:00:00 2001
From: Lee-Dongwook <dlehddnr0713@gmail.com>
Date: Mon, 25 Sep 2023 21:04:07 +0900
Subject: [PATCH 2/5] =?UTF-8?q?feat(verifyAccompany)=20=EB=8F=99=ED=96=89?=
 =?UTF-8?q?=20=EC=8B=A0=EC=B2=AD=20=EB=B2=84=ED=8A=BC=20=EA=B8=B0=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/MyPage/MyPage.js | 32 +++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/client/src/components/MyPage/MyPage.js b/client/src/components/MyPage/MyPage.js
index 6c264ffc..4ec49af2 100644
--- a/client/src/components/MyPage/MyPage.js
+++ b/client/src/components/MyPage/MyPage.js
@@ -68,7 +68,7 @@ function MyPage() {
   
   const [withdrawModal, setWithdrawModal] = useState(false);
 
-  const [accompanyList, setAccompanyList] = useState(["안녕하세요","안녕하세요","안녕하세요","안녕하세요","안녕하세요"]) // 동행 신청 현황
+  const [accompanyList, setAccompanyList] = useState(["1","2","3","4","5"]) // 동행 신청 현황
 
   var ranklist = "";
   var size = posts.length;
@@ -505,13 +505,33 @@ function MyPage() {
             <Card key={idx} style={{
               height: '100px'
             }} >
-              {item}
-              <Button
+              <h6>여행 일정 :</h6>
+              <h6>신청자 : </h6> 
+              <h6>신청 내용 : {item.length <= 50 ? item : item.slice(0,50) + '...'}</h6>
+              <table>
+                <td><Button
+                onClick={(e) => {
+                  const updateList = accompanyList.filter((listItem) => listItem !== item)
+                  setAccompanyList(updateList);
+                }}
                 style={{
-                  width: '50px',
-                  height: '50px'
+                  marginTop: '-15%',
+                  marginLeft: '170%',
+                  width: '40px',
+                  height: '40px'
                 }}
-              >O</Button>
+              >O</Button></td>
+                <td>
+                  <Button  onClick= {(e) => {
+                  const updateList = accompanyList.filter((listItem) => listItem !== item)
+                  setAccompanyList(updateList);
+                  }} 
+                  style={{marginTop: '-15%', marginLeft: '85%',width: '40px', height: '40px'}}>
+                    X
+                  </Button>
+                </td>
+              </table>
+              
             </Card>
           )}
         </div>

From 6a3a47921f67beb24be22e0f02f4b6b3bf7654ca Mon Sep 17 00:00:00 2001
From: Lee-Dongwook <dlehddnr0713@gmail.com>
Date: Mon, 25 Sep 2023 21:51:40 +0900
Subject: [PATCH 3/5] =?UTF-8?q?feat(notification)=20=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20JSON=20Parsing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/Navbar/Navbar.css |  2 +-
 client/src/components/Navbar/Navbar.js  | 28 ++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/src/components/Navbar/Navbar.css b/client/src/components/Navbar/Navbar.css
index 60d84422..7b14069b 100644
--- a/client/src/components/Navbar/Navbar.css
+++ b/client/src/components/Navbar/Navbar.css
@@ -294,7 +294,7 @@
   }
   
   .drawer .btn {
-    width: 100%;
+    width: 80%;
     text-align: left;
     padding: 10px;
     color: #fff;
diff --git a/client/src/components/Navbar/Navbar.js b/client/src/components/Navbar/Navbar.js
index 7bde879c..5fd74590 100644
--- a/client/src/components/Navbar/Navbar.js
+++ b/client/src/components/Navbar/Navbar.js
@@ -40,12 +40,23 @@ function NavBar() {
     })
 
     eventSource.addEventListener('SSE',event => {
-      console.log("event",event);
 
       const newMessage = event.data;
 
-      console.log('newMessage : ', event.data);
-      setMessages(prevMessages => [...prevMessages, newMessage]);
+      if(newMessage[0] === '{')
+      {
+         const jsonData = JSON.parse(newMessage);
+
+         const senderName = jsonData.senderName;
+         const review = jsonData.review;
+         const postDate = jsonData.postDate;
+
+         const notificationString = `${senderName}님이\n ${review.slice(0,4)}..를 입력하였습니다.\n ${postDate}`
+         setMessages(prevMessages => [...prevMessages, notificationString])
+        }
+      else{
+        setMessages(prevMessages => [...prevMessages, newMessage]);
+      }
     });
 
     eventSource.onopen =() => {
@@ -53,17 +64,6 @@ function NavBar() {
       console.log('eventSource',eventSource);
     }
 
-    eventSource.onmessage = (event) => {
-      try{
-        console.log('SSE message received: ', event.data);
-        const newMessage = event.data;
-        setMessages(prevMessages => [...prevMessages, newMessage]);
-      }
-      catch(error){
-        console.log("Error in onmessage: ", error);
-      }
-    }
-
     eventSource.onerror = (error) => {
       console.log("SSE connection closed");
     }

From cd9b7a1ebcf02fdae7708cd6d0511c5f0579a6dd Mon Sep 17 00:00:00 2001
From: Lee-Dongwook <dlehddnr0713@gmail.com>
Date: Mon, 25 Sep 2023 21:54:59 +0900
Subject: [PATCH 4/5] =?UTF-8?q?feat(logout)=20Logout=20API=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/Navbar/Navbar.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Navbar/Navbar.js b/client/src/components/Navbar/Navbar.js
index 5fd74590..e28f2c27 100644
--- a/client/src/components/Navbar/Navbar.js
+++ b/client/src/components/Navbar/Navbar.js
@@ -105,8 +105,9 @@ function NavBar() {
   }
 
   function logout() {
-    axios
-      .get("http://localhost:8080/api/members/logout",{
+    if(token !== null){
+      axios
+      .post("http://localhost:8080/api/members/logout",token,{
         headers:{
         'Authorization': `Bearer ${token}`
         }
@@ -125,6 +126,7 @@ function NavBar() {
       });
 
     window.location.href = "/";
+    }
   }
 
   var offset = localStorage.getItem("vest");

From 52b27d9dbb17b01e8672f5ecac9aac2d16a63875 Mon Sep 17 00:00:00 2001
From: YongHyunHong <108213846+YongHyunHong@users.noreply.github.com>
Date: Mon, 25 Sep 2023 22:03:25 +0900
Subject: [PATCH 5/5] =?UTF-8?q?[feat]=20=EB=A1=9C=EA=B7=B8=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=EB=A0=88=EB=94=94=EC=8A=A4=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TripPlannerZ/RedisConfig.java             |  6 +++++
 .../TripPlannerZ/config/JwtAuthFilter.java    |  8 +++++++
 .../TripPlannerZ/config/SecurityConfig.java   |  4 +++-
 .../controller/MemberController.java          | 22 ++++++-------------
 .../TripPlannerZ/dto/member/BlackList.java    | 13 +++++++++++
 .../TripPlannerZ/service/AuthService.java     | 16 ++++++++++++++
 .../TripPlannerZ/util/RedisUtil.java          | 11 ++++++++++
 7 files changed, 64 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/GraduationProject/TripPlannerZ/dto/member/BlackList.java
 create mode 100644 src/main/java/GraduationProject/TripPlannerZ/service/AuthService.java

diff --git a/src/main/java/GraduationProject/TripPlannerZ/RedisConfig.java b/src/main/java/GraduationProject/TripPlannerZ/RedisConfig.java
index 027d22ef..30b1f982 100644
--- a/src/main/java/GraduationProject/TripPlannerZ/RedisConfig.java
+++ b/src/main/java/GraduationProject/TripPlannerZ/RedisConfig.java
@@ -33,6 +33,12 @@ public RedisConnectionFactory redisConnectionFactory() {
         return redisTemplate;
     }
 
+    @Bean
+    public RedisTemplate<?, ?> blackList() {
+        RedisTemplate<byte[], byte[]> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory((redisConnectionFactory()));
+        return redisTemplate;
+    }
 
 
 }
diff --git a/src/main/java/GraduationProject/TripPlannerZ/config/JwtAuthFilter.java b/src/main/java/GraduationProject/TripPlannerZ/config/JwtAuthFilter.java
index dd6dbb70..028c89bb 100644
--- a/src/main/java/GraduationProject/TripPlannerZ/config/JwtAuthFilter.java
+++ b/src/main/java/GraduationProject/TripPlannerZ/config/JwtAuthFilter.java
@@ -1,5 +1,6 @@
 package GraduationProject.TripPlannerZ.config;
 
+import GraduationProject.TripPlannerZ.util.RedisUtil;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
@@ -16,6 +17,7 @@
 public class JwtAuthFilter extends OncePerRequestFilter {
 
     private final UserAuthProvider userAuthProvider;
+    private final RedisUtil redisUtil;
 
     @Override
     protected void doFilterInternal(HttpServletRequest request,
@@ -29,6 +31,12 @@ protected void doFilterInternal(HttpServletRequest request,
             String[] elements = header.split(" ");
             System.out.println("elements[1] = " + elements[1]);
 
+            if (elements.length == 2 && "Bearer".equals(elements[0])) {
+                if (redisUtil.existBlackList(elements[1])) {
+                    throw new RuntimeException("유효하지 않은 토큰 입니다.");
+                }
+            }
+
             // key가 Bearer이고 value가 멤버의 토큰값
             if (elements.length == 2 && "Bearer".equals(elements[0])) {
                 try {
diff --git a/src/main/java/GraduationProject/TripPlannerZ/config/SecurityConfig.java b/src/main/java/GraduationProject/TripPlannerZ/config/SecurityConfig.java
index 69110953..0fc39855 100644
--- a/src/main/java/GraduationProject/TripPlannerZ/config/SecurityConfig.java
+++ b/src/main/java/GraduationProject/TripPlannerZ/config/SecurityConfig.java
@@ -1,5 +1,6 @@
 package GraduationProject.TripPlannerZ.config;
 
+import GraduationProject.TripPlannerZ.util.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,13 +18,14 @@ public class SecurityConfig {
 
     private final UserAuthenticationEntryPoint userAuthenticationEntryPoint;
     private final UserAuthProvider userAuthProvider;
+    private final RedisUtil redisUtil;
 
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         http
                 .exceptionHandling().authenticationEntryPoint(userAuthenticationEntryPoint)
                 .and()
-                .addFilterBefore(new JwtAuthFilter(userAuthProvider), BasicAuthenticationFilter.class)
+                .addFilterBefore(new JwtAuthFilter(userAuthProvider, redisUtil), BasicAuthenticationFilter.class)
                 .csrf().disable()
                 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
                 .and()
diff --git a/src/main/java/GraduationProject/TripPlannerZ/controller/MemberController.java b/src/main/java/GraduationProject/TripPlannerZ/controller/MemberController.java
index ba646567..94c0743f 100644
--- a/src/main/java/GraduationProject/TripPlannerZ/controller/MemberController.java
+++ b/src/main/java/GraduationProject/TripPlannerZ/controller/MemberController.java
@@ -2,19 +2,15 @@
 
 import GraduationProject.TripPlannerZ.config.UserAuthProvider;
 import GraduationProject.TripPlannerZ.domain.MemberPreference;
-import GraduationProject.TripPlannerZ.dto.member.Credential;
-import GraduationProject.TripPlannerZ.dto.member.MemberDto;
-import GraduationProject.TripPlannerZ.dto.member.MemberRegister;
+import GraduationProject.TripPlannerZ.dto.member.*;
 import GraduationProject.TripPlannerZ.domain.Member;
-import GraduationProject.TripPlannerZ.dto.member.ChangeMemberInfo;
 import GraduationProject.TripPlannerZ.delete.MemberLogin;
-import GraduationProject.TripPlannerZ.dto.member.MemberTrip;
-import GraduationProject.TripPlannerZ.dto.member.MyPage;
 import GraduationProject.TripPlannerZ.service.*;
 
 
 import GraduationProject.TripPlannerZ.service.TripService;
 import GraduationProject.TripPlannerZ.sseEmitter.SseEmitterService;
+import GraduationProject.TripPlannerZ.util.RedisUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
@@ -38,12 +34,10 @@
 public class MemberController {
 
     private final MemberService memberService;
-    private final LoginService loginService;
-    private final TripService tripService;
     private final MemberPreferenceService memberPreferenceService;
     private final UserAuthProvider userAuthProvider;
     private final SseEmitterService sseEmitterService;
-    private final PartyService partyService;
+    private final AuthService authService;
 
 
 
@@ -81,12 +75,10 @@ public SseEmitter subscribe() {
 
     }
 
-    @GetMapping("/members/logout")
-    public void logout(HttpServletRequest request) {
-        HttpSession session = request.getSession(false);
-
-        if (session != null)
-            session.invalidate();
+    @PostMapping("/members/logout")
+    public void logout(@RequestBody BlackList blackList) {
+        System.out.println("blackList.getToken() = " + blackList.getToken());
+        authService.logout(blackList.getToken());
     }
 
     @GetMapping("/members/tripInfo")
diff --git a/src/main/java/GraduationProject/TripPlannerZ/dto/member/BlackList.java b/src/main/java/GraduationProject/TripPlannerZ/dto/member/BlackList.java
new file mode 100644
index 00000000..61fab027
--- /dev/null
+++ b/src/main/java/GraduationProject/TripPlannerZ/dto/member/BlackList.java
@@ -0,0 +1,13 @@
+package GraduationProject.TripPlannerZ.dto.member;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class BlackList {
+
+    private String token;
+}
diff --git a/src/main/java/GraduationProject/TripPlannerZ/service/AuthService.java b/src/main/java/GraduationProject/TripPlannerZ/service/AuthService.java
new file mode 100644
index 00000000..1668cf9c
--- /dev/null
+++ b/src/main/java/GraduationProject/TripPlannerZ/service/AuthService.java
@@ -0,0 +1,16 @@
+package GraduationProject.TripPlannerZ.service;
+
+import GraduationProject.TripPlannerZ.util.RedisUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class AuthService {
+
+    private final RedisUtil redisUtil;
+
+    public void logout(String accessToken) {
+        redisUtil.setBlackList(accessToken, "BlackList", 3_600_000);
+    }
+}
diff --git a/src/main/java/GraduationProject/TripPlannerZ/util/RedisUtil.java b/src/main/java/GraduationProject/TripPlannerZ/util/RedisUtil.java
index eac82a83..8b3e9ff0 100644
--- a/src/main/java/GraduationProject/TripPlannerZ/util/RedisUtil.java
+++ b/src/main/java/GraduationProject/TripPlannerZ/util/RedisUtil.java
@@ -14,6 +14,7 @@
 public class RedisUtil {
 
     private final StringRedisTemplate redisTemplate;
+    private final StringRedisTemplate blackList;
 
     public String getData(String key) {
         ValueOperations<String, String> valueOperations = redisTemplate.opsForValue();
@@ -27,6 +28,12 @@ public void setDataExpire(String key, String value, long duration) {
         valueOperations.set(key, value, expireDuration);
     }
 
+    public void setBlackList(String key, String value, long duration) {
+        ValueOperations<String, String> valueOperations = blackList.opsForValue();
+        Duration expireDuration = Duration.ofSeconds(duration);
+        valueOperations.set(key, "BlackList", expireDuration);
+    }
+
     public void deleteData(String key) {
         // 데이터 삭제
         redisTemplate.delete(key);
@@ -36,4 +43,8 @@ public boolean existData(String key) {
         return Boolean.TRUE.equals(redisTemplate.hasKey(key));
     }
 
+    public boolean existBlackList(String key) {
+        return Boolean.TRUE.equals(blackList.hasKey(key));
+    }
+
 }