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,
224224 workspace_user_role_mapping in
225225 workspace_user_role_mapping_list ] + [user .role ], version = version )
226226 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' )]
228230 cache .set (key , role_list , version = version )
229231 return role_list
230232 return workspace_list
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ router.beforeEach(
2525 return
2626 }
2727 const { chatUser } = useStore ( )
28- const notAuthRouteNameList = [ 'user_login ' ]
28+ const notAuthRouteNameList = [ 'login ' ]
2929 if ( ! notAuthRouteNameList . includes ( to . name ? to . name . toString ( ) : '' ) ) {
3030 if ( to . params && to . params . accessToken ) {
3131 chatUser . setAccessToken ( to . params . accessToken . toString ( ) )
@@ -40,7 +40,7 @@ router.beforeEach(
4040 if ( authentication ) {
4141 if ( ! token ) {
4242 next ( {
43- name : 'user_login ' ,
43+ name : 'login ' ,
4444 params : {
4545 accessToken : to . params . accessToken ,
4646 } ,
Original file line number Diff line number Diff line change @@ -9,8 +9,8 @@ export const routes: Array<RouteRecordRaw> = [
99 } ,
1010 // 对话用户登录
1111 {
12- path : '/user- login/:accessToken' ,
13- name : 'user_login ' ,
12+ path : '/login/:accessToken' ,
13+ name : 'login ' ,
1414 component : ( ) => import ( '@/views/chat/user-login/index.vue' ) ,
1515 } ,
1616 // 对话用户登录
You can’t perform that action at this time.
0 commit comments