diff --git a/Controllers/AppUsersController.cs b/Controllers/AppUsersController.cs index b8ec990..2c1b759 100644 --- a/Controllers/AppUsersController.cs +++ b/Controllers/AppUsersController.cs @@ -13,7 +13,7 @@ using TicketManager.Resources; namespace TicketManager.Controllers { - // [Authorize] + [Authorize] [Produces("application/json")] [Route("api/v1/users")] [ApiController] diff --git a/Controllers/ProjectsController.cs b/Controllers/ProjectsController.cs index 0bd41d0..c06bfb0 100644 --- a/Controllers/ProjectsController.cs +++ b/Controllers/ProjectsController.cs @@ -13,7 +13,7 @@ using System; namespace TicketManager.Controllers { // [Authorize(Roles = "Admin")] - // [Authorize] + [Authorize] [Produces("application/json")] [Route("api/v1/[controller]")] [ApiController] diff --git a/Controllers/TicketsController.cs b/Controllers/TicketsController.cs index efc6132..78891dd 100644 --- a/Controllers/TicketsController.cs +++ b/Controllers/TicketsController.cs @@ -10,7 +10,7 @@ using TicketManager.Models; namespace TicketManager.Controllers { - // [Authorize] + [Authorize] [Route("api/v1/[controller]")] [ApiController] public class TicketsController : ControllerBase diff --git a/client/src/routes/AppRouter.tsx b/client/src/routes/AppRouter.tsx index db6dd71..631525b 100644 --- a/client/src/routes/AppRouter.tsx +++ b/client/src/routes/AppRouter.tsx @@ -6,13 +6,12 @@ import { UserController } from "../controllers/UserController"; import { TicketController } from "../controllers/TicketController"; import { NotFoundPage } from "../pages/NotFoundPage"; import { TestPage } from "../pages/TestPage"; +import { PrivateRoute } from "./PrivateRoute"; export const AppRouter = () => { return ( - - - + diff --git a/client/src/routes/PrivateRoute.jsx b/client/src/routes/PrivateRoute.jsx index 61f1d4d..7573cbf 100644 --- a/client/src/routes/PrivateRoute.jsx +++ b/client/src/routes/PrivateRoute.jsx @@ -11,13 +11,13 @@ export const PrivateRoute = ({ component: Component, path, ...rest }) => { } const fn = async () => { await loginWithRedirect({ - appState: { targetUrl: window.location.pathname } + appState: { targetUrl: window.location.pathname }, }); }; fn(); }, [loading, isAuthenticated, loginWithRedirect, path]); - const render = props => + const render = (props) => isAuthenticated === true ? : null; return ;