refactor(core): Remove roleId indirection (no-changelog) (#8413)

packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts

@@ -12,7 +12,7 @@ describe('Checks', () => {
 			vi.mocked(useUsersStore).mockReturnValue({
 				currentUser: {
 					isDefaultUser: false,
-					globalRole: { name: ROLE.Owner },
+					role: 'global:owner',
 				},
 			} as ReturnType<typeof useUsersStore>);
 
@@ -23,7 +23,7 @@ describe('Checks', () => {
 			vi.mocked(useUsersStore).mockReturnValue({
 				currentUser: {
 					isDefaultUser: false,
-					globalRole: { name: ROLE.Member },
+					role: 'global:member',
 				},
 			} as ReturnType<typeof useUsersStore>);
 

packages/editor-ui/src/rbac/checks/hasRole.ts

@@ -8,7 +8,7 @@ export const hasRole: RBACPermissionCheck<RolePermissionOptions> = (checkRoles)
 	const currentUser = usersStore.currentUser;
 
 	if (currentUser && checkRoles) {
-		const userRole = currentUser.isDefaultUser ? ROLE.Default : currentUser.globalRole?.name;
+		const userRole = currentUser.isDefaultUser ? ROLE.Default : currentUser.role;
 		return checkRoles.includes(userRole as IRole);
 	}
 

packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts

@@ -15,11 +15,7 @@ describe('Middleware', () => {
 			vi.mocked(useUsersStore).mockReturnValue({
 				currentUser: {
 					isDefaultUser: false,
-					globalRole: {
-						id: '123',
-						createdAt: new Date(),
-						name: ROLE.Owner,
-					},
+					role: 'global:owner',
 				} as IUser,
 			} as ReturnType<typeof useUsersStore>);
 
@@ -58,11 +54,7 @@ describe('Middleware', () => {
 			vi.mocked(useUsersStore).mockReturnValue({
 				currentUser: {
 					isDefaultUser: false,
-					globalRole: {
-						id: '123',
-						createdAt: new Date(),
-						name: ROLE.Owner,
-					},
+					role: 'global:owner',
 				} as IUser,
 			} as ReturnType<typeof useUsersStore>);