Merge pull request #218 from osu-tournament-rating/feature/sign-out

osu-tournament-rating · Aug 29, 2024 · ba2d079 · ba2d079
2 parents 56179b1 + 2f17c4b
commit ba2d079
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/app/actions.ts b/app/actions.ts
@@ -102,6 +102,22 @@ export async function login(cookie: {
   return NextResponse.redirect(new URL('/', process.env.REACT_APP_ORIGIN_URL));
 }
 
+export async function logout() {
+  const session = await getSession();
+
+  if (session) {
+    try {
+      session.destroy(); // delete the session made with IronSession - delete it's session cookie
+      await cookies().delete('OTR-Refresh-Token'); // delete the cookie that contains the refresh token
+      await cookies().delete('OTR-user-selected-osu-mode'); // delete the cookie that contains the selected osu mode
+    } catch (error) {
+      console.log(error);
+    } finally {
+      return redirect(new URL('/', process.env.REACT_APP_ORIGIN_URL));
+    }
+  }
+}
+
 export async function getLoggedUser(accessToken: string) {
   let res = await fetch(`${process.env.REACT_APP_API_URL}/me`, {
     method: 'GET',

diff --git a/components/NavBar/NavBar.module.css b/components/NavBar/NavBar.module.css
@@ -52,6 +52,9 @@
   border: 0;
   background: transparent;
   cursor: pointer;
+  font-size: inherit;
+  font-weight: inherit;
+  color: inherit;
 }
 
 .iconContainer {

diff --git a/components/NavBar/Tooltip/Tooltip.module.css b/components/NavBar/Tooltip/Tooltip.module.css
@@ -37,19 +37,16 @@
   transition: all 0.2s ease-out;
 }
 
-.tooltipContent > div {
+.tooltipContent > :is(div, button) {
   display: flex;
   align-items: center;
   justify-content: center;
-}
-
-.tooltipContent > div {
   cursor: pointer;
   transition: color 0.2s ease;
   border-radius: 4px;
   color: hsla(var(--foreground-inactive-hsl));
 }
 
-.tooltipContent > div:hover {
+.tooltipContent > :is(div, button):hover {
   color: hsla(var(--foreground-active-hsl));
 }
diff --git a/components/NavBar/UserLogged/UserLogged.tsx b/components/NavBar/UserLogged/UserLogged.tsx
@@ -1,14 +1,20 @@
 'use client';
 
+import { logout } from '@/app/actions';
 import { useUser } from '@/util/hooks';
 import Image from 'next/image';
 import styles from '../NavBar.module.css';
 import ThemeSwitcher from '../ThemeSwitcher/ThemeSwitcher';
 import Tooltip from './../Tooltip/Tooltip';
+
 const tooltipContent = (
   <>
     {/* <div>Friends</div> */}
-    <div>Sign out</div>
+    <div>
+      <form action={logout}>
+        <button>Sign out</button>
+      </form>
+    </div>
     <div className={styles.iconContainer}>
       <ThemeSwitcher />
     </div>