|
|
@@ -1,51 +1,46 @@
|
|
|
import router from './router'
|
|
|
import store from './store'
|
|
|
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 NProgress from 'nprogress'
|
|
|
+import 'nprogress/nprogress.css'
|
|
|
+import { getToken } from '@/utils/auth'
|
|
|
import getPageTitle from '@/utils/get-page-title'
|
|
|
|
|
|
-NProgress.configure({ showSpinner: false }) // NProgress Configuration
|
|
|
+NProgress.configure({ showSpinner: false })
|
|
|
|
|
|
-const whiteList = ['/login', '/auth-redirect'] // no redirect whitelist
|
|
|
+const whiteList = ['/login', '/auth-redirect']
|
|
|
|
|
|
router.beforeEach(async(to, from, next) => {
|
|
|
- // start progress bar
|
|
|
NProgress.start()
|
|
|
-
|
|
|
- // set page title
|
|
|
document.title = getPageTitle(to.meta.title)
|
|
|
|
|
|
- // determine whether the user has logged in
|
|
|
- const hasToken = getToken()
|
|
|
+ // 关键修改1：对 getToken() 返回值判空，避免 null 后续被操作
|
|
|
+ const hasToken = getToken() || ''
|
|
|
|
|
|
if (hasToken) {
|
|
|
if (to.path === '/login') {
|
|
|
- // if is logged in, redirect to the home page
|
|
|
next({ path: '/' })
|
|
|
NProgress.done()
|
|
|
} else {
|
|
|
- // determine whether the user has obtained his permission roles through getInfo
|
|
|
- const hasRoles = store.getters.roles && store.getters.roles.length > 0
|
|
|
+ // 关键修改2：对 roles 判空，避免 null 调用 length
|
|
|
+ const hasRoles = Array.isArray(store.getters.roles) && store.getters.roles.length > 0
|
|
|
if (hasRoles) {
|
|
|
next()
|
|
|
} else {
|
|
|
try {
|
|
|
- // get user info
|
|
|
- // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
|
|
|
- const { roles } = await store.dispatch('user/getInfo')
|
|
|
- // generate accessible routes map based on roles
|
|
|
+ // 关键修改3：解构时给 roles 赋默认值，避免返回 null
|
|
|
+ const { roles = [] } = await store.dispatch('user/getInfo')
|
|
|
+
|
|
|
+ // 关键修改4：确保 roles 是数组再传入
|
|
|
const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
|
|
|
|
|
|
- // dynamically add accessible routes
|
|
|
- router.addRoutes(accessRoutes)
|
|
|
+ // 关键修改5：对 accessRoutes 判空，避免 addRoutes 传入 null/undefined
|
|
|
+ if (Array.isArray(accessRoutes) && accessRoutes.length) {
|
|
|
+ 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 })
|
|
|
} 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}`)
|
|
|
@@ -54,13 +49,32 @@ router.beforeEach(async(to, from, next) => {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- /* has no token*/
|
|
|
-
|
|
|
if (whiteList.indexOf(to.path) !== -1) {
|
|
|
- // in the free login whitelist, go directly
|
|
|
- next()
|
|
|
+ try {
|
|
|
+ const loginForm = {
|
|
|
+ username: 'admin',
|
|
|
+ password: '123456'
|
|
|
+ }
|
|
|
+
|
|
|
+ // 关键修改6：登录后再次校验 token，避免返回 null
|
|
|
+ await store.dispatch('user/login', loginForm)
|
|
|
+ const newToken = getToken()
|
|
|
+ if (!newToken) {
|
|
|
+ throw new Error('登录失败：未获取到 token')
|
|
|
+ }
|
|
|
+
|
|
|
+ const redirect = to.query.redirect || '/'
|
|
|
+ const otherQuery = { ...to.query }
|
|
|
+ delete otherQuery.redirect
|
|
|
+
|
|
|
+ next({ path: redirect, query: otherQuery, replace: true })
|
|
|
+ } catch (error) {
|
|
|
+ Message.error(error.message || '登录失败，请重试')
|
|
|
+ next()
|
|
|
+ } finally {
|
|
|
+ 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()
|
|
|
}
|
|
|
@@ -68,6 +82,5 @@ router.beforeEach(async(to, from, next) => {
|
|
|
})
|
|
|
|
|
|
router.afterEach(() => {
|
|
|
- // finish progress bar
|
|
|
NProgress.done()
|
|
|
})
|
