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
1 change: 1 addition & 0 deletions application/frontend/src/hooks/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export { useEnvironment } from './useEnvironment';
export { useLocationFromOutsideRoute } from './useLocationFromOutsideRoute';
export { useCapabilities } from './useCapabilities';
export { useUser } from './useUser';
62 changes: 62 additions & 0 deletions application/frontend/src/hooks/useUser.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { useEffect, useState } from 'react';

import { useEnvironment } from './useEnvironment';

export type UserState = {
user: string | null;
isLoggedIn: boolean;
loading: boolean;
};

export const useUser = () => {
const { apiUrl } = useEnvironment();
const [user, setUser] = useState<string | null>(null);
const [loading, setLoading] = useState(true);

useEffect(() => {
let active = true;
fetch(`${apiUrl}/user`, { method: 'GET' })
.then((res) => {
if (res.status === 200) {
return res.text();
}
if (res.status === 401) {
return null; // the normal anonymous case — not logged in
}
// Unexpected status (e.g. 5xx): a real failure, not a clean anonymous state.
throw new Error(`Unexpected /user status: ${res.status}`);
})
Comment thread
coderabbitai[bot] marked this conversation as resolved.
.then((value) => {
if (active) {
setUser(value && value.trim() !== '' ? value : null);
}
})
.catch((err) => {
// Network error or unexpected status. Degrade to anonymous so public
// pages stay accessible (never block or redirect), but log the failure
// instead of silently masking it as a normal logged-out state.
if (active) {
setUser(null);
}
console.error('useUser: could not resolve /user login state', err);
})
.finally(() => {
if (active) {
setLoading(false);
}
});
return () => {
active = false;
};
}, [apiUrl]);

const login = () => {
window.location.href = `${apiUrl}/login`;
};

const logout = () => {
window.location.href = `${apiUrl}/logout`;
};

return { user, isLoggedIn: user !== null, loading, login, logout };
};
101 changes: 53 additions & 48 deletions application/frontend/src/scaffolding/Header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import './header.scss';

import { Menu, Search } from 'lucide-react';
import { LogOut, Menu, Search, User } from 'lucide-react';
import React, { useEffect, useState } from 'react';
import { Link, useHistory } from 'react-router-dom';
import { NavLink } from 'react-router-dom';
Expand All @@ -9,6 +9,7 @@ import { Button } from 'semantic-ui-react';
import { ClearFilterButton } from '../../components/FilterButton/FilterButton';
import { Capabilities } from '../../hooks/useCapabilities';
import { useLocationFromOutsideRoute } from '../../hooks/useLocationFromOutsideRoute';
import { useUser } from '../../hooks/useUser';
import { SearchBar } from '../../pages/Search/components/SearchBar';
import { ROUTES } from '../../routes';

Expand All @@ -26,6 +27,8 @@ export const Header = ({ capabilities }: HeaderProps) => {
};
const { showFilter } = useLocationFromOutsideRoute(routes);

const { user, isLoggedIn, loading: userLoading, login, logout } = useUser();

const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
useEffect(() => {
const mediaQuery = window.matchMedia('(min-width: 768px)');
Expand Down Expand Up @@ -100,28 +103,24 @@ export const Header = ({ capabilities }: HeaderProps) => {
</div>

<div className="navbar__actions">
{/* Left these divs so that we can add auth functionality directly here. */}
{/* <div className="navbar__desktop-auth">
<Link
to={{
pathname: '/auth',
state: { mode: 'login' },
}}
className="btn btn--ghost"
>
Log In
</Link>

<Link
to={{
pathname: '/auth',
state: { mode: 'signup' },
}}
className="btn btn--primary"
>
Sign Up
</Link>
</div> */}
{capabilities.login && !userLoading && (
<div className="navbar__desktop-auth">
{isLoggedIn ? (
<div className="user-info">
<div className="user-details">
<User className="icon" />
<span>{user}</span>
</div>
<Button onClick={logout}>
<LogOut className="icon" />
Logout
</Button>
</div>
) : (
<Button onClick={login} content="Login" />
)}
</div>
)}

<button className="navbar__mobile-menu-toggle" onClick={() => setIsMobileMenuOpen(true)}>
<Menu className="icon" />
Expand Down Expand Up @@ -210,31 +209,37 @@ export const Header = ({ capabilities }: HeaderProps) => {
)}
</div>

<div className="mobile-auth">
{/* <div className="auth-buttons">
<Link
to={{
pathname: '/auth',
state: { mode: 'login' },
}}
className="btn btn--ghost"
onClick={closeMobileMenu}
>
Log In
</Link>

<Link
to={{
pathname: '/auth',
state: { mode: 'signup' },
}}
className="btn btn--primary"
onClick={closeMobileMenu}
>
Sign Up
</Link>
</div> */}
</div>
{capabilities.login && !userLoading && (
<div className="mobile-auth">
{isLoggedIn ? (
<div className="user-info">
<div className="user-details">
<User className="icon" />
<span>{user}</span>
</div>
<Button
onClick={() => {
closeMobileMenu();
logout();
}}
>
<LogOut className="icon" />
Logout
</Button>
</div>
) : (
<div className="auth-buttons">
<Button
onClick={() => {
closeMobileMenu();
login();
}}
content="Login"
/>
</div>
)}
</div>
)}
</div>
</>
);
Expand Down
Loading