From d97d1b3438f743d5aa2dd1c5af51a427b9adf409 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Fri, 17 May 2024 11:51:27 +0300
Subject: [PATCH] fix: fix rbac typecheck

---
 .../src/rbac/checks/__tests__/isAuthenticated.test.ts       | 3 ++-
 packages/editor-ui/src/rbac/middleware/authenticated.ts     | 2 +-
 packages/editor-ui/src/rbac/middleware/defaultUser.ts       | 4 ++--
 packages/editor-ui/src/rbac/middleware/enterprise.ts        | 4 ++--
 packages/editor-ui/src/rbac/middleware/guest.ts             | 6 +++++-
 packages/editor-ui/src/rbac/middleware/rbac.ts              | 2 +-
 packages/editor-ui/src/rbac/middleware/role.ts              | 4 ++--
 packages/editor-ui/src/types/router.ts                      | 2 +-
 8 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts b/packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts
index b38cb1d35bde7..4afcbd22295e2 100644
--- a/packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts
+++ b/packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts
@@ -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<
diff --git a/packages/editor-ui/src/rbac/middleware/authenticated.ts b/packages/editor-ui/src/rbac/middleware/authenticated.ts
index 0f74161600ed6..529c8f1165a9f 100644
--- a/packages/editor-ui/src/rbac/middleware/authenticated.ts
+++ b/packages/editor-ui/src/rbac/middleware/authenticated.ts
@@ -5,7 +5,7 @@ import { isAuthenticated } from '@/rbac/checks';
 
 export const authenticatedMiddleware: RouterMiddleware<AuthenticatedPermissionOptions> = async (
 	to,
-	from,
+	_from,
 	next,
 	options,
 ) => {
diff --git a/packages/editor-ui/src/rbac/middleware/defaultUser.ts b/packages/editor-ui/src/rbac/middleware/defaultUser.ts
index bab12869f9928..704b307e52bfa 100644
--- a/packages/editor-ui/src/rbac/middleware/defaultUser.ts
+++ b/packages/editor-ui/src/rbac/middleware/defaultUser.ts
@@ -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();
diff --git a/packages/editor-ui/src/rbac/middleware/enterprise.ts b/packages/editor-ui/src/rbac/middleware/enterprise.ts
index 88f09a8557dc9..993abde167bf6 100644
--- a/packages/editor-ui/src/rbac/middleware/enterprise.ts
+++ b/packages/editor-ui/src/rbac/middleware/enterprise.ts
@@ -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,
 ) => {
diff --git a/packages/editor-ui/src/rbac/middleware/guest.ts b/packages/editor-ui/src/rbac/middleware/guest.ts
index 05095469f6f86..2dbefb317614f 100644
--- a/packages/editor-ui/src/rbac/middleware/guest.ts
+++ b/packages/editor-ui/src/rbac/middleware/guest.ts
@@ -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;
diff --git a/packages/editor-ui/src/rbac/middleware/rbac.ts b/packages/editor-ui/src/rbac/middleware/rbac.ts
index e3c25ec433628..abd5667d4ed61 100644
--- a/packages/editor-ui/src/rbac/middleware/rbac.ts
+++ b/packages/editor-ui/src/rbac/middleware/rbac.ts
@@ -10,7 +10,7 @@ import { hasScope } from '@/rbac/checks';
 
 export const rbacMiddleware: RouterMiddleware<RBACPermissionOptions> = async (
 	to,
-	from,
+	_from,
 	next,
 	{ scope, options },
 ) => {
diff --git a/packages/editor-ui/src/rbac/middleware/role.ts b/packages/editor-ui/src/rbac/middleware/role.ts
index b4614aa54786a..366a97106f555 100644
--- a/packages/editor-ui/src/rbac/middleware/role.ts
+++ b/packages/editor-ui/src/rbac/middleware/role.ts
@@ -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,
 ) => {
diff --git a/packages/editor-ui/src/types/router.ts b/packages/editor-ui/src/types/router.ts
index ddbffeb2f5dc2..15d1e120db291 100644
--- a/packages/editor-ui/src/types/router.ts
+++ b/packages/editor-ui/src/types/router.ts
@@ -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;