yangli/worldshine-redesign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix
All checks were successful
Build And Deploy Main / build-and-deploy (push) Successful in 32s
Details

Browse Source
This commit is contained in:
Lixian Zhou
2026-03-12 15:51:35 -04:00
parent 9087156f2d
commit 23dab22110
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/services/AuthService.js
View File

@@ -29,6 +29,8 @@ const getCurrentPermissions = () => {
const SYSTEM_ACCESS_PERMISSION = 'System Access'; const SYSTEM_ACCESS_PERMISSION = 'System Access';
const DRIVER_BYPASS_PERMISSION = 'isDriver'; const DRIVER_BYPASS_PERMISSION = 'isDriver';
const SYSTEM_ACCESS_BYPASS_USERS = new Set(['testadmin03']); const SYSTEM_ACCESS_BYPASS_USERS = new Set(['testadmin03']);
const getPermissionSet = () => new Set(getCurrentPermissions());
const hasRawPermission = (permissionKey) => getPermissionSet().has(permissionKey);
const isSystemAccessBypassUser = () => { const isSystemAccessBypassUser = () => {
const user = getCurrentUser(); const user = getCurrentUser();
@@ -44,14 +46,13 @@ const isSystemAccessBypassUser = () => {
}; };
const hasSystemAccess = () => { const hasSystemAccess = () => {
return isSystemAccessBypassUser() || getCurrentPermissions().includes(SYSTEM_ACCESS_PERMISSION); return isSystemAccessBypassUser() || hasRawPermission(SYSTEM_ACCESS_PERMISSION);
}; };
const hasPermission = (permissionKey) => { const hasPermission = (permissionKey) => {
if (!permissionKey) return false; if (!permissionKey) return false;
const permissionSet = new Set(getCurrentPermissions());
if (permissionKey === DRIVER_BYPASS_PERMISSION) { if (permissionKey === DRIVER_BYPASS_PERMISSION) {
return permissionSet.has(DRIVER_BYPASS_PERMISSION); return hasRawPermission(DRIVER_BYPASS_PERMISSION);
} }
if (permissionKey === SYSTEM_ACCESS_PERMISSION) { if (permissionKey === SYSTEM_ACCESS_PERMISSION) {
return hasSystemAccess(); return hasSystemAccess();
@@ -59,16 +60,17 @@ const hasPermission = (permissionKey) => {
if (!hasSystemAccess()) { if (!hasSystemAccess()) {
return false; return false;
} }
return permissionSet.has(permissionKey); return hasRawPermission(permissionKey);
}; };
const hasAnyPermission = (permissionKeys = []) => { const hasAnyPermission = (permissionKeys = []) => {
if (!Array.isArray(permissionKeys) || permissionKeys.length === 0) return false; if (!Array.isArray(permissionKeys) || permissionKeys.length === 0) return false;
const permissionSet = new Set(getCurrentPermissions());
if (!hasSystemAccess()) { if (!hasSystemAccess()) {
return permissionKeys.some((permissionKey) => permissionKey === DRIVER_BYPASS_PERMISSION && permissionSet.has(DRIVER_BYPASS_PERMISSION)); return permissionKeys.some((permissionKey) => permissionKey === DRIVER_BYPASS_PERMISSION && hasRawPermission(DRIVER_BYPASS_PERMISSION));
} }
return permissionKeys.some((permissionKey) => permissionSet.has(permissionKey)); return permissionKeys
.filter((permissionKey) => permissionKey && permissionKey !== SYSTEM_ACCESS_PERMISSION)
.some((permissionKey) => hasRawPermission(permissionKey));
}; };
const CUSTOMER_VIEW_TAB_PERMISSION_MAP = { const CUSTOMER_VIEW_TAB_PERMISSION_MAP = {