From 22543d0f156cb91df652801708f0d322ed495f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Wed, 14 Sep 2022 19:32:29 +0900
Subject: [PATCH] Store_Vuex init...

---
 .env                                          |  2 +-
 src/components/LoginComponent.vue             | 25 +++-----
 src/components/todo/ListComponent.vue         | 13 +++--
 src/interceptors/auth.Iterceptor.js           | 53 +++++++++++++++++
 .../auth.api.js}                              |  4 +-
 src/interceptors/todo.Iterceptor.js           | 58 +++++++++++++++++++
 src/interceptors/todo.api.js                  |  6 ++
 src/router/index.js                           |  9 ++-
 src/service/auth.service.js                   |  7 +++
 src/service/todo.service.js                   |  7 +++
 src/service/token.service.js                  | 26 +++++++++
 src/store/{authStore.js => auth.store.js}     |  0
 src/store/authIterceptors.js                  | 46 ---------------
 src/store/index.js                            | 12 ++--
 src/store/todo.store.js                       | 24 ++++++++
 src/store/todoStore.js                        | 55 ------------------
 16 files changed, 213 insertions(+), 134 deletions(-)
 create mode 100644 src/interceptors/auth.Iterceptor.js
 rename src/{service/authService.js => interceptors/auth.api.js} (68%)
 create mode 100644 src/interceptors/todo.Iterceptor.js
 create mode 100644 src/interceptors/todo.api.js
 create mode 100644 src/service/auth.service.js
 create mode 100644 src/service/todo.service.js
 create mode 100644 src/service/token.service.js
 rename src/store/{authStore.js => auth.store.js} (100%)
 delete mode 100644 src/store/authIterceptors.js
 create mode 100644 src/store/todo.store.js
 delete mode 100644 src/store/todoStore.js

diff --git a/.env b/.env
index 06fc746..226c340 100644
--- a/.env
+++ b/.env
@@ -5,7 +5,7 @@
 # See the documentation for all the connection string options: https://pris.ly/d/connection-strings
 VUE_APP_AUTH_HOST="http://localhost:2000"
 
-VUE_APP_BACKEND_HOST="http://localhost:3000"
+VUE_APP_TODO_HOST="http://localhost:3000"
 
 #LocalStorage는 Edge 브라우저의 개발툴 > 응용프로그램 > 로컬 저장소에서 확인가능
 VUE_APP_TABLE_DEFAULT_PERPAGE = 10
\ No newline at end of file
diff --git a/src/components/LoginComponent.vue b/src/components/LoginComponent.vue
index be9b3c3..46b75f1 100644
--- a/src/components/LoginComponent.vue
+++ b/src/components/LoginComponent.vue
@@ -49,7 +49,7 @@
 
 <script>
 // 참고 : https://kdydesign.github.io/2019/04/06/vuejs-vuex-helper/
-import authService from '../service/authService'
+import authService from '../service/auth.service'
 export default {
   data() {
     //console.log(this.$route)
@@ -80,25 +80,18 @@ export default {
     getValidationState({ dirty, validated, valid = null }) {
       return dirty || validated ? valid : null
     },
-    async onSubmit() {
-      //인증서버에서 인증코드받기
-      authService
-        .post('/auth/login', {
+    onSubmit() {
+      try {
+        authService.login({
           email: this.form.email,
           password: this.form.password
         })
-        .then(() => {
-          this.$router
-            .push({
-              name: this.$route.params.return_url || 'home'
-            })
-            .catch((e) => {
-              throw new Error('router 오류\n' + +e.response.data.message)
-            })
-        })
-        .catch((e) => {
-          alert(e)
+        this.$router.push({
+          name: this.$route.params.return_url || 'home'
         })
+      } catch (e) {
+        alert(e.response.data.message)
+      }
     }
   }
 }
diff --git a/src/components/todo/ListComponent.vue b/src/components/todo/ListComponent.vue
index 8d9daa8..2f50b02 100644
--- a/src/components/todo/ListComponent.vue
+++ b/src/components/todo/ListComponent.vue
@@ -136,6 +136,7 @@
   </div>
 </template>
 <script>
+import todoService from '@/service/todo.service'
 import { createNamespacedHelpers } from 'vuex'
 const todoStore = createNamespacedHelpers('TodoStore')
 // 참조 : https://vuejsexamples.com/vuejs-tables-and-select-all-checkbox/
@@ -247,8 +248,8 @@ export default {
   },
   methods: {
     async setDatas(page = 1) {
-      await this.$store
-        .dispatch('TodoStore/setDatas', {
+      try {
+        const datas = await todoService.setDatas({
           page: page,
           perPage: this.perPage,
           sortBy: this.sortBy,
@@ -260,9 +261,11 @@ export default {
           filterDateStart: this.filterDateStart,
           filterDateEnd: this.filterDateEnd
         })
-        .catch((e) => {
-          alert(e)
-        })
+        console.log(datas)
+      } catch (e) {
+        console.log(e)
+        alert(e.response.data.message)
+      }
     },
     searchClick() {
       this.setDatas()
diff --git a/src/interceptors/auth.Iterceptor.js b/src/interceptors/auth.Iterceptor.js
new file mode 100644
index 0000000..103983b
--- /dev/null
+++ b/src/interceptors/auth.Iterceptor.js
@@ -0,0 +1,53 @@
+import api from './auth.api'
+import jwt from '../service/jwt'
+//참조: https://www.bezkoder.com/vue-refresh-token/
+const setup = (store) => {
+  //API Request 전 처리용
+  api.defaults.headers.post['Content-Type'] =
+    'application/x-www-form-urlencoded'
+  //Request 처리용
+  api.interceptors.request.use(
+    (config) => jwt.getAuthorizationHeader(config),
+    (error) => {
+      // Do something with request error
+      Promise.reject(error)
+    }
+  )
+
+  //AccessToken이 만료된경우 다시 받기위한 함수
+  const reloadAccessToken = async (originalConfig) => {
+    // Access Token이 expired,오류로 인한 response 401 답볍을 받은경우
+    originalConfig._retry = true
+    try {
+      //Refresh Token으로 다시 Access Token 재생성 후 로그인 다시하라고 오류보냄
+      await api
+        .post('/auth/reload', {
+          refresh_token: jwt.getRefreshToken()
+        })
+        .then((rs) => {
+          store.dispatch('reload', rs.data.access_token)
+        })
+      return api(originalConfig)
+    } catch (_error) {
+      return Promise.reject(_error)
+    }
+  }
+  //Response 처리용
+  api.interceptors.response.use(
+    (response) => {
+      console.log('AUTH API Call 성공=>' + response)
+      return response
+    },
+    async (err) => {
+      // Do something with response error
+      const originalConfig = err.config
+      if (originalConfig.url !== '/auth/login' && err.response) {
+        if (err.response.status === 401 && !originalConfig._retry) {
+          return await reloadAccessToken(originalConfig)
+        }
+      }
+      return Promise.reject(err)
+    }
+  )
+}
+export default setup
diff --git a/src/service/authService.js b/src/interceptors/auth.api.js
similarity index 68%
rename from src/service/authService.js
rename to src/interceptors/auth.api.js
index c02a4fc..e0c2971 100644
--- a/src/service/authService.js
+++ b/src/interceptors/auth.api.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
-const instance = axios.create({
+const authAPI = axios.create({
   baseURL: process.env.VUE_APP_AUTH_HOST,
   headers: { 'Content-type': 'application/json' }
 })
 
-export default instance
+export default authAPI
diff --git a/src/interceptors/todo.Iterceptor.js b/src/interceptors/todo.Iterceptor.js
new file mode 100644
index 0000000..2f6fb98
--- /dev/null
+++ b/src/interceptors/todo.Iterceptor.js
@@ -0,0 +1,58 @@
+import api from './auth.api'
+import jwt from '../service/jwt'
+//참조: https://www.bezkoder.com/vue-refresh-token/
+const setup = (store) => {
+  //API Request 전 처리용
+  api.defaults.headers.post['Content-Type'] =
+    'application/x-www-form-urlencoded'
+  //Request 처리용
+  api.interceptors.request.use(
+    (config) => jwt.getAuthorizationHeader(config),
+    (error) => {
+      // Do something with request error
+      Promise.reject(error)
+    }
+  )
+
+  //AccessToken이 만료된경우 다시 받기위한 함수
+  const reloadAccessToken = async (originalConfig) => {
+    // Access Token이 expired,오류로 인한 response 401 답볍을 받은경우
+    originalConfig._retry = true
+    try {
+      //Refresh Token으로 다시 Access Token 재생성 후 로그인 다시하라고 오류보냄
+      await api
+        .post('/auth/reload', {
+          refresh_token: jwt.getRefreshToken()
+        })
+        .then((rs) => {
+          store.dispatch('reload', rs.data.access_token)
+        })
+      return api(originalConfig)
+    } catch (_error) {
+      return Promise.reject(_error)
+    }
+  }
+  //Response 처리용
+  api.interceptors.response.use(
+    async (response) => {
+      switch (response.config.url) {
+        case '/todo':
+          await store.dispatch('setDatas', response.data)
+          break
+      }
+      return response
+    },
+    async (err) => {
+      // Do something with response error
+      const originalConfig = err.config
+      if (originalConfig.url !== '/auth/login' && err.response) {
+        if (err.response.status === 401 && !originalConfig._retry) {
+          return await reloadAccessToken(originalConfig)
+        }
+      }
+      console.log('TODO API Call 오류=>' + err)
+      return Promise.reject(err)
+    }
+  )
+}
+export default setup
diff --git a/src/interceptors/todo.api.js b/src/interceptors/todo.api.js
new file mode 100644
index 0000000..aa189fc
--- /dev/null
+++ b/src/interceptors/todo.api.js
@@ -0,0 +1,6 @@
+import axios from 'axios'
+const todoAPI = axios.create({
+  baseURL: process.env.VUE_APP_TODO_HOST,
+  headers: { 'Content-type': 'application/json' }
+})
+export default todoAPI
diff --git a/src/router/index.js b/src/router/index.js
index 0228fee..91b1434 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -33,8 +33,8 @@ const routes = [
     component: () =>
       import(
         /* webpackChunkName: "api", webpackPrefetch:true */ '@/views/todoView.vue'
-      ),
-    meta: { requiredAuth: true }
+      )
+    //meta: { requiredAuth: true }
   }
 ]
 
@@ -62,9 +62,8 @@ router.beforeEach((to, from, next) => {
   //1. routes 설정에서 meta: { requiredAuth: true } 가 선언된 경우
   if (to.matched.some((route) => route.meta.requiredAuth)) {
     //2. 로그인 체크용
-    const access_token = jwt.getToken('access_token')
-    const refresh_token = jwt.getToken('refresh_token')
-    if (access_token === null && refresh_token !== null) {
+    const access_token = jwt.getAccessToken()
+    if (access_token === null && jwt.getRefreshToken() !== null) {
       //refreshToken은 있고 accessToken이 없을 경우 토큰 재발급 요청
       this.$store.dispatch('refreshToken')
     } else if (access_token) {
diff --git a/src/service/auth.service.js b/src/service/auth.service.js
new file mode 100644
index 0000000..5f1f42f
--- /dev/null
+++ b/src/service/auth.service.js
@@ -0,0 +1,7 @@
+import api from '../interceptors/auth.api'
+class AuthService {
+  async login(params) {
+    return await api.get('/auth/login', params)
+  }
+}
+export default new AuthService()
diff --git a/src/service/todo.service.js b/src/service/todo.service.js
new file mode 100644
index 0000000..d6b1a67
--- /dev/null
+++ b/src/service/todo.service.js
@@ -0,0 +1,7 @@
+import api from '../interceptors/todo.api'
+class TodoService {
+  async setDatas(params) {
+    return await api.get('/todo', { params: params })
+  }
+}
+export default new TodoService()
diff --git a/src/service/token.service.js b/src/service/token.service.js
new file mode 100644
index 0000000..8667479
--- /dev/null
+++ b/src/service/token.service.js
@@ -0,0 +1,26 @@
+class TokenService {
+  getLocalRefreshToken() {
+    const user = JSON.parse(localStorage.getItem('user'))
+    return user?.refreshToken
+  }
+  getLocalAccessToken() {
+    const user = JSON.parse(localStorage.getItem('user'))
+    return user?.accessToken
+  }
+  updateLocalAccessToken(token) {
+    let user = JSON.parse(localStorage.getItem('user'))
+    user.accessToken = token
+    localStorage.setItem('user', JSON.stringify(user))
+  }
+  getUser() {
+    return JSON.parse(localStorage.getItem('user'))
+  }
+  setUser(user) {
+    console.log(JSON.stringify(user))
+    localStorage.setItem('user', JSON.stringify(user))
+  }
+  removeUser() {
+    localStorage.removeItem('user')
+  }
+}
+export default new TokenService()
diff --git a/src/store/authStore.js b/src/store/auth.store.js
similarity index 100%
rename from src/store/authStore.js
rename to src/store/auth.store.js
diff --git a/src/store/authIterceptors.js b/src/store/authIterceptors.js
deleted file mode 100644
index bac3545..0000000
--- a/src/store/authIterceptors.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import authService from '../service/authService'
-import jwt from '../service/jwt'
-//참조: https://www.bezkoder.com/vue-refresh-token/
-const setup = (store) => {
-  //API Request 전 처리용
-  authService.defaults.headers.post['Content-Type'] =
-    'application/x-www-form-urlencoded'
-  //Request 처리용
-  authService.interceptors.request.use(
-    (config) => jwt.getAuthorizationHeader(config),
-    (error) => {
-      // Do something with request error
-      Promise.reject(error)
-    }
-  )
-  //Response 처리용
-  authService.interceptors.response.use(
-    (res) => {
-      console.log('AuthService Call 성공=>' + res)
-      return res
-    },
-    async (err) => {
-      // Do something with response error
-      const originalConfig = err.config
-      if (originalConfig.url !== '/auth/login' && err.response) {
-        // Access Token이 expired,오류로 인한 response 401 답볍을 받은경우
-        if (err.response.status === 401 && !originalConfig._retry) {
-          originalConfig._retry = true
-          try {
-            //Refresh Token으로 다시 Access Token 재생성 후 로그인 다시하라고 오류보냄
-            const rs = await authService.post('/auth/reload', {
-              refresh_token: jwt.getRefreshToken()
-            })
-            const { access_token } = rs.data
-            store.dispatch('auth/reload', access_token)
-            return authService(originalConfig)
-          } catch (_error) {
-            return Promise.reject(_error)
-          }
-        } //401처리
-      }
-      Promise.reject(err.response.data.message)
-    }
-  )
-}
-export default { setup }
diff --git a/src/store/index.js b/src/store/index.js
index 175ea23..3568be7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,11 +1,15 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import AuthStore from './authStore'
-import AuthInterceptors from './authIterceptors'
-import TodoStore from './todoStore'
+import AuthStore from './auth.store'
+import TodoStore from './todo.store'
 
 Vue.use(Vuex)
-AuthInterceptors(AuthStore)
+
+//인터셉터 정의 및 Storage 연동
+import setupAuthInterceptor from '../interceptors/auth.Iterceptor'
+setupAuthInterceptor(AuthStore)
+import setupTodoInterceptor from '../interceptors/todo.Iterceptor'
+setupTodoInterceptor(TodoStore)
 
 export default new Vuex.Store({
   modules: {
diff --git a/src/store/todo.store.js b/src/store/todo.store.js
new file mode 100644
index 0000000..a7450ac
--- /dev/null
+++ b/src/store/todo.store.js
@@ -0,0 +1,24 @@
+const state = {
+  total: 0,
+  rows: []
+}
+const getters = {
+  getTotal: function (state) {
+    return state.total
+  },
+  getRows: function (state) {
+    return state.rows
+  }
+}
+const mutations = {
+  setDatas: function (state, datas) {
+    state.total = datas.total
+    state.rows = datas.rows
+  }
+}
+const actions = {
+  setDatas: function (context, datas) {
+    context.commit('setDatas', datas.data)
+  }
+}
+export default { namespaced: true, state, getters, mutations, actions }
diff --git a/src/store/todoStore.js b/src/store/todoStore.js
deleted file mode 100644
index 7295ee2..0000000
--- a/src/store/todoStore.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import axios from 'axios'
-import jwt from '../service/jwt'
-
-//참조: https://yamoo9.github.io/axios/guide/interceptors.html
-const apiServer = axios.create({
-  baseURL: process.env.VUE_APP_BACKEND_HOST,
-  headers: { 'content-type': 'application/json' }
-})
-apiServer.interceptors.request.use(
-  (config) => jwt.getAuthorizationHeader(config),
-  (error) => {
-    // Do something with request error
-    Promise.reject(error)
-  }
-)
-apiServer.defaults.headers.post['Content-Type'] =
-  'application/x-www-form-urlencoded'
-
-// count state 속성 추가
-const state = {
-  total: 0,
-  rows: []
-}
-const getters = {
-  getTotal: function (state) {
-    return state.total
-  },
-  getRows: function (state) {
-    return state.rows
-  }
-}
-const mutations = {
-  setDatas: function (state, data) {
-    state.total = data.total
-    state.rows = data.rows
-  }
-}
-const actions = {
-  setDatas: async function (context, params) {
-    console.log(params)
-    //주의 .get의 parameter는 { params: params} 처럼 보내야함
-    return await apiServer
-      .get('/todo', { params: params })
-      .then((response) => {
-        console.log(response)
-        const { data } = response
-        context.commit('setDatas', data)
-      })
-      .catch((e) => {
-        //throw new Error('todo List 오류\n' + e.response.data.message)
-        console.log(e)
-      })
-  }
-}
-export default { namespaced: true, state, getters, mutations, actions }