github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-21 19:19:29 +00:00
Code Issues Projects Releases Wiki Activity

[lina]

Browse Source
This commit is contained in:
OrangeM21
2020-03-20 00:46:35 +08:00
parent bfa2065ba3
commit b5ac73e57f
10 changed files with 11109 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -2,7 +2,7 @@
ENV = 'development'
# base api
VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_API = '/rpc'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled.

6
src/api/user.js
View File

@@ -10,9 +10,9 @@ export function login(data) {
export function getInfo(token) {
return request({
url: '/vue-admin-template/user/info',
method: 'get',
params: { token }
url: '/api/v1/users/profile/',
method: 'get'
// params: { token }
})
}

50
src/permission.js
View File

@@ -1,16 +1,22 @@
import router from './router'
import store from './store'
import { Message } from 'element-ui'
import {
Message
} from 'element-ui'
import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style
import { getToken } from '@/utils/auth' // get token from cookie
import {
getToken
} from '@/utils/auth' // get token from cookie
import getPageTitle from '@/utils/get-page-title'
NProgress.configure({ showSpinner: false }) // NProgress Configuration
NProgress.configure({
showSpinner: false
}) // NProgress Configuration
const whiteList = ['/login'] // no redirect whitelist
router.beforeEach(async(to, from, next) => {
router.beforeEach(async (to, from, next) => {
// start progress bar
NProgress.start()
@@ -23,7 +29,9 @@ router.beforeEach(async(to, from, next) => {
if (hasToken) {
if (to.path === '/login') {
// if is logged in, redirect to the home page
next({ path: '/' })
next({
path: '/'
})
NProgress.done()
} else {
// determine whether the user has obtained his permission roles through getInfo
@@ -34,37 +42,43 @@ router.beforeEach(async(to, from, next) => {
try {
// get user info
// note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
const { roles } = await store.dispatch('user/getInfo')
const {
role
} = await store.dispatch('user/getInfo')
// generate accessible routes map based on roles
const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
const accessRoutes = await store.dispatch('permission/generateRoutes', [role])
// dynamically add accessible routes
router.addRoutes(accessRoutes)
// hack method to ensure that addRoutes is complete
// set the replace: true, so the navigation will not leave a history record
next({ ...to, replace: true })
next({
...to,
replace: true
})
} catch (error) {
// remove token and go to login page to re-login
await store.dispatch('user/resetToken')
Message.error(error || 'Has Error')
next(`/login?redirect=${to.path}`)
NProgress.done()
// await store.dispatch('user/resetToken')
// Message.error(error || 'Has Error')
// next(`/login?redirect=${to.path}`)
// NProgress.done()
next()
}
}
}
} else {
/* has no token*/
if (whiteList.indexOf(to.path) !== -1) {
// if (whiteList.indexOf(to.path) !== -1) {
// in the free login whitelist, go directly
next()
} else {
// other pages that do not have permission to access are redirected to the login page.
next(`/login?redirect=${to.path}`)
NProgress.done()
}
// } else {
// // other pages that do not have permission to access are redirected to the login page.
// next(`/login?redirect=${to.path}`)
// NProgress.done()
// }
}
})

6
src/router/index.js
View File

@@ -31,12 +31,6 @@ import Layout from '@/layout'
* all roles can be accessed
*/
export const constantRoutes = [
{
path: '/login',
component: () => import('@/views/login/index'),
hidden: true
},
{
path: '/404',
component: () => import('@/views/404'),

15
src/store/modules/permission.js
View File

@@ -1,4 +1,7 @@
import { asyncRoutes, constantRoutes } from '@/router'
import {
asyncRoutes,
constantRoutes
} from '@/router'
/**
* Use meta.role to determine if the current user has permission
@@ -22,7 +25,9 @@ export function filterAsyncRoutes(routes, roles) {
const res = []
routes.forEach(route => {
const tmp = { ...route }
const tmp = {
...route
}
if (hasPermission(roles, tmp)) {
if (tmp.children) {
tmp.children = filterAsyncRoutes(tmp.children, roles)
@@ -47,10 +52,12 @@ const mutations = {
}
const actions = {
generateRoutes({ commit }, roles) {
generateRoutes({
commit
}, roles) {
return new Promise(resolve => {
let accessedRoutes
if (roles.includes('admin')) {
if (roles.includes('Admin')) {
accessedRoutes = asyncRoutes || []
} else {
accessedRoutes = filterAsyncRoutes(asyncRoutes, roles)

85
src/store/modules/user.js
View File

@@ -1,6 +1,16 @@
import { login, logout, getInfo } from '@/api/user'
import { getToken, setToken, removeToken } from '@/utils/auth'
import { resetRouter } from '@/router'
import {
login,
logout,
getInfo
} from '@/api/user'
import {
getToken,
setToken,
removeToken
} from '@/utils/auth'
import {
resetRouter
} from '@/router'
const getDefaultState = () => {
return {
@@ -33,41 +43,44 @@ const mutations = {
const actions = {
// user login
login({ commit }, userInfo) {
const { username, password } = userInfo
return new Promise((resolve, reject) => {
login({ username: username.trim(), password: password }).then(response => {
const { data } = response
commit('SET_TOKEN', data.token)
setToken(data.token)
resolve()
}).catch(error => {
reject(error)
})
})
},
// login({ commit }, userInfo) {
// const { username, password } = userInfo
// return new Promise((resolve, reject) => {
// login({ username: username.trim(), password: password }).then(response => {
// const { data } = response
// commit('SET_TOKEN', data.token)
// setToken(data.token)
// resolve()
// }).catch(error => {
// reject(error)
// })
// })
// },
// get user info
getInfo({ commit, state }) {
getInfo({
commit,
state
}) {
return new Promise((resolve, reject) => {
getInfo(state.token).then(response => {
const { data } = response
if (!data) {
getInfo().then(response => {
if (!response) {
reject('Verification failed, please Login again.')
}
const { roles, name, avatar } = data
const {
role,
name,
avatar_url
} = response
const rules = [role]
// roles must be a non-empty array
if (!roles || roles.length <= 0) {
if (!rules || rules.length <= 0) {
reject('getInfo: roles must be a non-null array!')
}
commit('SET_ROLES', roles)
commit('SET_ROLES', rules)
commit('SET_NAME', name)
commit('SET_AVATAR', avatar)
resolve(data)
commit('SET_AVATAR', avatar_url)
resolve(response)
}).catch(error => {
reject(error)
})
@@ -75,10 +88,13 @@ const actions = {
},
// user logout
logout({ commit, state }) {
logout({
commit,
state
}) {
return new Promise((resolve, reject) => {
logout(state.token).then(() => {
removeToken() // must remove token first
// removeToken() // must remove token first
resetRouter()
commit('RESET_STATE')
resolve()
@@ -89,9 +105,11 @@ const actions = {
},
// remove token
resetToken({ commit }) {
resetToken({
commit
}) {
return new Promise(resolve => {
removeToken() // must remove token first
// removeToken() // must remove token first
commit('RESET_STATE')
resolve()
})
@@ -104,4 +122,3 @@ export default {
mutations,
actions
}

2
src/utils/auth.js
View File

@@ -1,6 +1,6 @@
import Cookies from 'js-cookie'
const TokenKey = 'vue_admin_template_token'
const TokenKey = 'csrftoken'
export function getToken() {
return Cookies.get(TokenKey)

16
src/utils/request.js
View File

@@ -1,7 +1,12 @@
import axios from 'axios'
import { MessageBox, Message } from 'element-ui'
import {
MessageBox,
Message
} from 'element-ui'
import store from '@/store'
import { getToken } from '@/utils/auth'
import {
getToken
} from '@/utils/auth'
// create an axios instance
const service = axios.create({
@@ -19,7 +24,7 @@ service.interceptors.request.use(
// let each request carry token
// ['X-Token'] is a custom headers key
// please modify it according to the actual situation
config.headers['X-Token'] = getToken()
config.headers['X-CSRFToken'] = getToken()
}
return config
},
@@ -46,7 +51,7 @@ service.interceptors.response.use(
const res = response.data
// if the custom code is not 20000, it is judged as an error.
if (res.code !== 20000) {
if (response.status !== 200) {
Message({
message: res.message || 'Error',
type: 'error',
@@ -54,7 +59,8 @@ service.interceptors.response.use(
})
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
// 自定义错误码
if (response.status === 50008 || response.status === 50012 || response.status === 50014) {
// to re-login
MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
confirmButtonText: 'Re-Login',

18
vue.config.js
View File

@@ -6,7 +6,7 @@ function resolve(dir) {
return path.join(__dirname, dir)
}
const name = defaultSettings.title || 'vue Admin Template' // page title
const name = defaultSettings.title || 'JumpServer' // page title
// If your port is set to 80,
// use administrator privileges to execute the command line.
@@ -31,12 +31,24 @@ module.exports = {
productionSourceMap: false,
devServer: {
port: port,
open: true,
host: 'localhost',
open: false,
overlay: {
warnings: false,
errors: true
},
before: require('./mock/mock-server.js')
proxy: {
// change xxx-api/login => mock/login
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
}
}
},
after: require('./mock/mock-server.js')
},
configureWebpack: {
// provide the app's title in webpack's name field, so that

10981
yarn.lock Normal file
View File

File diff suppressed because it is too large Load Diff