reorder access check

Author: mluukkai

src/client/components/Errors/Unauthorized.tsx

@@ -1,9 +1,6 @@
-import { useNavigate } from 'react-router-dom'
-import { Box, Button, Container, Typography } from '@mui/material'
+import { Box, Container, Typography } from '@mui/material'
 
 const Unauthorized = () => {
-  const navigate = useNavigate()
-
   return (
     <Box
       sx={{
@@ -13,12 +10,9 @@ const Unauthorized = () => {
     >
       <Container>
         <Typography variant="h2" sx={{ my: 4, fontWeight: 'bold' }}>
-          UNAUTHORIZED (401)
+          UNAUTHORIZED
         </Typography>
         <Typography variant="h6">Sorry, but you do not have the needed access to this page.</Typography>
-        <Button sx={{ mt: 4 }} variant="contained" onClick={() => navigate('/')}>
-          Back Home
-        </Button>
       </Container>
     </Box>
   )

src/server/routes/index.ts

@@ -60,17 +60,18 @@ router.post('/seed', adminHandler, async (_, res) => {
 
 router.use('/login', loginRouter)
 
-router.use(userAccessMiddleware)
-
 router.use('/faculties', facultyRouter)
 router.use('/surveys', surveyRouter)
 router.use('/questions', questionRouter)
 router.use('/results', resultRouter)
-router.use('/entries', entryRouter)
-router.use('/users', userRouter)
 router.use('/countries', countryRouter)
-router.use('/organizations', organizationRouter)
 router.use('/warnings', warningsRouter)
+
+router.use(userAccessMiddleware)
+
+router.use('/users', userRouter)
+router.use('/entries', entryRouter)
+router.use('/organizations', organizationRouter)
 router.use('/tuhatprojects', tuhatProjectsRouter)
 router.use('/riskiapi', myResearchApiRouter)