mirror of
https://github.com/sct/overseerr.git
synced 2025-09-17 17:24:35 +02:00
feat: logout route/sign out button (#54)
This commit is contained in:
@@ -457,10 +457,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: object
|
||||
properties:
|
||||
status:
|
||||
type: string
|
||||
$ref: '#/components/schemas/User'
|
||||
requestBody:
|
||||
required: true
|
||||
content:
|
||||
@@ -472,7 +469,23 @@ paths:
|
||||
type: string
|
||||
required:
|
||||
- authToken
|
||||
|
||||
/auth/logout:
|
||||
get:
|
||||
summary: Logout and clear session cookie
|
||||
description: This endpoint will completely clear the session cookie and associated values, logging out the user
|
||||
tags:
|
||||
- auth
|
||||
responses:
|
||||
'200':
|
||||
description: OK
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: object
|
||||
properties:
|
||||
status:
|
||||
type: string
|
||||
example: 'ok'
|
||||
/user:
|
||||
get:
|
||||
summary: Returns a list of all users
|
||||
|
@@ -75,7 +75,7 @@ authRoutes.post('/login', async (req, res) => {
|
||||
req.session.userId = user.id;
|
||||
}
|
||||
|
||||
return res.status(200).json({ status: 'ok' });
|
||||
return res.status(200).json(user?.filter() ?? {});
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
res
|
||||
@@ -84,4 +84,17 @@ authRoutes.post('/login', async (req, res) => {
|
||||
}
|
||||
});
|
||||
|
||||
authRoutes.get('/logout', (req, res, next) => {
|
||||
req.session?.destroy((err) => {
|
||||
if (err) {
|
||||
return next({
|
||||
status: 500,
|
||||
message: 'Something went wrong while attempting to logout',
|
||||
});
|
||||
}
|
||||
|
||||
return res.status(200).json({ status: 'ok' });
|
||||
});
|
||||
});
|
||||
|
||||
export default authRoutes;
|
||||
|
@@ -1,11 +1,20 @@
|
||||
import React, { useState } from 'react';
|
||||
import Transition from '../../Transition';
|
||||
import { useUser } from '../../../hooks/useUser';
|
||||
import axios from 'axios';
|
||||
|
||||
const UserDropdown: React.FC = () => {
|
||||
const { user } = useUser();
|
||||
const { user, revalidate } = useUser();
|
||||
const [isDropdownOpen, setDropdownOpen] = useState(false);
|
||||
|
||||
const logout = async () => {
|
||||
const response = await axios.get('/api/v1/auth/logout');
|
||||
|
||||
if (response.data?.status === 'ok') {
|
||||
revalidate();
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="ml-3 relative">
|
||||
<div>
|
||||
@@ -53,6 +62,7 @@ const UserDropdown: React.FC = () => {
|
||||
href="#"
|
||||
className="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 transition ease-in-out duration-150"
|
||||
role="menuitem"
|
||||
onClick={() => logout()}
|
||||
>
|
||||
Sign out
|
||||
</a>
|
||||
|
@@ -16,7 +16,7 @@ const Login: React.FC = () => {
|
||||
const login = async () => {
|
||||
const response = await axios.post('/api/v1/auth/login', { authToken });
|
||||
|
||||
if (response.data?.status === 'OK') {
|
||||
if (response.data?.email) {
|
||||
revalidate();
|
||||
}
|
||||
};
|
||||
|
@@ -15,7 +15,7 @@ export const UserContext: React.FC<UserContextProps> = ({
|
||||
initialUser,
|
||||
children,
|
||||
}) => {
|
||||
const { user, revalidate } = useUser({ initialData: initialUser });
|
||||
const { user, error, revalidate } = useUser({ initialData: initialUser });
|
||||
const router = useRouter();
|
||||
|
||||
useEffect(() => {
|
||||
@@ -23,10 +23,17 @@ export const UserContext: React.FC<UserContextProps> = ({
|
||||
}, [router.pathname, revalidate]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!router.pathname.match(/(setup|login)/) && !user) {
|
||||
router.push('/login');
|
||||
let routing = false;
|
||||
|
||||
if (
|
||||
!router.pathname.match(/(setup|login)/) &&
|
||||
(!user || error) &&
|
||||
!routing
|
||||
) {
|
||||
routing = true;
|
||||
location.href = '/login';
|
||||
}
|
||||
}, [router, user]);
|
||||
}, [router, user, error]);
|
||||
|
||||
return <>{children}</>;
|
||||
};
|
||||
|
@@ -21,7 +21,12 @@ export const useUser = ({
|
||||
const initialRef = useRef(initialData);
|
||||
const { data, error, revalidate } = useSwr<User>(
|
||||
id ? `/api/v1/user/${id}` : `/api/v1/auth/me`,
|
||||
{ initialData: initialRef.current }
|
||||
{
|
||||
initialData: initialRef.current,
|
||||
refreshInterval: 30000,
|
||||
errorRetryInterval: 30000,
|
||||
shouldRetryOnError: false,
|
||||
}
|
||||
);
|
||||
|
||||
return {
|
||||
|
@@ -25,6 +25,7 @@ class CoreApp extends App<AppProps> {
|
||||
);
|
||||
const { ctx, router } = initialProps;
|
||||
let user = undefined;
|
||||
if (ctx.res) {
|
||||
try {
|
||||
// Attempt to get the user by running a request to the local api
|
||||
const response = await axios.get<User>(
|
||||
@@ -36,13 +37,14 @@ class CoreApp extends App<AppProps> {
|
||||
// If there is no user, and ctx.res is set (to check if we are on the server side)
|
||||
// _AND_ we are not already on the login or setup route, redirect to /login with a 307
|
||||
// before anything actually renders
|
||||
if (ctx.res && !router.pathname.match(/(login|setup)/)) {
|
||||
if (!router.pathname.match(/(login|setup)/)) {
|
||||
ctx.res.writeHead(307, {
|
||||
Location: '/login',
|
||||
});
|
||||
ctx.res.end();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return { ...appInitialProps, user };
|
||||
};
|
||||
|
Reference in New Issue
Block a user