From c01ca604e3b02833b82e64e7908184ee965b2c8e Mon Sep 17 00:00:00 2001
From: Mohammad Raska <42745054+Adekabang@users.noreply.github.com>
Date: Wed, 27 Nov 2024 02:27:49 -0500
Subject: [PATCH 1/4] fix:unauth user access users

---
 resources/scripts/routers/AdminUserRouter.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/resources/scripts/routers/AdminUserRouter.tsx b/resources/scripts/routers/AdminUserRouter.tsx
index b64b2d609ce..702356fd951 100644
--- a/resources/scripts/routers/AdminUserRouter.tsx
+++ b/resources/scripts/routers/AdminUserRouter.tsx
@@ -24,10 +24,15 @@ export const routes: Route[] = [
             {
                 path: ':id',
                 element: lazyLoad(lazy(() => import('./AdminUserRouter'))),
-                loader: ({ params }) =>
-                    query(getKey(parseInt(params.id!)), () =>
-                        getUser(parseInt(params.id!))
-                    ),
+                loader: async ({ params }) => {
+                    try {
+                        const id = parseInt(params.id!);
+                        const user = await query(getKey(id), () => getUser(id));
+                        return user;
+                    } catch (error) {
+                        return null;
+                    }
+                },
                 children: [
                     {
                         path: 'settings',

From 8329e4e797b556a1e740a4f9ee5723e0222eaaf6 Mon Sep 17 00:00:00 2001
From: Mohammad Raska <42745054+Adekabang@users.noreply.github.com>
Date: Wed, 27 Nov 2024 02:28:38 -0500
Subject: [PATCH 2/4] fix:unauth user access nodes

---
 resources/scripts/routers/AdminNodeRouter.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/resources/scripts/routers/AdminNodeRouter.tsx b/resources/scripts/routers/AdminNodeRouter.tsx
index bd99474054e..ebbe9fbe8ef 100644
--- a/resources/scripts/routers/AdminNodeRouter.tsx
+++ b/resources/scripts/routers/AdminNodeRouter.tsx
@@ -25,10 +25,15 @@ export const routes: Route[] = [
             },
             {
                 path: ':nodeId',
-                loader: ({ params }) =>
-                    query(getPoolKey(parseInt(params.nodeId!)), () =>
-                        getNode(parseInt(params.nodeId!))
-                    ),
+                loader: async ({ params }) => {
+                    try {
+                        const nodeId = parseInt(params.nodeId!);
+                        const node = await query(getPoolKey(nodeId), () => getNode(nodeId));
+                        return node;
+                    } catch (error) {
+                        return null;
+                    }
+                },
                 element: lazyLoad(
                     lazy(() => import('@/routers/AdminNodeRouter'))
                 ),

From 2181f63be1de23e272c81bff05946cd6dd02684d Mon Sep 17 00:00:00 2001
From: Mohammad Raska <42745054+Adekabang@users.noreply.github.com>
Date: Wed, 27 Nov 2024 02:29:17 -0500
Subject: [PATCH 3/4] fix:unauth user access IPAM

---
 resources/scripts/routers/AdminIpamRouter.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/resources/scripts/routers/AdminIpamRouter.tsx b/resources/scripts/routers/AdminIpamRouter.tsx
index 9378e3f7068..6312e0b08d5 100644
--- a/resources/scripts/routers/AdminIpamRouter.tsx
+++ b/resources/scripts/routers/AdminIpamRouter.tsx
@@ -31,10 +31,15 @@ export const routes: Route[] = [
             },
             {
                 path: ':poolId',
-                loader: ({ params }) =>
-                    query(getPoolKey(parseInt(params.poolId!)), () =>
-                        getAddressPool(parseInt(params.poolId!))
-                    ),
+                loader: async ({ params }) => {
+                    try {
+                        const poolId = parseInt(params.poolId!);
+                        const pool = await query(getPoolKey(poolId), () => getAddressPool(poolId));
+                        return pool;
+                    } catch (error) {
+                        return null;
+                    }
+                },
                 element: lazyLoad(lazy(() => import('./AdminIpamRouter'))),
                 handle: {
                     crumb: data => ({

From 8bdecd12692189d4c44665a0ee173ec7b228bc90 Mon Sep 17 00:00:00 2001
From: Mohammad Raska <42745054+Adekabang@users.noreply.github.com>
Date: Wed, 27 Nov 2024 02:44:47 -0500
Subject: [PATCH 4/4] fix:unauth user access IPAM settings

---
 resources/scripts/routers/AdminIpamRouter.tsx | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/resources/scripts/routers/AdminIpamRouter.tsx b/resources/scripts/routers/AdminIpamRouter.tsx
index 6312e0b08d5..ca22c7a7310 100644
--- a/resources/scripts/routers/AdminIpamRouter.tsx
+++ b/resources/scripts/routers/AdminIpamRouter.tsx
@@ -54,17 +54,21 @@ export const routes: Route[] = [
                     },
                     {
                         path: 'addresses',
-                        loader: ({ params }) => {
-                            const id = parseInt(params.poolId!)
-                            const page = params.page ? parseInt(params.page) : 1
-
-                            return query(getAddressesKey(id, page, ''), () =>
-                                getAddresses(id, {
-                                    page,
-                                    query: '',
-                                    include: ['server'],
-                                })
-                            )
+                        loader: async ({ params }) => {
+                            try {
+                                const id = parseInt(params.poolId!)
+                                const page = params.page ? parseInt(params.page) : 1
+                                const addresses = await query(getAddressesKey(id, page, ''), () =>
+                                    getAddresses(id, {
+                                        page,
+                                        query: '',
+                                        include: ['server'],
+                                    })
+                                )
+                                return addresses
+                            } catch (error) {
+                                return null
+                            }
                         },
                         element: lazyLoad(
                             lazy(