From d7f61c4a3556ee222ab179039e16589079f52699 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: Tue, 13 Sep 2022 20:22:29 +0900
Subject: [PATCH] Store_Vuex init...

---
 src/common/jwt.js                           | 29 -------
 src/components/LoginComponent.vue           |  5 +-
 src/main.js                                 | 13 +--
 src/router/index.js                         |  2 +-
 src/service/authService.js                  |  7 ++
 src/service/jwt.js                          | 43 ++++++++++
 src/store/authIterceptors.js                | 46 +++++++++++
 src/store/authStore.js                      | 51 ++++++++++++
 src/store/index.js                          |  6 +-
 src/store/modules/auth.js                   | 92 ---------------------
 src/store/{modules/todo.js => todoStore.js} |  2 +-
 11 files changed, 163 insertions(+), 133 deletions(-)
 delete mode 100644 src/common/jwt.js
 create mode 100644 src/service/authService.js
 create mode 100644 src/service/jwt.js
 create mode 100644 src/store/authIterceptors.js
 create mode 100644 src/store/authStore.js
 delete mode 100644 src/store/modules/auth.js
 rename src/store/{modules/todo.js => todoStore.js} (97%)

diff --git a/src/common/jwt.js b/src/common/jwt.js
deleted file mode 100644
index c1b134d..0000000
--- a/src/common/jwt.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import VueCookies from 'vue-cookies'
-
-const getToken = (key) => {
-  return VueCookies.get(key)
-  //return window.localStorage.getItem(key)
-}
-const saveToken = (key, token, expireIn) => {
-  VueCookies.set(key, token, expireIn)
-  //window.localStorage.setItem(key, token)
-}
-const destroyToken = (key) => {
-  VueCookies.remove(key)
-  //window.localStorage.removeItem(key)
-}
-const getAuthorizationHeader = (config) => {
-  //로그인이 되었는지 확인후 Request시 헤더에 로그인정보 추가하기 위함
-  if (getToken('access_token')) {
-    config.headers.common['Authorization'] =
-      'Bearer ' + getToken('access_token')
-  }
-  return config
-}
-
-export default {
-  getToken,
-  saveToken,
-  destroyToken,
-  getAuthorizationHeader
-}
diff --git a/src/components/LoginComponent.vue b/src/components/LoginComponent.vue
index 9ceb83d..1a73a34 100644
--- a/src/components/LoginComponent.vue
+++ b/src/components/LoginComponent.vue
@@ -49,6 +49,7 @@
 
 <script>
 // 참고 : https://kdydesign.github.io/2019/04/06/vuejs-vuex-helper/
+import authService from '../service/api/authApi'
 export default {
   data() {
     //console.log(this.$route)
@@ -81,8 +82,8 @@ export default {
     },
     async onSubmit() {
       //인증서버에서 인증코드받기
-      await this.$store
-        .dispatch('AuthStore/login', {
+      authService
+        .post('/auth/login', {
           email: this.form.email,
           password: this.form.password
         })
diff --git a/src/main.js b/src/main.js
index cbe2097..8186f9f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,13 @@ import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
 import store from './store'
+//Bootstrap관련
 import { BootstrapVue } from 'bootstrap-vue'
+// Import Bootstrap and BootstrapVue CSS files (order is important)
+import 'bootstrap/dist/css/bootstrap.css'
+import 'bootstrap-vue/dist/bootstrap-vue.css'
+
+//Validate관련
 import {
   ValidationObserver,
   ValidationProvider,
@@ -12,20 +18,15 @@ import {
 import ko from 'vee-validate/dist/locale/ko.json'
 import * as rules from 'vee-validate/dist/rules'
 
-// Import Bootstrap and BootstrapVue CSS files (order is important)
-import 'bootstrap/dist/css/bootstrap.css'
-import 'bootstrap-vue/dist/bootstrap-vue.css'
-
 // Install VeeValidate rules and localization
 Object.keys(rules).forEach((rule) => {
   extend(rule, rules[rule])
 })
-
 localize('ko', ko)
-
 // Install VeeValidate components globally
 Vue.component('ValidationObserver', ValidationObserver)
 Vue.component('ValidationProvider', ValidationProvider)
+
 Vue.config.productionTip = false
 Vue.use(BootstrapVue)
 new Vue({
diff --git a/src/router/index.js b/src/router/index.js
index 8947586..0228fee 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 import HomeView from '../views/HomeView.vue'
-import jwt from '../common/jwt'
+import jwt from '../service/jwt'
 Vue.use(VueRouter)
 
 const routes = [
diff --git a/src/service/authService.js b/src/service/authService.js
new file mode 100644
index 0000000..c02a4fc
--- /dev/null
+++ b/src/service/authService.js
@@ -0,0 +1,7 @@
+import axios from 'axios'
+const instance = axios.create({
+  baseURL: process.env.VUE_APP_AUTH_HOST,
+  headers: { 'Content-type': 'application/json' }
+})
+
+export default instance
diff --git a/src/service/jwt.js b/src/service/jwt.js
new file mode 100644
index 0000000..3464d84
--- /dev/null
+++ b/src/service/jwt.js
@@ -0,0 +1,43 @@
+import VueCookies from 'vue-cookies'
+
+const getAccessToken = () => {
+  return VueCookies.get('access_token')
+  //return window.localStorage.getItem(key)
+}
+const getRefreshToken = () => {
+  return VueCookies.get('refresh_token')
+  //return window.localStorage.getItem(key)
+}
+const saveAccessToken = (access_token) => {
+  VueCookies.set('access_token', access_token.token, access_token.expireIn)
+  //window.localStorage.setItem(key, token)
+}
+const saveRefreshToken = (refresh_token) => {
+  VueCookies.set('refresh_token', refresh_token.token, refresh_token.expireIn)
+  //window.localStorage.setItem(key, token)
+}
+const destroyToken = () => {
+  VueCookies.remove('access_token')
+  VueCookies.remove('refresh_token')
+  //window.localStorage.removeItem(key)
+}
+
+const getAuthorizationHeader = (config) => {
+  //Request시 헤더에 로그인정보 추가하기 위함
+  if (getAccessToken()) {
+    //For Backend
+    config.headers.common['Authorization'] = 'Bearer ' + getAccessToken()
+    // for Node.js Express back-end
+    // config.headers["x-access-token"] = getAccessToken();
+  }
+  return config
+}
+
+export default {
+  getAccessToken,
+  getRefreshToken,
+  saveAccessToken,
+  saveRefreshToken,
+  destroyToken,
+  getAuthorizationHeader
+}
diff --git a/src/store/authIterceptors.js b/src/store/authIterceptors.js
new file mode 100644
index 0000000..bac3545
--- /dev/null
+++ b/src/store/authIterceptors.js
@@ -0,0 +1,46 @@
+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/authStore.js b/src/store/authStore.js
new file mode 100644
index 0000000..5467838
--- /dev/null
+++ b/src/store/authStore.js
@@ -0,0 +1,51 @@
+import jwt from '../../common/jwt'
+//참조: https://yamoo9.github.io/axios/guide/interceptors.html
+
+// count state 속성 추가
+const state = {
+  takens: {}
+}
+const getters = {
+  getTokens: function (state) {
+    return state.takens
+  },
+  isAuthenticated: function () {
+    console.log('isAuthenticated:' + jwt.getAccessToken())
+    return !!jwt.getAccessToken()
+  }
+}
+const mutations = {
+  register: function (state, tokens) {
+    state.takens = tokens
+    jwt.saveAccessToken(tokens.access_token)
+    jwt.saveRefreshToken(tokens.refresh_token)
+  },
+  login: function (state, tokens) {
+    state.takens = tokens
+    jwt.saveAccessToken(tokens.access_token)
+    jwt.saveRefreshToken(tokens.refresh_token)
+  },
+  logout: function (state) {
+    state.takens = {}
+    jwt.destroyToken()
+  },
+  reload: function (state, access_token) {
+    state.takens.access_token = access_token
+    jwt.saveAccessToken(access_token)
+  }
+}
+const actions = {
+  register: async function (context, tokens) {
+    context.commit('register', tokens)
+  },
+  login: async function (context, tokens) {
+    context.commit('login', tokens)
+  },
+  logout: async function (context) {
+    return await context.commit('logout')
+  },
+  reload: async function (context, access_token) {
+    return await context.commit('reload', access_token)
+  }
+}
+export default { namespaced: true, state, getters, mutations, actions }
diff --git a/src/store/index.js b/src/store/index.js
index e3bc789..175ea23 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,9 +1,11 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import AuthStore from './modules/auth'
-import TodoStore from './modules/todo'
+import AuthStore from './authStore'
+import AuthInterceptors from './authIterceptors'
+import TodoStore from './todoStore'
 
 Vue.use(Vuex)
+AuthInterceptors(AuthStore)
 
 export default new Vuex.Store({
   modules: {
diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js
deleted file mode 100644
index 6c7eb79..0000000
--- a/src/store/modules/auth.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import axios from 'axios'
-import jwt from '../../common/jwt'
-//참조: https://yamoo9.github.io/axios/guide/interceptors.html
-
-const apiServer = axios.create({
-  baseURL: process.env.VUE_APP_AUTH_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 = {
-  takens: {}
-}
-const getters = {
-  getTokens: function (state) {
-    return state.takens
-  },
-  isAuthenticated: function () {
-    console.log('isAuthenticated:' + jwt.getToken('access_token'))
-    return !!jwt.getToken('access_token')
-  }
-}
-const mutations = {
-  login: function (state, tokens = {}) {
-    state.takens = tokens
-    console.log(tokens)
-    jwt.saveToken(
-      'access_token',
-      tokens.access_token.token,
-      tokens.access_token.expiresIn
-    )
-    jwt.saveToken(
-      'refresh_token',
-      tokens.refresh_token.token,
-      tokens.refresh_token.expiresIn
-    )
-  },
-  logout: function (state) {
-    state.takens = {}
-    jwt.destroyToken('access_token')
-    jwt.destroyToken('refresh_token')
-  }
-}
-const actions = {
-  login: async function (context, payload) {
-    const params = {
-      email: payload.email,
-      password: payload.password
-    }
-    return await apiServer
-      .post('/auth/login', params)
-      .then((response) => {
-        console.log(response)
-        const { data } = response
-        context.commit('login', data)
-        return response
-      })
-      .catch((e) => {
-        throw new Error('login 오류\n' + e.response.data.message)
-      })
-  },
-  logout: async function (context) {
-    return await context.commit('logout')
-  },
-  register: async function (context, payload) {
-    const params = {
-      email: payload.email,
-      password: payload.password,
-      name: payload.name
-    }
-    return await apiServer
-      .post('/auth/register', params)
-      .then((response) => {
-        const { data } = response
-        context.commit('login', data.tokens)
-        return response
-      })
-      .catch((e) => {
-        throw new Error('register 오류\n' + +e.response.data.message)
-      })
-  }
-}
-export default { namespaced: true, state, getters, mutations, actions }
diff --git a/src/store/modules/todo.js b/src/store/todoStore.js
similarity index 97%
rename from src/store/modules/todo.js
rename to src/store/todoStore.js
index 17c4a8a..7295ee2 100644
--- a/src/store/modules/todo.js
+++ b/src/store/todoStore.js
@@ -1,5 +1,5 @@
 import axios from 'axios'
-import jwt from '../../common/jwt'
+import jwt from '../service/jwt'
 
 //참조: https://yamoo9.github.io/axios/guide/interceptors.html
 const apiServer = axios.create({