From 8483ab9e84430d9cfd69b6aade6d1be53aa678e9 Mon Sep 17 00:00:00 2001
From: schreifuchs <kontakt@schreifuchs.ch>
Date: Fri, 3 Apr 2026 13:06:47 +0200
Subject: [PATCH 1/3] refactor: extend auth.js types globally (resolves #7)

---
 src/app.d.ts    | 11 +++++++++++
 src/lib/auth.ts | 12 ++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/app.d.ts b/src/app.d.ts
index da08e6d..3a28554 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -1,3 +1,5 @@
+import { DefaultSession } from '@auth/sveltekit';
+
 // See https://svelte.dev/docs/kit/types#app.d.ts
 // for information about these interfaces
 declare global {
@@ -10,4 +12,13 @@ declare global {
 	}
 }
 
+declare module '@auth/sveltekit' {
+	interface Session {
+		user: {
+			id: string;
+			email: string;
+		} & DefaultSession['user'];
+	}
+}
+
 export {};
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index ea7bbfe..95bd9af 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -1,4 +1,4 @@
-import type { Session, User } from '@auth/sveltekit';
+import type { Session } from '@auth/sveltekit';
 import { error } from '@sveltejs/kit';
 import { db } from './server/db';
 import { users } from './server/db/schema';
@@ -8,21 +8,17 @@ interface Event {
 		auth(): Promise<Session | null>;
 	};
 }
-interface UserWithId extends User {
-	id: string;
-	email: string;
-}
 
-export async function ensureAuth(event: Event): Promise<UserWithId> {
+export async function ensureAuth(event: Event): Promise<Session['user']> {
 	const session = await getSession(event);
 	if (!session) error(401, { message: 'Du muesch di zersch iiloge' });
 
-	const user = session?.user;
+	const user = session.user;
 	if (!user || !user.email || !user.id) {
 		error(401, { message: 'Du muesch di zersch iiloge' });
 	}
 
-	return { ...user, id: user.id, email: user.email }; // weird thingamajig so that ts compiler is happy
+	return user;
 }
 export async function getSession(event: Event) {
 	const session = await event.locals.auth();
-- 
2.52.0


From 641524218eb11dba4b2df0b4ce7a9b7688003f14 Mon Sep 17 00:00:00 2001
From: schreifuchs <kontakt@schreifuchs.ch>
Date: Fri, 3 Apr 2026 13:57:44 +0200
Subject: [PATCH 2/3] ci: fix docker hub rate limit with ecr mirror

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 81c131c..57bd87c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:25-trixie AS base
+FROM public.ecr.aws/docker/library/node:25-trixie AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 # RUN corepack enable
-- 
2.52.0


From 2c47870e0f6d3b94b3b82d3dae0a31b822dfca27 Mon Sep 17 00:00:00 2001
From: schreifuchs <kontakt@schreifuchs.ch>
Date: Fri, 3 Apr 2026 14:28:08 +0200
Subject: [PATCH 3/3] revert: Docker base image to original

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 57bd87c..81c131c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/docker/library/node:25-trixie AS base
+FROM node:25-trixie AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 # RUN corepack enable
-- 
2.52.0