From f1e363bbff5e4bae26b8a34560871d643f86ebbb Mon Sep 17 00:00:00 2001
From: Bereket Engida <bekacru@gmail.com>
Date: Thu, 29 Aug 2024 00:10:35 +0300
Subject: [PATCH] feat: remember me and many more imporves

---
 dev/next-app/prisma/db.sqlite                 | Bin 77824 -> 114688 bytes
 dev/next-app/src/app/(auth)/sign-in/page.tsx  |  28 ++++++-
 dev/next-app/src/app/layout.tsx               |  12 ++-
 dev/next-app/src/app/page.tsx                 |   2 +-
 dev/next-app/src/components/signout.tsx       |   4 +-
 dev/next-app/src/components/ui/sonner.tsx     |   2 +
 dev/next-app/src/components/user-card.tsx     |  49 ++++++++----
 dev/next-app/src/lib/types.ts                 |   5 ++
 dev/next-app/src/middleware.ts                |   4 +
 packages/better-auth/package.json             |   3 +-
 .../src/adapters/internal-adapter.ts          |  11 +--
 packages/better-auth/src/api/index.ts         |  72 +++++++++++++++--
 .../better-auth/src/api/middlewares/csrf.ts   |   6 +-
 .../better-auth/src/api/routes/callback.ts    |  15 ++--
 .../better-auth/src/api/routes/session.ts     |  10 ++-
 .../better-auth/src/api/routes/sign-in.ts     |  34 ++++----
 packages/better-auth/src/auth.ts              |  20 ++---
 packages/better-auth/src/client/base.ts       |   2 +-
 packages/better-auth/src/client/proxy.ts      |   1 +
 packages/better-auth/src/client/react.ts      |  14 +++-
 .../better-auth/src/client/session-atom.ts    |  60 +-------------
 packages/better-auth/src/init.ts              |   7 +-
 .../src/plugins/organization/call.ts          |   1 -
 .../src/plugins/organization/organization.ts  |  47 +++++++++--
 .../src/plugins/remeber-me/index.ts           |   0
 .../src/plugins/remeber-me/remeber-me.ts      |   5 --
 packages/better-auth/src/types/context.ts     |  13 ++++
 packages/better-auth/src/types/index.ts       |   1 +
 packages/better-auth/src/types/models.ts      |  73 ++++++++++++++++++
 packages/better-auth/src/types/options.ts     |   4 +-
 packages/better-auth/src/types/plugins.ts     |  27 ++++++-
 packages/better-auth/src/utils/base-url.ts    |  15 +++-
 packages/better-auth/tsup.config.ts           |   1 +
 pnpm-lock.yaml                                |  28 +++----
 todo.md                                       |   2 +-
 tsconfig.json                                 |   1 +
 36 files changed, 401 insertions(+), 178 deletions(-)
 create mode 100644 dev/next-app/src/lib/types.ts
 delete mode 100644 packages/better-auth/src/plugins/remeber-me/index.ts
 delete mode 100644 packages/better-auth/src/plugins/remeber-me/remeber-me.ts
 create mode 100644 packages/better-auth/src/types/context.ts
 create mode 100644 packages/better-auth/src/types/models.ts

diff --git a/dev/next-app/prisma/db.sqlite b/dev/next-app/prisma/db.sqlite
index 73da89710c8722c5a8dc3248d42fc4d1f45f245a..13829ea95d14ecc0f7c72960e8096abb5abf6911 100644
GIT binary patch
literal 114688
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

delta 903
zcmZo@U~hQ9GC_)sL4$#TL3pBq9TS7b#so=e4r4=019MYLgUOB3v5E%fR;CtK#wL1Z
z2F6j1S{y7*nzn}KMkW?;RR?q$CpXA&D<G*fiVA0EX=FxIxLU?i9!Zg5R0tb$J(`*+
zx;m5fWswXswX}@NV`XVHL{k_g8-Q?|sik>TBR306V>X(q)3Uh;cbQt6M%6L1GzOw6
zTA&v?d956ZoyJkwOe~GsXbNx0`6AnC7}e;_$kK#vXPo{baU%mG6I}xfT_cMSxQ|UO
z%s2m+59UD*-=N8BbdUrN==30DSIg)LvD-4&Gol9f6kT(KnkZRUVb&6$ztI$F>*XR8
zEznCqa5(h+;GE5I`pXp982J}5@GsgdXfT7HJ%*86TTxPR^6Ge9Z9RkZjQserh|(gn
zWEXSGfNYC=SHGw#zapoyaL002kHF$cCxb#uH;*c=&5Q<b_+^EdwK>x>OEOB6tSrn7
z%#95!jCp}ci;>@&f!`Wvz9GLuqZ1>CudQ%nxgtYIs#{@5NmW6rr<Y5xt4CNsg?oWZ
zc(}1+m`h$|L4Fx>5L#Fnnpqi|>X}SeOl3@CG@oo(AtC~^L(hN<Y|9-6{yRWhF7fLr
zGy8H9G9KcxR0jT3pq^-c^+pLsZbeOf&Qe=jplJxRol=WZvr|hHT=UX1Qxcsf_ssX#
x2Sur+m9d$gp|MF6vOAH*A&&aQ!2fBp;D#6ce7wwxoCsq#ZD2{*%(CH+JOK2>;oSfL

diff --git a/dev/next-app/src/app/(auth)/sign-in/page.tsx b/dev/next-app/src/app/(auth)/sign-in/page.tsx
index 3ce9bef9..6be4faf1 100644
--- a/dev/next-app/src/app/(auth)/sign-in/page.tsx
+++ b/dev/next-app/src/app/(auth)/sign-in/page.tsx
@@ -15,15 +15,20 @@ import { authClient } from "@/lib/auth-client";
 import { useState } from "react";
 import { Key } from "lucide-react";
 import { PasswordInput } from "@/components/ui/password-input";
+import { Checkbox } from "@/components/ui/checkbox";
+import { toast } from "sonner";
+import { useRouter } from "next/navigation";
 
 export default function Page() {
 	const [email, setEmail] = useState("");
 	const [password, setPassword] = useState("");
+	const [rememberMe, setRememberMe] = useState(false);
+	const router = useRouter()
 	return (
 		<div className="h-[50rem] w-full dark:bg-black bg-white  dark:bg-grid-white/[0.2] bg-grid-black/[0.2] relative flex items-center justify-center">
 			{/* Radial gradient for the container to give a faded look */}
 			<div className="absolute pointer-events-none inset-0 flex items-center justify-center dark:bg-black bg-white [mask-image:radial-gradient(ellipse_at_center,transparent_20%,black)]"></div>
-			<Card className="mx-auto max-w-sm">
+			<Card className="mx-auto max-w-sm z-50">
 				<CardHeader>
 					<CardTitle className="text-2xl">Login</CardTitle>
 					<CardDescription>
@@ -63,12 +68,22 @@ export default function Page() {
 								placeholder="Password"
 							/>
 						</div>
+						<div className="flex items-center gap-2">
+							<Checkbox onClick={() => {
+								setRememberMe(!rememberMe)
+							}} />
+							<Label>Remember me</Label>
+						</div>
 						<Button type="submit" className="w-full" onClick={async () => {
-							await authClient.signIn.credential({
+							const res = await authClient.signIn.credential({
 								email,
 								password,
-								callbackURL: "/"
+								callbackURL: "/",
+								dontRememberMe: !rememberMe
 							})
+							if (res.error) {
+								toast.error(res.error.message)
+							}
 						}}>
 							Login
 						</Button>
@@ -85,9 +100,14 @@ export default function Page() {
 							Login with Github
 						</Button>
 						<Button variant="secondary" className="gap-2" onClick={async () => {
-							await authClient.passkey.signIn({
+							const res = await authClient.passkey.signIn({
 								callbackURL: "/"
 							})
+							if (res?.error) {
+								toast.error(res.error.message)
+							} else {
+								router.push("/")
+							}
 						}}>
 							<Key size={16} />
 							Login with Passkey
diff --git a/dev/next-app/src/app/layout.tsx b/dev/next-app/src/app/layout.tsx
index 16682eca..87b05d5b 100644
--- a/dev/next-app/src/app/layout.tsx
+++ b/dev/next-app/src/app/layout.tsx
@@ -2,6 +2,7 @@ import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import "./globals.css";
 import { ThemeWrapper } from "@/components/theme-provider";
+import { Toaster } from "@/components/ui/sonner";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -16,10 +17,13 @@ export default function RootLayout({
 	children: React.ReactNode;
 }>) {
 	return (
-		<html lang="en">
-			<ThemeWrapper forcedTheme="dark" attribute="class">
-				<body className={inter.className}>{children}</body>
-			</ThemeWrapper>
+		<html lang="en" suppressHydrationWarning>
+			<body className={inter.className}>
+				<ThemeWrapper forcedTheme="dark" attribute="class">
+					{children}
+				</ThemeWrapper>
+				<Toaster />
+			</body>
 		</html>
 	);
 }
diff --git a/dev/next-app/src/app/page.tsx b/dev/next-app/src/app/page.tsx
index 1d7cefbf..cb11870b 100644
--- a/dev/next-app/src/app/page.tsx
+++ b/dev/next-app/src/app/page.tsx
@@ -11,7 +11,7 @@ export default async function TypewriterEffectSmoothDemo() {
 			{/* Radial gradient for the container to give a faded look */}
 			<div className="absolute pointer-events-none inset-0 flex items-center justify-center dark:bg-black bg-white [mask-image:radial-gradient(ellipse_at_center,transparent_20%,black)]"></div>
 			{
-				session ? <UserCard user={session.user} /> : null
+				session ? <UserCard session={session} /> : null
 			}
 		</div>
 
diff --git a/dev/next-app/src/components/signout.tsx b/dev/next-app/src/components/signout.tsx
index 9c5a576f..ddea3eb2 100644
--- a/dev/next-app/src/components/signout.tsx
+++ b/dev/next-app/src/components/signout.tsx
@@ -8,9 +8,7 @@ export const SignOut = () => {
 		<Button
 			onClick={async () => {
 				await authClient.signOut({
-					body: {
-						callbackURL: "/"
-					}
+
 				})
 			}}
 		>
diff --git a/dev/next-app/src/components/ui/sonner.tsx b/dev/next-app/src/components/ui/sonner.tsx
index c5ba1bfe..51b7ab15 100644
--- a/dev/next-app/src/components/ui/sonner.tsx
+++ b/dev/next-app/src/components/ui/sonner.tsx
@@ -12,6 +12,8 @@ const Toaster = ({ ...props }: ToasterProps) => {
 		<Sonner
 			theme={theme as ToasterProps["theme"]}
 			className="toaster group"
+			richColors
+			closeButton
 			toastOptions={{
 				classNames: {
 					toast:
diff --git a/dev/next-app/src/components/user-card.tsx b/dev/next-app/src/components/user-card.tsx
index 38f3cd9d..7b220033 100644
--- a/dev/next-app/src/components/user-card.tsx
+++ b/dev/next-app/src/components/user-card.tsx
@@ -3,21 +3,21 @@
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";
 import { Button } from "./ui/button";
-import { LogOut } from "lucide-react";
+import { Check, LogOut } from "lucide-react";
 import { authClient } from "@/lib/auth-client";
 import { useRouter } from "next/navigation";
 import AddPasskey from "./add-passkey";
+import { Session, User } from "@/lib/types";
+import { toast } from "sonner";
 
-export default function UserCard({
-    user,
-}: {
-    user: {
-        name: string;
-        email: string;
-        image?: string;
-    };
+export default function UserCard(props: {
+    session: {
+        user: User;
+        session: Session
+    } | null
 }) {
     const router = useRouter();
+    const session = authClient.useSession(props.session)
     return (
         <Card>
             <CardHeader>
@@ -26,23 +26,42 @@ export default function UserCard({
             <CardContent className="grid gap-8">
                 <div className="flex items-center gap-4">
                     <Avatar className="hidden h-9 w-9 sm:flex">
-                        <AvatarImage src={user.image || "#"} alt="Avatar" />
-                        <AvatarFallback>{user.name.charAt(0)}</AvatarFallback>
+                        <AvatarImage src={session?.user.image || "#"} alt="Avatar" />
+                        <AvatarFallback>{session?.user.name.charAt(0)}</AvatarFallback>
                     </Avatar>
                     <div className="grid gap-1">
-                        <p className="text-sm font-medium leading-none">{user.name}</p>
-                        <p className="text-sm text-muted-foreground">{user.email}</p>
+                        <p className="text-sm font-medium leading-none">{session?.user.name}</p>
+                        <p className="text-sm text-muted-foreground">{session?.user.email}</p>
                     </div>
                 </div>
-                <div className="border-y py-4 flex items-center justify-between">
+                <div className="border-y py-4 flex items-center justify-between gap-2">
                     <AddPasskey />
+                    {
+                        session?.user.twoFactorEnabled ? <Button variant="secondary" className="gap-2" onClick={async () => {
+                            const res = await authClient.twoFactor.disable()
+                            if (res.error) {
+                                toast.error(res.error.message)
+                            }
+                        }}>
+                            Disable 2FA
+                        </Button> : <Button variant="outline" className="gap-2" onClick={async () => {
+                            const res = await authClient.twoFactor.enable()
+                            if (res.error) {
+                                toast.error(res.error.message)
+                            }
+                        }}>
+                            <p>
+                                Enable 2FA
+                            </p>
+                        </Button>
+                    }
                 </div>
             </CardContent>
             <CardFooter>
                 <Button className="gap-2 z-10" variant="secondary">
                     <LogOut size={16} />
                     <span className="text-sm" onClick={async () => {
-                        const res = await authClient.signOut()
+                        await authClient.signOut()
                         router.refresh()
                     }}>
                         Sign Out
diff --git a/dev/next-app/src/lib/types.ts b/dev/next-app/src/lib/types.ts
new file mode 100644
index 00000000..53f7214f
--- /dev/null
+++ b/dev/next-app/src/lib/types.ts
@@ -0,0 +1,5 @@
+import { InferSession, InferUser } from "better-auth/types";
+import type { auth } from "./auth";
+
+export type User = InferUser<typeof auth>;
+export type Session = InferSession<typeof auth>;
diff --git a/dev/next-app/src/middleware.ts b/dev/next-app/src/middleware.ts
index fe6157b9..b6a3e721 100644
--- a/dev/next-app/src/middleware.ts
+++ b/dev/next-app/src/middleware.ts
@@ -15,7 +15,11 @@ export async function middleware(request: NextRequest) {
 		permission: {
 			invitation: ["create"],
 		},
+		options: {
+			headers: request.headers,
+		},
 	});
+	console.log({ canInvite });
 	return NextResponse.next();
 }
 
diff --git a/packages/better-auth/package.json b/packages/better-auth/package.json
index 1660ae3f..6d1ff4a8 100644
--- a/packages/better-auth/package.json
+++ b/packages/better-auth/package.json
@@ -15,6 +15,7 @@
         ".": "./dist/index.js",
         "./provider": "./dist/provider.js",
         "./client": "./dist/client.js",
+        "./types": "./dist/types.js",
         "./cli": "./dist/cli.js",
         "./react": "./dist/react.js",
         "./preact": "./dist/preact.js",
@@ -52,7 +53,7 @@
         "@simplewebauthn/browser": "^10.0.0",
         "@simplewebauthn/server": "^10.0.1",
         "arctic": "^1.9.2",
-        "better-call": "^0.1.33",
+        "better-call": "^0.1.36",
         "chalk": "^5.3.0",
         "commander": "^12.1.0",
         "consola": "^3.2.3",
diff --git a/packages/better-auth/src/adapters/internal-adapter.ts b/packages/better-auth/src/adapters/internal-adapter.ts
index 5cece90c..979cdd46 100644
--- a/packages/better-auth/src/adapters/internal-adapter.ts
+++ b/packages/better-auth/src/adapters/internal-adapter.ts
@@ -93,16 +93,11 @@ export const createInternalAdapter = (
 				session.expiresAt.valueOf() - maxAge.valueOf() + updateDate <=
 				Date.now();
 			if (shouldBeUpdated) {
-				const updatedSession = await adapter.update<Session>({
+				const updatedSession = await adapter.create<Session>({
 					model: tables.session.tableName,
-					where: [
-						{
-							field: "id",
-							value: session.id,
-						},
-					],
-					update: {
+					data: {
 						...session,
+						id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
 						expiresAt: new Date(Date.now() + sessionExpiration),
 					},
 				});
diff --git a/packages/better-auth/src/api/index.ts b/packages/better-auth/src/api/index.ts
index a28a58dc..7fb9f7ab 100644
--- a/packages/better-auth/src/api/index.ts
+++ b/packages/better-auth/src/api/index.ts
@@ -1,22 +1,27 @@
-import { createRouter, Endpoint } from "better-call";
+import { Context, createRouter, Endpoint } from "better-call";
 import {
 	signInOAuth,
 	callbackOAuth,
-	getSession,
 	signOut,
 	signInCredential,
 	forgetPassword,
 	resetPassword,
 	verifyEmail,
 	sendVerificationEmail,
+	getSession,
 } from "./routes";
 import { AuthContext } from "../init";
 import { csrfMiddleware } from "./middlewares/csrf";
 import { getCSRFToken } from "./routes/csrf";
 import { signUpCredential } from "./routes/sign-up";
 import { parseAccount, parseSession, parseUser } from "../adapters/schema";
+import { BetterAuthOptions, InferSession, InferUser } from "../types";
+import { Prettify } from "../types/helper";
 
-export const router = <C extends AuthContext>(ctx: C) => {
+export const router = <C extends AuthContext, Option extends BetterAuthOptions>(
+	ctx: C,
+	option: Option,
+) => {
 	const pluginEndpoints = ctx.options.plugins?.reduce(
 		(acc, plugin) => {
 			return {
@@ -65,11 +70,30 @@ export const router = <C extends AuthContext>(ctx: C) => {
 			.filter((plugin) => plugin !== undefined)
 			.flat() || [];
 
+	async function typedSession(
+		ctx: Context<
+			"/session",
+			{
+				method: "GET";
+				requireHeaders: true;
+			}
+		>,
+	) {
+		const handler = await getSession(ctx);
+		return handler as {
+			session: Prettify<InferSession<Option>>;
+			user: Prettify<InferUser<Option>>;
+		} | null;
+	}
+	typedSession.path = getSession.path;
+	typedSession.method = getSession.method;
+	typedSession.options = getSession.options;
+	typedSession.headers = getSession.headers;
 	const baseEndpoints = {
 		signInOAuth,
 		callbackOAuth,
 		getCSRFToken,
-		getSession,
+		getSession: typedSession,
 		signOut,
 		signUpCredential,
 		signInCredential,
@@ -85,15 +109,49 @@ export const router = <C extends AuthContext>(ctx: C) => {
 	};
 	let api: Record<string, any> = {};
 	for (const [key, value] of Object.entries(endpoints)) {
-		api[key] = (context: any) => {
+		api[key] = async (context: any) => {
+			for (const plugin of ctx.options.plugins || []) {
+				if (plugin.hooks?.before) {
+					for (const hook of plugin.hooks.before) {
+						const match = hook.matcher(context);
+						if (match) {
+							const hookRes = await hook.handler(context);
+							if (hookRes && "context" in hookRes) {
+								context = {
+									...context,
+									...hookRes.context,
+								};
+							}
+						}
+					}
+				}
+			}
 			//@ts-ignore
-			return value({
+			const endpointRes = value({
 				...context,
 				context: {
 					...ctx,
 					...context.context,
 				},
 			});
+			let response = endpointRes;
+			for (const plugin of ctx.options.plugins || []) {
+				if (plugin.hooks?.after) {
+					for (const hook of plugin.hooks.after) {
+						const match = hook.matcher(context);
+						if (match) {
+							const hookRes = await hook.handler({
+								...context,
+								returned: endpointRes,
+							});
+							if (hookRes && "response" in hookRes) {
+								response = hookRes.response as any;
+							}
+						}
+					}
+				}
+			}
+			return response;
 		};
 		api[key].path = value.path;
 		api[key].method = value.method;
@@ -134,7 +192,7 @@ export const router = <C extends AuthContext>(ctx: C) => {
 			});
 		},
 		onError(e) {
-			console.log(e);
+			// console.log(e);
 		},
 	});
 };
diff --git a/packages/better-auth/src/api/middlewares/csrf.ts b/packages/better-auth/src/api/middlewares/csrf.ts
index 20676f98..b5e73225 100644
--- a/packages/better-auth/src/api/middlewares/csrf.ts
+++ b/packages/better-auth/src/api/middlewares/csrf.ts
@@ -19,16 +19,14 @@ export const csrfMiddleware = createAuthMiddleware(
 			return;
 		}
 		const url = new URL(ctx.request.url);
-		console.log({
-			url: ctx.request.url,
-		});
+		console.log(url.origin, ctx.context.options.baseURL);
 		/**
 		 * If origin is the same as baseURL or if the
 		 * origin is in the trustedOrigins then we
 		 * don't need to check the CSRF token.
 		 */
 		if (
-			url.origin === ctx.context.baseURL ||
+			url.origin === ctx.context.options.baseURL ||
 			ctx.context.options.trustedOrigins?.includes(url.origin)
 		) {
 			return;
diff --git a/packages/better-auth/src/api/routes/callback.ts b/packages/better-auth/src/api/routes/callback.ts
index 5cbfe19b..b1c0bb46 100644
--- a/packages/better-auth/src/api/routes/callback.ts
+++ b/packages/better-auth/src/api/routes/callback.ts
@@ -4,6 +4,7 @@ import { APIError } from "better-call";
 import { parseState } from "../../utils/state";
 import { userSchema } from "../../adapters/schema";
 import { HIDE_ON_CLIENT_METADATA } from "../../client/client-utils";
+import { generateId } from "../../utils/id";
 
 export const callbackOAuth = createAuthEndpoint(
 	"/callback/:id",
@@ -36,11 +37,11 @@ export const callbackOAuth = createAuthEndpoint(
 			c.context.logger.error("Code verification failed");
 			throw new APIError("UNAUTHORIZED");
 		}
-
 		const user = await provider.userInfo.getUserInfo(tokens);
+		const id = generateId();
 		const data = userSchema.safeParse({
 			...user,
-			id: user?.id.toString(),
+			id,
 		});
 		if (!user || data.success === false) {
 			throw new APIError("BAD_REQUEST");
@@ -52,7 +53,7 @@ export const callbackOAuth = createAuthEndpoint(
 		}
 		//find user in db
 		const dbUser = await c.context.internalAdapter.findUserByEmail(user.email);
-		let userId = dbUser?.user.id;
+		const userId = dbUser?.user.id;
 		if (dbUser) {
 			//check if user has already linked this provider
 			const hasBeenLinked = dbUser.accounts.find(
@@ -76,14 +77,13 @@ export const callbackOAuth = createAuthEndpoint(
 			}
 		} else {
 			try {
-				await c.context.internalAdapter.createOAuthUser(user, {
+				await c.context.internalAdapter.createOAuthUser(data.data, {
 					...tokens,
 					id: `${provider.id}:${user.id}`,
 					providerId: provider.id,
 					accountId: user.id,
-					userId: user.id,
+					userId: id,
 				});
-				userId = user.id;
 			} catch (e) {
 				const url = new URL(currentURL || callbackURL);
 				url.searchParams.set("error", "unable_to_create_user");
@@ -93,10 +93,9 @@ export const callbackOAuth = createAuthEndpoint(
 		}
 		//this should never happen
 		if (!userId) throw new APIError("INTERNAL_SERVER_ERROR");
-
 		//create session
 		const session = await c.context.internalAdapter.createSession(
-			userId,
+			userId || id,
 			c.request,
 		);
 		try {
diff --git a/packages/better-auth/src/api/routes/session.ts b/packages/better-auth/src/api/routes/session.ts
index 6836eb6f..d4058d25 100644
--- a/packages/better-auth/src/api/routes/session.ts
+++ b/packages/better-auth/src/api/routes/session.ts
@@ -1,6 +1,5 @@
 import { Context } from "better-call";
 import { createAuthEndpoint } from "../call";
-import { HIDE_ON_CLIENT_METADATA } from "../../client/client-utils";
 
 export const getSession = createAuthEndpoint(
 	"/session",
@@ -31,6 +30,15 @@ export const getSession = createAuthEndpoint(
 		const updatedSession = await ctx.context.internalAdapter.updateSession(
 			session.session,
 		);
+		await ctx.setSignedCookie(
+			ctx.context.authCookies.sessionToken.name,
+			updatedSession.id,
+			ctx.context.secret,
+			{
+				...ctx.context.authCookies.sessionToken.options,
+				maxAge: updatedSession.expiresAt.valueOf() - Date.now(),
+			},
+		);
 		return ctx.json({
 			session: updatedSession,
 			user: session.user,
diff --git a/packages/better-auth/src/api/routes/sign-in.ts b/packages/better-auth/src/api/routes/sign-in.ts
index 971c783c..802859a9 100644
--- a/packages/better-auth/src/api/routes/sign-in.ts
+++ b/packages/better-auth/src/api/routes/sign-in.ts
@@ -87,16 +87,18 @@ export const signInCredential = createAuthEndpoint(
 			email: z.string().email(),
 			password: z.string(),
 			callbackURL: z.string().optional(),
+			/**
+			 * If this is true the session will only be valid for the current browser session
+			 * @default false
+			 */
+			dontRememberMe: z.boolean().default(false).optional(),
 		}),
 	},
 	async (ctx) => {
 		if (!ctx.context.options?.emailAndPassword?.enabled) {
 			ctx.context.logger.error("Email and password is not enabled");
-			return ctx.json(null, {
-				body: {
-					message: "Email and password is not enabled",
-				},
-				status: 400,
+			throw new APIError("BAD_REQUEST", {
+				message: "Email and password is not enabled",
 			});
 		}
 		const currentSession = await getSessionFromCtx(ctx);
@@ -114,8 +116,8 @@ export const signInCredential = createAuthEndpoint(
 		const user = await ctx.context.internalAdapter.findUserByEmail(email);
 		if (!user) {
 			ctx.context.logger.error("User not found", { email });
-			return ctx.json(null, {
-				status: 401,
+			throw new APIError("UNAUTHORIZED", {
+				message: "Invalid email or password",
 			});
 		}
 		const credentialAccount = user.accounts.find(
@@ -124,20 +126,17 @@ export const signInCredential = createAuthEndpoint(
 		const currentPassword = credentialAccount?.password;
 		if (!currentPassword) {
 			ctx.context.logger.error("Password not found", { email });
-			return ctx.json(null, {
-				status: 401,
-				body: { message: "Unexpected error" },
+			throw new APIError("UNAUTHORIZED", {
+				message: "Unexpected error",
 			});
 		}
 		const validPassword = await argon2id.verify(currentPassword, password);
 		if (!validPassword) {
 			ctx.context.logger.error("Invalid password");
-			return ctx.json(null, {
-				status: 401,
-				body: { message: "Invalid email or password" },
+			throw new APIError("UNAUTHORIZED", {
+				message: "Invalid email or password",
 			});
 		}
-
 		const session = await ctx.context.internalAdapter.createSession(
 			user.user.id,
 			ctx.request,
@@ -146,7 +145,12 @@ export const signInCredential = createAuthEndpoint(
 			ctx.context.authCookies.sessionToken.name,
 			session.id,
 			ctx.context.secret,
-			ctx.context.authCookies.sessionToken.options,
+			ctx.body.dontRememberMe
+				? {
+						...ctx.context.authCookies.sessionToken.options,
+						maxAge: undefined,
+					}
+				: ctx.context.authCookies.sessionToken.options,
 		);
 		return ctx.json({
 			user: user.user,
diff --git a/packages/better-auth/src/auth.ts b/packages/better-auth/src/auth.ts
index 29f44263..b62adc43 100644
--- a/packages/better-auth/src/auth.ts
+++ b/packages/better-auth/src/auth.ts
@@ -1,7 +1,7 @@
 import { router } from "./api";
 import type { BetterAuthOptions } from "./types/options";
 import type { UnionToIntersection } from "type-fest";
-import type { Plugin } from "./types/plugins";
+import type { BetterAuthPlugin } from "./types/plugins";
 import { init } from "./init";
 import type { CustomProvider } from "./providers";
 
@@ -9,20 +9,20 @@ export const betterAuth = <O extends BetterAuthOptions>(options: O) => {
 	const authContext = init(options);
 	type PluginEndpoint = UnionToIntersection<
 		O["plugins"] extends Array<infer T>
-			? T extends Plugin
+			? T extends BetterAuthPlugin
 				? T["endpoints"]
-				: Record<string, never>
-			: Record<string, never>
+				: {}
+			: {}
 	>;
 
 	type ProviderEndpoint = UnionToIntersection<
 		O["providers"] extends Array<infer T>
 			? T extends CustomProvider
 				? T["endpoints"]
-				: Record<string, never>
-			: Record<string, never>
+				: {}
+			: {}
 	>;
-	const { handler, endpoints } = router(authContext);
+	const { handler, endpoints } = router(authContext, options);
 	type Endpoint = typeof endpoints;
 	return {
 		handler,
@@ -31,11 +31,7 @@ export const betterAuth = <O extends BetterAuthOptions>(options: O) => {
 	};
 };
 
-export type BetterAuth<
-	Endpoints extends Record<string, any> = ReturnType<
-		typeof router
-	>["endpoints"],
-> = {
+export type BetterAuth<Endpoints extends Record<string, any> = {}> = {
 	handler: (request: Request) => Promise<Response>;
 	api: Endpoints;
 	options: BetterAuthOptions;
diff --git a/packages/better-auth/src/client/base.ts b/packages/better-auth/src/client/base.ts
index 42b2e0f9..857db643 100644
--- a/packages/better-auth/src/client/base.ts
+++ b/packages/better-auth/src/client/base.ts
@@ -19,7 +19,7 @@ export const createVanillaClient = <Auth extends BetterAuth = never>(
 		: BAuth["api"];
 	const $fetch = createFetch({
 		...options,
-		baseURL: getBaseURL(options?.baseURL),
+		baseURL: getBaseURL(options?.baseURL).withPath,
 		plugins: [redirectPlugin, addCurrentURL, csrfPlugin],
 	});
 	const { $session, $sessionSignal } = getSessionAtom<Auth>($fetch);
diff --git a/packages/better-auth/src/client/proxy.ts b/packages/better-auth/src/client/proxy.ts
index a79d4960..e175cb5a 100644
--- a/packages/better-auth/src/client/proxy.ts
+++ b/packages/better-auth/src/client/proxy.ts
@@ -64,6 +64,7 @@ export function createDynamicPathProxy<T extends Record<string, any>>(
 						method,
 						onSuccess() {
 							const signal = $signal?.[routePath as string];
+							console.log({ routePath, signal });
 							if (signal) {
 								signal.set(!signal.get());
 							}
diff --git a/packages/better-auth/src/client/react.ts b/packages/better-auth/src/client/react.ts
index 18a96f90..40ec0f26 100644
--- a/packages/better-auth/src/client/react.ts
+++ b/packages/better-auth/src/client/react.ts
@@ -2,13 +2,23 @@ import { useStore } from "@nanostores/react";
 import { createVanillaClient } from "./base";
 import { BetterFetchOption } from "@better-fetch/fetch";
 import { BetterAuth } from "../auth";
+import { InferSession, InferUser } from "../types";
 
 export const createAuthClient = <Auth extends BetterAuth>(
 	options?: BetterFetchOption,
 ) => {
 	const client = createVanillaClient<Auth>(options);
-	function useSession() {
-		return useStore(client.$atoms.$session);
+	function useSession(
+		initialValue: {
+			user: InferUser<Auth>;
+			session: InferSession<Auth>;
+		} | null = null,
+	) {
+		const session = useStore(client.$atoms.$session);
+		if (session) {
+			return session;
+		}
+		return initialValue;
 	}
 	function useActiveOrganization() {
 		return useStore(client.$atoms.$activeOrganization);
diff --git a/packages/better-auth/src/client/session-atom.ts b/packages/better-auth/src/client/session-atom.ts
index 3a9a27e5..92fe4f2e 100644
--- a/packages/better-auth/src/client/session-atom.ts
+++ b/packages/better-auth/src/client/session-atom.ts
@@ -1,64 +1,12 @@
 import { atom, computed, task } from "nanostores";
-import { Session, User } from "../adapters/schema";
-import { Prettify, UnionToIntersection } from "../types/helper";
+import { Prettify } from "../types/helper";
 import { BetterAuth } from "../auth";
-import { FieldAttribute, InferFieldOutput } from "../db";
 import { BetterFetch } from "@better-fetch/fetch";
+import { InferSession, InferUser } from "../types/models";
 
 export function getSessionAtom<Auth extends BetterAuth>(client: BetterFetch) {
-	type AdditionalSessionFields = Auth["options"]["plugins"] extends Array<
-		infer T
-	>
-		? T extends {
-				schema: {
-					session: {
-						fields: infer Field;
-					};
-				};
-			}
-			? Field extends Record<string, FieldAttribute>
-				? {
-						[key in keyof Field]: InferFieldOutput<Field[key]>;
-					}
-				: {}
-			: {}
-		: {};
-	type AdditionalUserFields = Auth["options"]["plugins"] extends Array<infer T>
-		? T extends {
-				schema: {
-					user: {
-						fields: infer Field;
-					};
-				};
-			}
-			? Field extends Record<infer Key, FieldAttribute>
-				? Prettify<
-						{
-							[key in Key as Field[key]["required"] extends false
-								? never
-								: Field[key]["defaultValue"] extends
-											| boolean
-											| string
-											| number
-											| Date
-											| Function
-									? key
-									: never]: InferFieldOutput<Field[key]>;
-						} & {
-							[key in Key as Field[key]["returned"] extends false
-								? never
-								: key]?: InferFieldOutput<Field[key]>;
-						}
-					>
-				: {}
-			: {}
-		: {};
-
-	type UserWithAdditionalFields = User &
-		UnionToIntersection<AdditionalUserFields>;
-	type SessionWithAdditionalFields = Session &
-		UnionToIntersection<AdditionalSessionFields>;
-
+	type UserWithAdditionalFields = InferUser<Auth["options"]>;
+	type SessionWithAdditionalFields = InferSession<Auth["options"]>;
 	const $signal = atom<boolean>(false);
 	const $session = computed($signal, () =>
 		task(async () => {
diff --git a/packages/better-auth/src/init.ts b/packages/better-auth/src/init.ts
index 28f18878..d3d9eb1f 100644
--- a/packages/better-auth/src/init.ts
+++ b/packages/better-auth/src/init.ts
@@ -1,3 +1,4 @@
+import { Context, ContextTools } from "better-call";
 import { createKyselyAdapter } from "./adapters/kysely";
 import { getAdapter } from "./adapters/utils";
 import { createInternalAdapter } from "./db";
@@ -13,13 +14,13 @@ import { createLogger } from "./utils/logger";
 export const init = (options: BetterAuthOptions) => {
 	const adapter = getAdapter(options);
 	const db = createKyselyAdapter(options);
-	const baseURL = getBaseURL(options.baseURL, options.basePath);
+	const { baseURL, withPath } = getBaseURL(options.baseURL, options.basePath);
 	return {
 		options: {
 			...options,
-			baseURL,
+			baseURL: baseURL,
 		},
-		baseURL,
+		baseURL: withPath,
 		secret:
 			options.secret ||
 			process.env.BETTER_AUTH_SECRET ||
diff --git a/packages/better-auth/src/plugins/organization/call.ts b/packages/better-auth/src/plugins/organization/call.ts
index ac000dde..38b64c23 100644
--- a/packages/better-auth/src/plugins/organization/call.ts
+++ b/packages/better-auth/src/plugins/organization/call.ts
@@ -3,7 +3,6 @@ import { createAuthMiddleware, optionsMiddleware } from "../../api/call";
 import { OrganizationOptions } from "./organization";
 import { defaultRoles, Role } from "./access";
 import { Session, User } from "../../adapters/schema";
-import { getSession } from "../../api/routes";
 import { sessionMiddleware } from "../../api/middlewares/session";
 
 export const orgMiddleware = createAuthMiddleware(async (ctx) => {
diff --git a/packages/better-auth/src/plugins/organization/organization.ts b/packages/better-auth/src/plugins/organization/organization.ts
index 33554038..49774a46 100644
--- a/packages/better-auth/src/plugins/organization/organization.ts
+++ b/packages/better-auth/src/plugins/organization/organization.ts
@@ -9,7 +9,7 @@ import {
 	updateOrganization,
 } from "./routes/crud-org";
 import { AccessControl, defaultRoles, defaultStatements, Role } from "./access";
-import { getSession } from "../../api/routes";
+import { getSessionFromCtx } from "../../api/routes";
 import { AuthContext } from "../../init";
 import {
 	acceptInvitation,
@@ -18,6 +18,10 @@ import {
 	rejectInvitation,
 } from "./routes/crud-invites";
 import { deleteMember, updateMember } from "./routes/crud-members";
+import { sessionMiddleware } from "../../api/middlewares/session";
+import { orgMiddleware, orgSessionMiddleware } from "./call";
+import { getOrgAdapter } from "./adapter";
+import { APIError } from "better-call";
 
 export interface OrganizationOptions {
 	/**
@@ -94,7 +98,7 @@ export const organization = <O extends OrganizationOptions>(options?: O) => {
 		roles,
 		getSession: async (context: AuthContext) => {
 			//@ts-expect-error
-			return await getSession(context);
+			return await getSessionFromCtx(context);
 		},
 	});
 
@@ -112,6 +116,7 @@ export const organization = <O extends OrganizationOptions>(options?: O) => {
 				"/org/has-permission",
 				{
 					method: "POST",
+					requireHeaders: true,
 					body: z.object({
 						permission: z.record(z.string(), z.array(z.string())),
 					}) as unknown as ZodObject<{
@@ -122,10 +127,42 @@ export const organization = <O extends OrganizationOptions>(options?: O) => {
 							>;
 						}>;
 					}>,
+					use: [orgSessionMiddleware],
 				},
-				async () => {
-					const hasPerm = true;
-					return hasPerm;
+				async (ctx) => {
+					if (!ctx.context.session.session.activeOrganizationId) {
+						throw new APIError("BAD_REQUEST", {
+							message: "No active organization",
+						});
+					}
+					const adapter = getOrgAdapter(ctx.context.adapter);
+					const member = await adapter.findMemberByOrgId({
+						userId: ctx.context.session.user.id,
+						organizationId:
+							ctx.context.session.session.activeOrganizationId || "",
+					});
+					if (!member) {
+						throw new APIError("UNAUTHORIZED", {
+							message: "You are not a member of this organization",
+						});
+					}
+					const role = roles[member.role];
+					const result = role.authorize(ctx.body.permission as any);
+					if (result.error) {
+						return ctx.json(
+							{
+								error: result.error,
+								success: false,
+							},
+							{
+								status: 403,
+							},
+						);
+					}
+					return ctx.json({
+						error: null,
+						success: true,
+					});
 				},
 			),
 		},
diff --git a/packages/better-auth/src/plugins/remeber-me/index.ts b/packages/better-auth/src/plugins/remeber-me/index.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/packages/better-auth/src/plugins/remeber-me/remeber-me.ts b/packages/better-auth/src/plugins/remeber-me/remeber-me.ts
deleted file mode 100644
index 004262db..00000000
--- a/packages/better-auth/src/plugins/remeber-me/remeber-me.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { BetterAuthPlugin } from "../../types/plugins";
-
-export const rememberMePlugin = async () => {
-	return {} satisfies BetterAuthPlugin;
-};
diff --git a/packages/better-auth/src/types/context.ts b/packages/better-auth/src/types/context.ts
new file mode 100644
index 00000000..15ff2c7a
--- /dev/null
+++ b/packages/better-auth/src/types/context.ts
@@ -0,0 +1,13 @@
+import { ContextTools } from "better-call";
+import { AuthContext } from "../init";
+
+export type GenericEndpointContext = ContextTools & {
+	context: AuthContext;
+} & {
+	body: any;
+	request: Request;
+	headers: Headers;
+	params?: Record<string, string> | undefined;
+	query: any;
+	method: "*";
+};
diff --git a/packages/better-auth/src/types/index.ts b/packages/better-auth/src/types/index.ts
index 9c15534f..84df9929 100644
--- a/packages/better-auth/src/types/index.ts
+++ b/packages/better-auth/src/types/index.ts
@@ -1 +1,2 @@
 export * from "./options";
+export * from "./models";
diff --git a/packages/better-auth/src/types/models.ts b/packages/better-auth/src/types/models.ts
new file mode 100644
index 00000000..fb5cd7bc
--- /dev/null
+++ b/packages/better-auth/src/types/models.ts
@@ -0,0 +1,73 @@
+import { BetterAuthOptions } from ".";
+import { Session, User } from "../adapters/schema";
+import { BetterAuth } from "../auth";
+import { FieldAttribute, InferFieldOutput } from "../db";
+import { Prettify, UnionToIntersection } from "./helper";
+
+type AdditionalSessionFields<Options extends BetterAuthOptions> =
+	Options["plugins"] extends Array<infer T>
+		? T extends {
+				schema: {
+					session: {
+						fields: infer Field;
+					};
+				};
+			}
+			? Field extends Record<string, FieldAttribute>
+				? {
+						[key in keyof Field]: InferFieldOutput<Field[key]>;
+					}
+				: {}
+			: {}
+		: {};
+type AdditionalUserFields<Options extends BetterAuthOptions> =
+	Options["plugins"] extends Array<infer T>
+		? T extends {
+				schema: {
+					user: {
+						fields: infer Field;
+					};
+				};
+			}
+			? Field extends Record<infer Key, FieldAttribute>
+				? Prettify<
+						{
+							[key in Key as Field[key]["required"] extends false
+								? never
+								: Field[key]["defaultValue"] extends
+											| boolean
+											| string
+											| number
+											| Date
+											| Function
+									? key
+									: never]: InferFieldOutput<Field[key]>;
+						} & {
+							[key in Key as Field[key]["returned"] extends false
+								? never
+								: key]?: InferFieldOutput<Field[key]>;
+						}
+					>
+				: {}
+			: {}
+		: {};
+
+export type InferUser<O extends BetterAuthOptions | BetterAuth> =
+	UnionToIntersection<
+		User &
+			(O extends BetterAuthOptions
+				? AdditionalUserFields<O>
+				: O extends BetterAuth
+					? AdditionalUserFields<O["options"]>
+					: {})
+	>;
+
+export type InferSession<O extends BetterAuthOptions | BetterAuth> =
+	UnionToIntersection<
+		Session &
+			(O extends BetterAuthOptions
+				? AdditionalSessionFields<O>
+				: O extends BetterAuth
+					? AdditionalSessionFields<O["options"]>
+					: {})
+	>;
diff --git a/packages/better-auth/src/types/options.ts b/packages/better-auth/src/types/options.ts
index 4c90bf43..b124646e 100644
--- a/packages/better-auth/src/types/options.ts
+++ b/packages/better-auth/src/types/options.ts
@@ -1,7 +1,7 @@
 import { Dialect } from "kysely";
 import type { FieldAttribute } from "../db/field";
 import type { Provider } from "./provider";
-import type { Plugin } from "./plugins";
+import type { BetterAuthPlugin } from "./plugins";
 import type { Adapter } from "./adapter";
 import { User } from "../adapters/schema";
 
@@ -55,7 +55,7 @@ export interface BetterAuthOptions {
 	/**
 	 * Plugins
 	 */
-	plugins?: Plugin[];
+	plugins?: BetterAuthPlugin[];
 	/**
 	 * Advanced options
 	 */
diff --git a/packages/better-auth/src/types/plugins.ts b/packages/better-auth/src/types/plugins.ts
index 8507d606..55cbc6a6 100644
--- a/packages/better-auth/src/types/plugins.ts
+++ b/packages/better-auth/src/types/plugins.ts
@@ -1,8 +1,9 @@
 import { Migration } from "kysely";
-import { AuthEndpoint, AuthMiddleware } from "../api/call";
+import { AuthEndpoint } from "../api/call";
 import { FieldAttribute } from "../db/field";
 import { LiteralString } from "./helper";
-import { Endpoint } from "better-call";
+import { Endpoint, EndpointResponse } from "better-call";
+import { GenericEndpointContext } from "./context";
 
 export type PluginSchema = {
 	[table: string]: {
@@ -22,6 +23,28 @@ export type BetterAuthPlugin = {
 		path: string;
 		middleware: Endpoint;
 	}[];
+	hooks?: {
+		before?: {
+			matcher: (context: GenericEndpointContext) => boolean;
+			handler: Endpoint<
+				(context: GenericEndpointContext) => Promise<void | {
+					context: Partial<GenericEndpointContext>;
+				}>
+			>;
+		}[];
+		after?: {
+			matcher: (context: GenericEndpointContext) => boolean;
+			handler: Endpoint<
+				(
+					context: GenericEndpointContext & {
+						returned: EndpointResponse;
+					},
+				) => Promise<void | {
+					response: EndpointResponse;
+				}>
+			>;
+		}[];
+	};
 	/**
 	 * Schema the plugin needs
 	 *
diff --git a/packages/better-auth/src/utils/base-url.ts b/packages/better-auth/src/utils/base-url.ts
index 7eb7b04b..db1d600b 100644
--- a/packages/better-auth/src/utils/base-url.ts
+++ b/packages/better-auth/src/utils/base-url.ts
@@ -11,10 +11,16 @@ function checkHasPath(url: string): boolean {
 function withPath(url: string, path = "/api/auth") {
 	const hasPath = checkHasPath(url);
 	if (hasPath) {
-		return url;
+		return {
+			baseURL: new URL(url).origin,
+			withPath: url,
+		};
 	}
 	path = path.startsWith("/") ? path : `/${path}`;
-	return `${url}${path}`;
+	return {
+		baseURL: url,
+		withPath: `${url}${path}`,
+	};
 }
 
 export function getBaseURL(url?: string, path?: string) {
@@ -33,7 +39,10 @@ export function getBaseURL(url?: string, path?: string) {
 		!fromEnv &&
 		(process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test")
 	) {
-		return "http://localhost:3000/api/auth";
+		return {
+			baseURL: "http://localhost:3000",
+			withPath: "http://localhost:3000/api/auth",
+		};
 	}
 	throw new Error(
 		"Could not infer baseURL from environment variables. Please pass it as an option to the createClient function.",
diff --git a/packages/better-auth/tsup.config.ts b/packages/better-auth/tsup.config.ts
index 0aaaa522..d23f7269 100644
--- a/packages/better-auth/tsup.config.ts
+++ b/packages/better-auth/tsup.config.ts
@@ -4,6 +4,7 @@ export default defineConfig({
 	entry: {
 		index: "./src/index.ts",
 		provider: "./src/providers/index.ts",
+		types: "./src/types/index.ts",
 		client: "./src/client/index.ts",
 		cli: "./src/cli/index.ts",
 		react: "./src/client/react.ts",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d9b99ec1..f878154e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -51,7 +51,7 @@ importers:
     devDependencies:
       '@types/bun':
         specifier: latest
-        version: 1.1.7
+        version: 1.1.8
       vite:
         specifier: ^5.3.5
         version: 5.3.5(@types/node@20.14.12)
@@ -478,8 +478,8 @@ importers:
         specifier: ^1.9.2
         version: 1.9.2
       better-call:
-        specifier: ^0.1.33
-        version: 0.1.33(typescript@5.5.4)
+        specifier: ^0.1.36
+        version: 0.1.36(typescript@5.5.4)
       chalk:
         specifier: ^5.3.0
         version: 5.3.0
@@ -2659,8 +2659,8 @@ packages:
   '@types/better-sqlite3@7.6.11':
     resolution: {integrity: sha512-i8KcD3PgGtGBLl3+mMYA8PdKkButvPyARxA7IQAd6qeslht13qxb1zzO8dRCtE7U3IoJS782zDBAeoKiM695kg==}
 
-  '@types/bun@1.1.7':
-    resolution: {integrity: sha512-iIIn26SOX8qI5E8Juh+0rUgBmFHvll1akscwerhp9O/fHZGdQBWNLJkkRg/3z2Mh6a3ZgWUIkXViLZZYg47TXw==}
+  '@types/bun@1.1.8':
+    resolution: {integrity: sha512-PIwVFQKPviksiibobyvcWtMvMFMTj91T8dQEh9l1P3Ypr3ZuVn9w7HSr+5mTNrPqD1xpdDLEErzZPU8gqHBu6g==}
 
   '@types/cookie@0.6.0':
     resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==}
@@ -3042,10 +3042,10 @@ packages:
     peerDependencies:
       typescript: ^5.0.0
 
-  better-call@0.1.33:
-    resolution: {integrity: sha512-gzthE/AnimwMCNBNyy9LRqqAtjXkqO+dR4n1OjCiUhiBK4X+NZMKekQUKIzpfwDRC4k3hCshb1LsPhqwiSM7Bw==}
+  better-call@0.1.36:
+    resolution: {integrity: sha512-+FsoIB8tMVRciTTN9UUXXoJEzAqIaaNPrxa9kDYoTaGCTCimNKbHNuLwsnIAibamG0Lo7CFCiSL4yyV+I32O4A==}
     peerDependencies:
-      typescript: ^5.0.0
+      typescript: ^5.6.0-beta
 
   better-sqlite3@11.1.2:
     resolution: {integrity: sha512-gujtFwavWU4MSPT+h9B+4pkvZdyOUkH54zgLdIrMmmmd4ZqiBIrRNBzNzYVFO417xo882uP5HBu4GjOfaSrIQw==}
@@ -3089,8 +3089,8 @@ packages:
   bun-html-live-reload@0.1.3:
     resolution: {integrity: sha512-PW1sp9ZmBAqiAa0aUhHpFc6sEQmC6FgRNKVAvcjSDUMqASzgq7xYpNkEt2Z6VjuiPXKtOx/49b6sLLmjyojrOw==}
 
-  bun-types@1.1.25:
-    resolution: {integrity: sha512-WpRb8/N3S5IE8UYdIn39+0Is1XzxsC78+MCe5cIdaer0lfFs6+DREtQH9TM6KJNKTxBYDvbx81RwbvxS5+CkVQ==}
+  bun-types@1.1.26:
+    resolution: {integrity: sha512-n7jDe62LsB2+WE8Q8/mT3azkPaatKlj/2MyP6hi3mKvPz9oPpB6JW/Ll6JHtNLudasFFuvfgklYSE+rreGvBjw==}
 
   bundle-require@5.0.0:
     resolution: {integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==}
@@ -8820,9 +8820,9 @@ snapshots:
     dependencies:
       '@types/node': 20.14.12
 
-  '@types/bun@1.1.7':
+  '@types/bun@1.1.8':
     dependencies:
-      bun-types: 1.1.25
+      bun-types: 1.1.26
 
   '@types/cookie@0.6.0': {}
 
@@ -9275,7 +9275,7 @@ snapshots:
       rou3: 0.5.1
       typescript: 5.5.4
 
-  better-call@0.1.33(typescript@5.5.4):
+  better-call@0.1.36(typescript@5.5.4):
     dependencies:
       '@better-fetch/fetch': 1.1.4
       '@types/set-cookie-parser': 2.4.10
@@ -9343,7 +9343,7 @@ snapshots:
 
   bun-html-live-reload@0.1.3: {}
 
-  bun-types@1.1.25:
+  bun-types@1.1.26:
     dependencies:
       '@types/node': 20.12.14
       '@types/ws': 8.5.11
diff --git a/todo.md b/todo.md
index 6ffb402c..08946f7d 100644
--- a/todo.md
+++ b/todo.md
@@ -1,4 +1,4 @@
 ## TODO
 [ ] handle migration when the config removes existing schema
 [ ] refresh oauth tokens
-[ ] remember me functionality
\ No newline at end of file
+[x] remember me functionality
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 813291fb..5a72832f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,6 +5,7 @@
 		"target": "es2022",
 		"allowJs": true,
 		"resolveJsonModule": true,
+		"disableReferencedProjectLoad": true,
 		"moduleDetection": "force",
 		"isolatedModules": true,
 		"strict": true,