diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b05fc60..1c70964 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -3,17 +3,14 @@ import fileApi from '@/api/file-api' import menuApi from '@/api/menu' import { getToken, - setToken, getConsumerId, - setConsumerId, removeToken, removeConsumerId, - setRememberName, removeRememberName, setShareToken, getShareToken, removeShareToken, - getUsername, setUsername, + getUsername, } from '@/utils/auth' import { setLogo } from '@/utils/logo' import { resetRouter } from '@/router' @@ -114,14 +111,9 @@ const actions = { login({ username: username.trim(), password: password, rememberMe: rememberMe }).then(response => { const { data } = response commit('SET_TOKEN', data.jmalToken) - setToken(data.jmalToken) - setUsername(username.trim()) commit('SET_NAME', username.trim()) commit('SET_USERID', data.userId) - setConsumerId(data.userId) - if(rememberMe){ - setRememberName(username) - } else { + if(!rememberMe){ removeRememberName() } resolve() diff --git a/src/utils/auth.js b/src/utils/auth.js index 15fc083..95fb2e0 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -11,10 +11,6 @@ export function getRememberName() { return Cookies.get(rememberName) } -export function setRememberName(username) { - return Cookies.set(rememberName, username) -} - export function removeRememberName() { return Cookies.remove(rememberName) } @@ -27,10 +23,6 @@ export function getUsername() { return Cookies.get(usernameKey) } -export function setUsername(username) { - return Cookies.set(usernameKey, username) -} - export function getShareToken() { return Cookies.get(shareTokenKey) } @@ -44,10 +36,6 @@ export function setShareToken(token, shareId) { Cookies.set(shareIdKey, shareId) } -export function setToken(token) { - return Cookies.set(tokenKey, token) -} - export function removeToken() { Cookies.remove(tokenKey) Cookies.remove(usernameKey) @@ -62,10 +50,6 @@ export function getConsumerId() { return Cookies.get(consumerId) } -export function setConsumerId(userId) { - return Cookies.set(consumerId, userId) -} - export function removeConsumerId() { return Cookies.remove(consumerId) }