mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(editor): Fix RBAC type errors (no-changelog) (#9435)

Browse Source
This commit is contained in:
Alex Grozav
2024-05-17 13:29:47 +03:00
committed by GitHub
parent 48588194b9
commit 6aec42069c
8 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts
View File

@@ -1,5 +1,6 @@
import { useUsersStore } from '@/stores/users.store';
import { isAuthenticated } from '@/rbac/checks/isAuthenticated';
import type { IUser } from '@/Interface';
vi.mock('@/stores/users.store', () => ({
useUsersStore: vi.fn(),
@@ -7,7 +8,7 @@ vi.mock('@/stores/users.store', () => ({
describe('Checks', () => {
describe('isAuthenticated()', () => {
const mockUser = { id: 'user123', name: 'Test User' };
const mockUser: Partial<IUser> = { id: 'user123', fullName: 'Test User' };
it('should return true if there is a current user', () => {
vi.mocked(useUsersStore).mockReturnValue({ currentUser: mockUser } as unknown as ReturnType<

2
packages/editor-ui/src/rbac/middleware/authenticated.ts
View File

@@ -5,7 +5,7 @@ import { isAuthenticated } from '@/rbac/checks';
export const authenticatedMiddleware: RouterMiddleware<AuthenticatedPermissionOptions> = async (
to,
from,
_from,
next,
options,
) => {

4
packages/editor-ui/src/rbac/middleware/defaultUser.ts
View File

@@ -4,8 +4,8 @@ import type { DefaultUserMiddlewareOptions } from '@/types/rbac';
import { isDefaultUser } from '@/rbac/checks';
export const defaultUserMiddleware: RouterMiddleware<DefaultUserMiddlewareOptions> = async (
to,
from,
_to,
_from,
next,
) => {
const valid = isDefaultUser();

4
packages/editor-ui/src/rbac/middleware/enterprise.ts
View File

@@ -4,8 +4,8 @@ import type { EnterprisePermissionOptions } from '@/types/rbac';
import { isEnterpriseFeatureEnabled } from '@/rbac/checks';
export const enterpriseMiddleware: RouterMiddleware<EnterprisePermissionOptions> = async (
to,
from,
_to,
_from,
next,
options,
) => {

6
packages/editor-ui/src/rbac/middleware/guest.ts
View File

@@ -3,7 +3,11 @@ import { VIEWS } from '@/constants';
import type { GuestPermissionOptions } from '@/types/rbac';
import { isGuest } from '@/rbac/checks';
export const guestMiddleware: RouterMiddleware<GuestPermissionOptions> = async (to, from, next) => {
export const guestMiddleware: RouterMiddleware<GuestPermissionOptions> = async (
to,
_from,
next,
) => {
const valid = isGuest();
if (!valid) {
const redirect = to.query.redirect as string;

2
packages/editor-ui/src/rbac/middleware/rbac.ts
View File

@@ -10,7 +10,7 @@ import { hasScope } from '@/rbac/checks';
export const rbacMiddleware: RouterMiddleware<RBACPermissionOptions> = async (
to,
from,
_from,
next,
{ scope, options },
) => {

4
packages/editor-ui/src/rbac/middleware/role.ts
View File

@@ -4,8 +4,8 @@ import { VIEWS } from '@/constants';
import { hasRole } from '@/rbac/checks';
export const roleMiddleware: RouterMiddleware<RolePermissionOptions> = async (
to,
from,
_to,
_from,
next,
checkRoles,
) => {

2
packages/editor-ui/src/types/router.ts
View File

@@ -16,7 +16,7 @@ import type {
DefaultUserMiddlewareOptions,
} from '@/types/rbac';
export type RouterMiddlewareType = PermissionType;
export type RouterMiddlewareType = Exclude<PermissionType, 'instanceOwner'>;
export type CustomMiddlewareOptions = CustomPermissionOptions<{
to: RouteLocationNormalized;
from: RouteLocationNormalized;