✨ Cleand authentication-code up

frontend/src/app.d.ts

@@ -3,3 +3,21 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
+/// <reference types="@sveltejs/kit" />
+
+// See https://kit.svelte.dev/docs/types#app
+// for information about these interfaces
+// and what to do when importing types
+declare namespace App {
+	interface Locals {
+		email: string | null;
+	}
+
+	// interface Platform {}
+	interface Session {
+		authenticated: boolean;
+		email: string | null;
+	}
+
+	// interface Stuff {}
+}

frontend/src/hooks.ts

@@ -5,56 +5,53 @@
  */
 
 import * as cookie from 'cookie';
-import Redis from 'ioredis';
-
-const redis = new Redis(process.env.REDIS_URL);
+import type { Handle, GetSession } from '@sveltejs/kit';
 
 /** @type {import('@sveltejs/kit').Handle} */
-export async function handle({ event, resolve }) {
+export const handle: Handle = async ({ event, resolve }) => {
 	const cookies = cookie.parse(event.request.headers.get('cookie') || '');
-	const regex_token = /^Bearer (.*)$/gm.exec(cookies.access_token);
-	if (regex_token === null) {
-		event.locals.token = null;
-	} else {
-		event.locals.token = regex_token[1];
-	}
-	event.locals.rememberme = cookies.rememberme_token;
-
-	return await resolve(event);
-}
-
-/** @type {import('@sveltejs/kit').GetSession} */
-export async function getSession(event) {
-	const redis_res = await redis.get(event.locals.token);
-	let user_email: string;
-	if (redis_res === null) {
-		const res = await fetch(`${process.env.API_URL}/api/v1/users/check`, {
+	const jwt = /^Bearer (.*)$/gm.exec(cookies.access_token);
+	const rememberme_token = cookies.rememberme_token;
+	if (rememberme_token) {
+		const res = await fetch(`${process.env.API_URL}/api/v1/users/auth/internal`, {
+			method: 'POST',
 			headers: {
-				Cookie: `access_token=Bearer ${event.locals.token}` // skipcq: JS-0378
-			}
+				'Content-Type': 'application/json'
+			},
+			body: JSON.stringify({
+				rememberme: rememberme_token,
+				jwt: jwt === null ? undefined : jwt[0]
+			})
 		});
-		if (res.ok) {
-			const json = await res.json();
-			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-			//@ts-ignore // skipcq: JS-0295
-			user_email = json.email;
+		let new_jwt;
+		if (jwt) {
+			new_jwt = jwt[0];
 		} else {
-			user_email = null;
+			new_jwt = cookie.parse(res.headers.get('set-cookie')).access_token;
 		}
+		event.locals.email = await (
+			await fetch(`${process.env.API_URL}/api/v1/users/auth/internal/email`, {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json'
+				},
+				body: JSON.stringify({
+					jwt: new_jwt
+				})
+			})
+		).text();
+		const resp = await resolve(event);
+		resp.headers.set('Set-Cookie', res.headers.get('set-cookie'));
+		return resp;
 	} else {
-		user_email = redis_res;
+		event.locals.email = null;
+		return resolve(event);
 	}
-	if (user_email === null) {
-		return {
-			authenticated: false,
-			token: event.locals.token,
-			email: null
-		};
-	} else {
-		return {
-			authenticated: true,
-			token: event.locals.token,
-			email: user_email
-		};
-	}
-}
+};
+
+export const getSession: GetSession = async (event) => {
+	return {
+		email: event.locals.email,
+		authenticated: Boolean(event.locals.email)
+	};
+};

frontend/src/lib/footer.svelte

@@ -9,7 +9,7 @@
 
 <footer class="text-center text-white border-black w-screen">
 	<div class="grid grid-cols-12 w-full pt-4 bg-gray-700 pb-2">
-		<p class="col-start-2 col-end-12 text-center w-full">
+		<p class="col-start-3 col-end-11 text-center w-full">
 			Made with ❤️ by
 			<a
 				href="https://mawoka.eu?utm_source=ClassQuiz&utm_medium=footer"
@@ -36,14 +36,16 @@
 				>More details are here.</a
 			>
 		</p>
-		<div class="flex flex-col items-center min-h-full h-full md:block hidden">
+		<div
+			class="flex flex-col items-center min-h-full h-full md:block hidden col-start-11 col-end-12"
+		>
 			<div class="my-auto mr-16">
 				<LanguageToggle />
 			</div>
 		</div>
 	</div>
 	<div class="md:hidden block">
-		<div class="self-end flex justify-center min-h-full h-full bg-gray-700 md:pb-2">
+		<div class="self-end flex justify-center min-h-full h-full bg-gray-700 pb-2 md:pb-0">
 			<div class="m-auto md:invisible visible">
 				<LanguageToggle />
 			</div>