eztech-core-components 1.0.2 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eztech-core-components",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "publishConfig": {
     "access": "public"
   },

package/plugins/axios.js

@@ -20,9 +20,18 @@ export default ({ $axios, query, store, $cookies, redirect, i18n, route, params,
     //   delete $axios.defaults.headers.common.Authorization
     // }
     const tokenName = store.getters['user/tokenName']
+    const authType = store.getters['user/authType']
     if (tokenName) {
       $axios.defaults.headers.common['x-pid'] = tokenName
     }
+    console.log('authType', authType)
+    if (authType === 'header') {
+      $axios.defaults.headers.common['x-at'] = authType
+      const userToken = store.getters['user/token']
+      if (userToken) {
+        $axios.defaults.headers.common['Autherization'] = `Bearer ${userToken}`
+      }
+    }
     $axios.defaults.headers.common['Accept-Language'] = query.lang || i18n?.locale || 'mn'
     return config
   })

package/store/user.js

@@ -9,29 +9,21 @@ export const state = () => ({
   notificationCount: 0,
   notificationList: [],
   isLocked: false,
-  loginProps: null
+  loginProps: null,
+  authType: 'cookie'
 })
 
 export const getters = {
-  user (state) {
-    return state.user
-  },
-  token (state) {
-    return state.token
-  },
-  tokenName (state) {
-    return state.tokenName
-  },
-  hideProfile (state) {
-    return state.hideProfile
-  },
-  projectId (state) {
-    return state.projectId
-  },
+  user (state) { return state.user },
+  token (state) { return state.token },
+  tokenName (state) { return state.tokenName },
+  hideProfile (state) {  return state.hideProfile },
+  projectId (state) { return state.projectId },
   notificationCount (state) { return state.notificationCount },
   notificationList (state) { return state.notificationList },
   isLocked (state) { return state.isLocked },
-  loginProps (state) { return state.loginProps }
+  loginProps (state) { return state.loginProps },
+  authType (state) { return state.authType }
 }
 
 export const mutations = {
@@ -64,6 +56,9 @@ export const mutations = {
   },
   SET_LOGIN_PROPS (state, val) {
     state.loginProps = val
+  },
+  SET_AUTH_TYPE (state, val) {
+    state.authType = val
   }
 }
 
@@ -72,10 +67,14 @@ export const actions = {
     const tokenName = process.env.TOKEN_NAME || null
     const projectId = process.env.PROJECT_ID
     const loginProps = process.env.LOGIN_PROPS
-    // const token = query[tokenName] || $cookies.get(tokenName)
-    // if (token) {
-    //   commit('SET_TOKEN', token)
-    // }
+    const authType = process.env.AUTH_TYPE || 'cookie'
+    if (authType === 'header') {
+      commit('SET_AUTH_TYPE', 'header')
+      const token = query[tokenName] || $cookies.get(tokenName)
+      if (token) {
+        commit('SET_TOKEN', token)
+      }
+    }
     commit('SET_LOGIN_PROPS', loginProps)
     commit('SET_TOKEN_NAME', tokenName)
     commit('SET_PROJECT_ID', projectId)
@@ -163,8 +162,10 @@ export const actions = {
     commit('SET_HIDE_PROFILE', value)
   },
   set_token ({ commit, getters }, token) {
-    // const tokenOptions = { maxAge: 60 * 60 * 24 * 7, path: '/' }
-    // this.$cookies.set(getters.tokenName, token, tokenOptions)
+    if (getters.authType === 'header') {
+      const tokenOptions = { maxAge: 60 * 60 * 24 * 7, path: '/' }
+      this.$cookies.set(getters.tokenName, token, tokenOptions)
+    }
     commit('SET_TOKEN', token)
     if (process.client) {
       localStorage.setItem('forensic_checkLogin', Date.now())