File tree Expand file tree Collapse file tree 3 files changed +7
-5
lines changed
apps/common/auth/handle/impl Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -224,7 +224,9 @@ def get_role_list(user,
224
224
workspace_user_role_mapping in
225
225
workspace_user_role_mapping_list ] + [user .role ], version = version )
226
226
else :
227
- role_list = [user .role , get_role_permission (RoleConstants .WORKSPACE_MANAGE , 'default' )]
227
+ role_list = [user .role ]
228
+ if user .role == RoleConstants .ADMIN .value .__str__ ():
229
+ role_list = [user .role , get_role_permission (RoleConstants .WORKSPACE_MANAGE , 'default' )]
228
230
cache .set (key , role_list , version = version )
229
231
return role_list
230
232
return workspace_list
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ router.beforeEach(
25
25
return
26
26
}
27
27
const { chatUser } = useStore ( )
28
- const notAuthRouteNameList = [ 'user_login ' ]
28
+ const notAuthRouteNameList = [ 'login ' ]
29
29
if ( ! notAuthRouteNameList . includes ( to . name ? to . name . toString ( ) : '' ) ) {
30
30
if ( to . params && to . params . accessToken ) {
31
31
chatUser . setAccessToken ( to . params . accessToken . toString ( ) )
@@ -40,7 +40,7 @@ router.beforeEach(
40
40
if ( authentication ) {
41
41
if ( ! token ) {
42
42
next ( {
43
- name : 'user_login ' ,
43
+ name : 'login ' ,
44
44
params : {
45
45
accessToken : to . params . accessToken ,
46
46
} ,
Original file line number Diff line number Diff line change @@ -9,8 +9,8 @@ export const routes: Array<RouteRecordRaw> = [
9
9
} ,
10
10
// 对话用户登录
11
11
{
12
- path : '/user- login/:accessToken' ,
13
- name : 'user_login ' ,
12
+ path : '/login/:accessToken' ,
13
+ name : 'login ' ,
14
14
component : ( ) => import ( '@/views/chat/user-login/index.vue' ) ,
15
15
} ,
16
16
// 对话用户登录
You can’t perform that action at this time.
0 commit comments