From af2a214214385d5fd2aa292ae2e0a5e695d85558 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: Sat, 17 Sep 2022 09:44:35 +0900
Subject: [PATCH] vue2_frontend...

---
 src/components/LoginComponent.vue     |  4 +-
 src/components/todo/ListComponent.vue |  4 +-
 src/interceptors/auth.api.js          | 69 +-------------------------
 src/interceptors/interceptor.js       | 70 +++++++++++++++++++++++++++
 src/interceptors/todo.api.js          | 70 +--------------------------
 src/service/auth.service.js           | 30 ------------
 src/service/todo.service.js           | 11 -----
 src/service/token.service.js          |  4 +-
 src/store/auth.store.js               | 22 ++++++---
 src/store/todo.store.js               | 23 +++------
 10 files changed, 102 insertions(+), 205 deletions(-)
 create mode 100644 src/interceptors/interceptor.js
 delete mode 100644 src/service/auth.service.js
 delete mode 100644 src/service/todo.service.js

diff --git a/src/components/LoginComponent.vue b/src/components/LoginComponent.vue
index f7e9185..2a32ad0 100644
--- a/src/components/LoginComponent.vue
+++ b/src/components/LoginComponent.vue
@@ -49,7 +49,6 @@
 
 <script>
 // 참고 : https://kdydesign.github.io/2019/04/06/vuejs-vuex-helper/
-import authService from '../service/auth.service'
 export default {
   data() {
     //console.log(this.$route)
@@ -82,7 +81,8 @@ export default {
     },
     async onSubmit() {
       try {
-        await authService.login(this.form.email, this.form.password)
+        const params = { email: this.form.email, password: this.form.password }
+        await this.$store.dispatch('AuthStore/login', params)
         await this.$router.push({
           name: this.$route.params.return_url || 'home'
         })
diff --git a/src/components/todo/ListComponent.vue b/src/components/todo/ListComponent.vue
index 2b6b78a..6a45f4e 100644
--- a/src/components/todo/ListComponent.vue
+++ b/src/components/todo/ListComponent.vue
@@ -136,7 +136,6 @@
   </div>
 </template>
 <script>
-import todoService from '@/service/todo.service'
 import { createNamespacedHelpers } from 'vuex'
 const todoStore = createNamespacedHelpers('TodoStore')
 export default {
@@ -260,8 +259,7 @@ export default {
           filterDateStart: this.filterDateStart,
           filterDateEnd: this.filterDateEnd
         }
-        const datas = await todoService.getDatas(params)
-        this.$store.dispatch('TodoStore/setDatas', datas)
+        this.$store.dispatch('TodoStore/setDatas', params)
       } catch (e) {
         alert(e.message)
       }
diff --git a/src/interceptors/auth.api.js b/src/interceptors/auth.api.js
index c734ff3..8eaa4aa 100644
--- a/src/interceptors/auth.api.js
+++ b/src/interceptors/auth.api.js
@@ -1,72 +1,7 @@
 import axios from 'axios'
-import tokenService from '../service/token.service'
+import interceptor from './interceptor'
 const instance = axios.create({
   baseURL: process.env.VUE_APP_AUTH_HOST
 })
-
-//API Request 전 처리용
-instance.defaults.headers.post['Content-Type'] =
-  'application/x-www-form-urlencoded'
-instance.defaults.headers.get['Accepts'] = 'application/json'
-instance.defaults.timeout = 2500
-
-//Request 처리용
-instance.interceptors.request.use(
-  (config) => {
-    const token = tokenService.getLocalAccessToken()
-    if (token) {
-      config.headers['Authorization'] = 'Bearer ' + token // for Spring Boot back-end
-      config.headers['x-access-token'] = token // for Node.js Express back-end
-    }
-    return config
-  },
-  (error) => {
-    // Do something with request error
-    Promise.reject(error)
-  }
-)
-
-//Response 처리용
-instance.interceptors.response.use(
-  (response) => {
-    console.log('성공')
-    console.log(response)
-    return response
-  },
-  async (err) => {
-    console.log('실패')
-    console.log(err)
-    //err.config->이전에 보냈던 api (url등)정보 전달용
-    //err.response->오류 상태를 알기 위해
-    //originalConfig._retry는 처음 시도용인지 알기 위해
-    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)
-  }
-)
-
-//AccessToken이 만료된경우 다시 받기위한 함수
-const reloadAccessToken = async (originalConfig) => {
-  // Access Token이 expired,오류로 인한 response 401 답볍을 받은경우
-  originalConfig._retry = true
-  try {
-    //Refresh Token으로 다시 Access Token 재생성 후 로그인 다시하라고 오류보냄
-    await instance
-      .post('/auth/reload', {
-        refresh_token: tokenService.getLocalRefreshToken()
-      })
-      .then((rs) => {
-        const { access_token } = rs.data
-        tokenService.updateLocalAccessToken(access_token)
-      })
-    //reload로 access_token을 재발급을 받았으면 이전 APICall 다시 호출
-    return await instance(originalConfig)
-  } catch (_error) {
-    return Promise.reject(_error)
-  }
-}
+interceptor(instance)
 export default instance
diff --git a/src/interceptors/interceptor.js b/src/interceptors/interceptor.js
new file mode 100644
index 0000000..a1832d5
--- /dev/null
+++ b/src/interceptors/interceptor.js
@@ -0,0 +1,70 @@
+import tokenService from '../service/token.service'
+
+const interceptor = (instance) => {
+  //API Request 전 처리용
+  instance.defaults.headers.post['Content-Type'] =
+    'application/x-www-form-urlencoded'
+  instance.defaults.headers.get['Accepts'] = 'application/json'
+  instance.defaults.timeout = 2500
+
+  //Request 처리용
+  instance.interceptors.request.use(
+    (config) => {
+      const token = tokenService.getLocalAccessToken()
+      if (token) {
+        config.headers['Authorization'] = 'Bearer ' + token // for Spring Boot back-end
+        config.headers['x-access-token'] = token // for Node.js Express back-end
+      }
+      return config
+    },
+    (error) => {
+      // Do something with request error
+      Promise.reject(error)
+    }
+  )
+
+  //Response 처리용
+  instance.interceptors.response.use(
+    (response) => {
+      console.log('interceptor 성공')
+      //console.log(response)
+      return response
+    },
+    async (err) => {
+      console.log('interceptor 실패')
+      //console.log(err)
+      //err.config->이전에 보냈던 api (url등)정보 전달용
+      //err.response->오류 상태를 알기 위해
+      //originalConfig._retry는 처음 시도용인지 알기 위해
+      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)
+    }
+  )
+
+  //AccessToken이 만료된경우 다시 받기위한 함수
+  const reloadAccessToken = async (originalConfig) => {
+    // Access Token이 expired,오류로 인한 response 401 답볍을 받은경우
+    originalConfig._retry = true
+    try {
+      //Refresh Token으로 다시 Access Token 재생성 후 로그인 다시하라고 오류보냄
+      await instance
+        .post('/auth/reload', {
+          refresh_token: tokenService.getLocalRefreshToken()
+        })
+        .then((rs) => {
+          const { access_token } = rs.data
+          tokenService.updateLocalAccessToken(access_token)
+        })
+      //reload로 access_token을 재발급을 받았으면 이전 APICall 다시 호출
+      return await instance(originalConfig)
+    } catch (_error) {
+      return Promise.reject(_error)
+    }
+  }
+}
+export default interceptor
diff --git a/src/interceptors/todo.api.js b/src/interceptors/todo.api.js
index dc11a1b..a96c377 100644
--- a/src/interceptors/todo.api.js
+++ b/src/interceptors/todo.api.js
@@ -1,73 +1,7 @@
 import axios from 'axios'
-import authApi from './auth.api'
-import tokenService from '../service/token.service'
+import interceptor from './interceptor'
 const instance = axios.create({
   baseURL: process.env.VUE_APP_TODO_HOST
 })
-
-//API Request 전 처리용
-instance.defaults.headers.post['Content-Type'] =
-  'application/x-www-form-urlencoded'
-instance.defaults.headers.get['Accepts'] = 'application/json'
-instance.defaults.timeout = 2500
-
-//Request 처리용
-instance.interceptors.request.use(
-  (config) => {
-    const token = tokenService.getLocalAccessToken()
-    if (token) {
-      config.headers['Authorization'] = 'Bearer ' + token // for Spring Boot back-end
-      config.headers['x-access-token'] = token // for Node.js Express back-end
-    }
-    return config
-  },
-  (error) => {
-    // Do something with request error
-    Promise.reject(error)
-  }
-)
-
-//Response 처리용
-instance.interceptors.response.use(
-  (response) => {
-    console.log('성공')
-    console.log(response)
-    return response
-  },
-  async (err) => {
-    console.log('실패')
-    console.log(err)
-    //err.config->이전에 보냈던 api (url등)정보 전달용
-    //err.response->오류 상태를 알기 위해
-    //originalConfig._retry는 처음 시도용인지 알기 위해
-    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)
-  }
-)
-
-//AccessToken이 만료된경우 다시 받기위한 함수
-const reloadAccessToken = async (originalConfig) => {
-  // Access Token이 expired,오류로 인한 response 401 답볍을 받은경우
-  originalConfig._retry = true
-  try {
-    //Refresh Token으로 다시 Access Token 재생성 후 로그인 다시하라고 오류보냄
-    await authApi
-      .post('/auth/reload', {
-        refresh_token: tokenService.getLocalRefreshToken()
-      })
-      .then((rs) => {
-        const { access_token } = rs.data
-        tokenService.updateLocalAccessToken(access_token)
-      })
-    //reload로 access_token을 재발급을 받았으면 이전 APICall 다시 호출
-    return await instance(originalConfig)
-  } catch (_error) {
-    return Promise.reject(_error)
-  }
-}
+interceptor(instance)
 export default instance
diff --git a/src/service/auth.service.js b/src/service/auth.service.js
deleted file mode 100644
index 330b296..0000000
--- a/src/service/auth.service.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import api from '../interceptors/auth.api'
-import tokenService from '../service/token.service'
-class AuthService {
-  async login(email, password) {
-    return await api
-      .post('/auth/login', { email: email, password: password })
-      .then((response) => {
-        const { data } = response
-        if (data.access_token) {
-          tokenService.setUser(data)
-        }
-      })
-  }
-
-  logout() {
-    tokenService.removeUser()
-  }
-
-  async register(email, password, name) {
-    return api
-      .post('/auth/register', { email: email, password: password, name: name })
-      .then((response) => {
-        const { data } = response
-        if (data.access_token) {
-          tokenService.setUser(data)
-        }
-      })
-  }
-}
-export default new AuthService()
diff --git a/src/service/todo.service.js b/src/service/todo.service.js
deleted file mode 100644
index d8b3554..0000000
--- a/src/service/todo.service.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import api from '../interceptors/todo.api'
-class TodoService {
-  async getDatas(params) {
-    //console.log(params)
-    return await api.get('/todo', { params: params }).then((response) => {
-      const { data } = response
-      return data
-    })
-  }
-}
-export default new TodoService()
diff --git a/src/service/token.service.js b/src/service/token.service.js
index 5b06f58..1c8c233 100644
--- a/src/service/token.service.js
+++ b/src/service/token.service.js
@@ -11,7 +11,7 @@ class TokenService {
   updateLocalAccessToken(token) {
     let user = this.getUser()
     user.access_token = token
-    localStorage.setItem('user', JSON.stringify(user))
+    this.setUser(user)
   }
   getLocalRefreshToken() {
     const user = this.getUser()
@@ -21,7 +21,7 @@ class TokenService {
     return JSON.parse(localStorage.getItem('user'))
   }
   setUser(user) {
-    console.log('set User..')
+    console.log('set User..' + JSON.stringify(user))
     localStorage.setItem('user', JSON.stringify(user))
   }
   removeUser() {
diff --git a/src/store/auth.store.js b/src/store/auth.store.js
index 1cd7c55..99ce0ab 100644
--- a/src/store/auth.store.js
+++ b/src/store/auth.store.js
@@ -1,3 +1,4 @@
+import api from '../interceptors/auth.api'
 import tokenService from '../service/token.service'
 //참조: https://yamoo9.github.io/axios/guide/interceptors.html
 
@@ -20,9 +21,6 @@ const getters = {
   }
 }
 const mutations = {
-  register: function (state, user) {
-    state.tokenService.setUser(user)
-  },
   login: function (state, user) {
     state.tokenService.setUser(user)
   },
@@ -34,11 +32,21 @@ const mutations = {
   }
 }
 const actions = {
-  register: function (context, user) {
-    context.commit('register', user)
+  register: async function (context, params) {
+    await api.post('/auth/register', params).then((response) => {
+      const { data } = response
+      if (data.access_token) {
+        context.commit('login', data)
+      }
+    })
   },
-  login: function (context, user) {
-    context.commit('login', user)
+  login: async function (context, params) {
+    await api.post('/auth/login', params).then((response) => {
+      const { data } = response
+      if (data.access_token) {
+        context.commit('login', data)
+      }
+    })
   },
   logout: function (context) {
     return context.commit('logout')
diff --git a/src/store/todo.store.js b/src/store/todo.store.js
index 85ce456..bfc878c 100644
--- a/src/store/todo.store.js
+++ b/src/store/todo.store.js
@@ -1,28 +1,21 @@
+import api from '../interceptors/todo.api'
 const state = {
   total: 0,
-  rows: [],
-  selected: []
-}
-const getters = {
-  getTotal: function (state) {
-    return state.total
-  },
-  getRows: function (state) {
-    return state.rows
-  }
+  rows: []
 }
+const getters = {}
 const mutations = {
   setDatas: async function (state, datas) {
     state.total = datas.total
     state.rows = datas.rows
-  },
-  setSelected: function (state, datas) {
-    state.selected = datas
   }
 }
 const actions = {
-  setDatas: async function (context, datas) {
-    await context.commit('setDatas', datas)
+  setDatas: async function (context, params) {
+    await api.get('/todo', { params: params }).then((response) => {
+      const { data } = response
+      context.commit('setDatas', data)
+    })
   }
 }
 export default { namespaced: true, state, getters, mutations, actions }