Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions frontend/src/api/authService.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
import api from "./axios";

export async function login(payload) {
const { data } = await api.post("/auth/login", payload);
return data;
const { data } = await api.post("/auth/login", payload);
return data;
}

export async function signup(payload) {
const { data } = await api.post("/auth/register", payload);
return data;
const { data } = await api.post("/auth/register", payload);
return data;
}

export async function logout() {
const { data } = await api.post("/auth/logout");
return data;
}

export async function getMe() {
const { data } = await api.get("/auth/me");
return data;
const { data } = await api.get("/auth/me");
return data;
}
28 changes: 12 additions & 16 deletions frontend/src/app/router.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export function AppRouter() {
<Route
path="/manager"
element={
<ProtectedRoute allowedRoles={["manager", "admin"]}>
<ProtectedRoute allowedRoles={["manager", "finance", "director", "admin"]}>
<ApprovalQueuePage />
</ProtectedRoute>
Comment on lines 48 to 52
}
Expand All @@ -60,22 +60,18 @@ export function AppRouter() {
</ProtectedRoute>
}
/>
<Route path="/dashboard" element={<DashboardPage />} />
<Route path="/expenses" element={<ExpensePage />} />
<Route
path="/dashboard"
element={<DashboardPage />}
/>
<Route
path="/expenses"
element={<ExpensePage />}
/>
<Route
path="/approvals"
element={
<ProtectedRoute allowedRoles={["manager", "admin"]}>
<ApprovalQueuePage />
</ProtectedRoute>
}
/>
path="/approvals"
element={
<ProtectedRoute
allowedRoles={["manager", "finance", "director", "admin"]}
>
<ApprovalQueuePage />
</ProtectedRoute>
}
/>
<Route
path="/analytics"
element={
Expand Down
19 changes: 13 additions & 6 deletions frontend/src/context/AuthContext.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { jwtDecode } from "jwt-decode";
import {
login as loginRequest,
signup as signupRequest,
logout as logoutRequest,
} from "../api/authService";

const AuthContext = createContext(null);
Expand Down Expand Up @@ -93,12 +94,18 @@ export function AuthProvider({ children }) {
[persistAuth],
);

const logout = useCallback(() => {
setUser(null);
setToken(null);
localStorage.removeItem("token");
localStorage.removeItem("auth_user");
window.location.href = "/login";
const logout = useCallback(async () => {
try {
await logoutRequest();
} catch {
// proceed with client-side cleanup even if server call fails
} finally {
setUser(null);
setToken(null);
localStorage.removeItem("token");
localStorage.removeItem("auth_user");
window.location.href = "/login";
}
}, []);

const switchRole = useCallback((role) => {
Expand Down