From 3f7c32e299338aa8b55178a2ad31873af5278a70 Mon Sep 17 00:00:00 2001
From: hoon7566 <hoon7566@gmail.com>
Date: Fri, 18 Mar 2022 15:16:49 +0900
Subject: [PATCH] =?UTF-8?q?feat(customer-vue):=20customer=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=95=84=EC=9B=83=20=EA=B8=B0=EB=8A=A5=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- customer 로그아웃 기능추가
---
 customer-vue/src/api/auth.js                    |  8 ++++++++
 customer-vue/src/common/jwt.js                  |  3 +++
 customer-vue/src/components/AppNavigation.vue   | 17 ++++++++++++++++-
 customer-vue/src/router/router.js               |  3 +--
 customer-vue/src/views/LoginPage.vue            |  1 -
 .../domain/jwt/service/OAuthService.java        | 11 -----------
 6 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/customer-vue/src/api/auth.js b/customer-vue/src/api/auth.js
index 2c51de7..8066857 100644
--- a/customer-vue/src/api/auth.js
+++ b/customer-vue/src/api/auth.js
@@ -1,5 +1,6 @@
 import axios from "axios";
 import jwt from "@/common/jwt";
+import router from "@/router/router";
 
 export default {
   async requestReissue() {
@@ -22,5 +23,12 @@ export default {
     axios.defaults.headers.common['Authorization'] =  "Bearer " + jwt.getToken();
 
     return axios.get(process.env.VUE_APP_CUSTOMER_SERVICE_BASEURL+"/user-service/auth/check/access-token");
+  },
+  logout(){
+    axios.post(process.env.VUE_APP_CUSTOMER_SERVICE_BASEURL+"/user-service/auth/logout",'',{headers: {"X-AUTH-TOKEN": jwt.getToken(),}})
+        .finally(()=>{
+          router.push('/login')
+          jwt.destroyAll()
+        })
   }
 }
\ No newline at end of file
diff --git a/customer-vue/src/common/jwt.js b/customer-vue/src/common/jwt.js
index 0783eb5..a453450 100644
--- a/customer-vue/src/common/jwt.js
+++ b/customer-vue/src/common/jwt.js
@@ -23,6 +23,9 @@ export default {
     localStorage.removeItem(EXPIRED_TIME_NAME);
   },
   isExpired() {
+    if(this.getExpiredTime() == null || this.getToken() == null)
+      return true;
+
     const expiredTime = this.getExpiredTime();
 
     const expiredMoment = moment(expiredTime);
diff --git a/customer-vue/src/components/AppNavigation.vue b/customer-vue/src/components/AppNavigation.vue
index 85e7734..8a271e2 100644
--- a/customer-vue/src/components/AppNavigation.vue
+++ b/customer-vue/src/components/AppNavigation.vue
@@ -6,7 +6,7 @@
       elevation="1"
 
   >
-    <v-app-bar-nav-icon>
+    <v-app-bar-nav-icon @click="$router.back()">
       <v-icon>mdi-arrow-left</v-icon>
     </v-app-bar-nav-icon>
     <v-spacer></v-spacer>
@@ -29,16 +29,31 @@
             <v-icon>mdi-bell-outline</v-icon>
         </v-badge>
       </v-btn>
+    <v-btn
+        color="white"
+        elevation="0"
+        @click="logout"
+    >
+        <v-icon>mdi-logout</v-icon>
+    </v-btn>
   </v-app-bar>
 </template>
 
 <script>
+import authApi from "@/api/auth";
+
 export default {
   name: "AppNavigation",
   props: ["notificationCounts"],
   methods: {
     goNotification: function() {
       this.$router.push('/notification');
+    },
+    logout: function () {
+      if(confirm("로그아웃하시겠습니까?")){
+        authApi.logout();
+
+      }
     }
   }
 }
diff --git a/customer-vue/src/router/router.js b/customer-vue/src/router/router.js
index 6eaa965..21be65f 100644
--- a/customer-vue/src/router/router.js
+++ b/customer-vue/src/router/router.js
@@ -32,7 +32,6 @@ const routes = [
   {
     path: '/',
     redirect: 'home',
-    beforeEnter: authCheck,
     component: HomeLayout,
     children: [
       {
@@ -93,12 +92,12 @@ const routes = [
   {
     path: '/store',
     redirect: 'store',
-    beforeEnter: authCheck,
     component: StoreLayout,
     children: [
       {
         path: "/store/:storeId",
         name: "store",
+        beforeEnter: authCheck,
         component: () => import('../views/StoreView'),
         props: true
       },
diff --git a/customer-vue/src/views/LoginPage.vue b/customer-vue/src/views/LoginPage.vue
index 9f46eb6..471ae1a 100644
--- a/customer-vue/src/views/LoginPage.vue
+++ b/customer-vue/src/views/LoginPage.vue
@@ -120,7 +120,6 @@ export default {
     },
   },
   async mounted() {
-
     if (!jwt.isExpired())
       await router.push("/");
 
diff --git a/user-service/src/main/java/com/justpickup/userservice/domain/jwt/service/OAuthService.java b/user-service/src/main/java/com/justpickup/userservice/domain/jwt/service/OAuthService.java
index 76363a9..fcf0ffe 100644
--- a/user-service/src/main/java/com/justpickup/userservice/domain/jwt/service/OAuthService.java
+++ b/user-service/src/main/java/com/justpickup/userservice/domain/jwt/service/OAuthService.java
@@ -1,11 +1,9 @@
 package com.justpickup.userservice.domain.jwt.service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.justpickup.userservice.domain.user.dto.OAuthAttributeDto;
 import com.justpickup.userservice.domain.user.entity.Customer;
 import com.justpickup.userservice.domain.user.repository.CustomerRepository;
 import com.justpickup.userservice.domain.user.service.UserServiceImpl;
-import com.justpickup.userservice.global.dto.Result;
 import com.justpickup.userservice.global.utils.CookieProvider;
 import com.justpickup.userservice.global.utils.JwtTokenProvider;
 import lombok.RequiredArgsConstructor;
@@ -30,8 +28,6 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@@ -42,8 +38,6 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 public class OAuthService implements OAuth2UserService<OAuth2UserRequest, OAuth2User> {
 
     private final CustomerRepository customerRepository;
-    private final HttpServletResponse response;
-    private final HttpServletRequest request;
     private final JwtTokenProvider jwtTokenProvider;
     private final RefreshTokenService refreshTokenService;
     private final UserServiceImpl userServiceImpl;
@@ -71,11 +65,6 @@ public class OAuthService implements OAuth2UserService<OAuth2UserRequest, OAuth2
 
         Collection<? extends GrantedAuthority> authorities = userServiceImpl.loadUserByUsername(userEmail).getAuthorities();
 
-        List<String> roles = authorities
-                .stream()
-                .map(GrantedAuthority::getAuthority)
-                .collect(Collectors.toList());
-
         return new DefaultOAuth2User(
                 authorities
                 , attributeDto.getAttributes()