From 3c4526ca2bc0d6b5bd92d93c8ef585854525b353 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 6 Jul 2022 13:13:28 -0700
Subject: [PATCH 1/2] Fixed access to non-admin pages

---
 ui/src/app/App.js | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/ui/src/app/App.js b/ui/src/app/App.js
index 20331e4e8..546241f10 100644
--- a/ui/src/app/App.js
+++ b/ui/src/app/App.js
@@ -33,6 +33,7 @@ import { SessionModal } from './core/user/SessionModal';
 import { Roles } from './admin/Roles';
 import { Groups } from './admin/Groups';
 import { BASE_PATH } from './App.constant';
+import { ProtectRoute } from './core/components/ProtectRoute';
 
 
 function App() {
@@ -81,12 +82,32 @@ function App() {
                                                     </Route>
                                                     <Route path="/dashboard" component={Dashboard} />
                                                     <Route path="/metadata/source/new" component={NewSource} />
-                                                    <Route path="/metadata/provider/new" component={NewProvider} />
-                                                    <Route path="/metadata/attributes" component={Attribute} />
-                                                    <Route path="/metadata/provider/:id/filter" component={Filter} />
+                                                    <Route path="/metadata/provider/new" render={() =>
+                                                        <ProtectRoute redirectTo="/dashboard">
+                                                            <NewProvider />
+                                                        </ProtectRoute>
+                                                    } />
+                                                    <Route path="/metadata/attributes"  render={() =>
+                                                        <ProtectRoute redirectTo="/dashboard">
+                                                            <Attribute />
+                                                        </ProtectRoute>
+                                                    } />
+                                                    <Route path="/metadata/provider/:id/filter"  render={() =>
+                                                        <ProtectRoute redirectTo="/dashboard">
+                                                            <Filter />
+                                                        </ProtectRoute>
+                                                    } />
                                                     <Route path="/metadata/:type/:id" component={Metadata} />
-                                                    <Route path="/roles" component={Roles} />
-                                                    <Route path="/groups" component={Groups} />
+                                                    <Route path="/roles" render={() =>
+                                                        <ProtectRoute redirectTo="/dashboard">
+                                                            <Roles />
+                                                        </ProtectRoute>
+                                                    } />
+                                                    <Route path="/groups" render={() =>
+                                                        <ProtectRoute redirectTo="/dashboard">
+                                                            <Groups />
+                                                        </ProtectRoute>
+                                                    } />
                                                     <Route path="*">
                                                         <Redirect to="/dashboard" />
                                                     </Route>

From f5a59a7b73a6014fddc1b16313d5ba3991993206 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 27 Jul 2022 12:39:22 -0700
Subject: [PATCH 2/2] Fixed admin route

---
 ui/src/app/dashboard/view/Dashboard.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/src/app/dashboard/view/Dashboard.js b/ui/src/app/dashboard/view/Dashboard.js
index e5f145572..b1d058eaf 100644
--- a/ui/src/app/dashboard/view/Dashboard.js
+++ b/ui/src/app/dashboard/view/Dashboard.js
@@ -112,6 +112,9 @@ export function Dashboard () {
                         <ActionsTab sources={sources} users={users} reloadSources={loadSources} reloadUsers={loadUsers} />
                     </ProtectRoute>
                 } />
+                <Route exact path={`${path}/*`}>
+                    <Redirect to={`${url}/metadata/manager/resolvers`} />
+                </Route>
             </Switch></>
             }
         </div>