diff --git a/demo/nextjs/app/(auth)/sign-in/page.tsx b/demo/nextjs/app/(auth)/sign-in/page.tsx
index 278e24f8..b2779a6f 100644
--- a/demo/nextjs/app/(auth)/sign-in/page.tsx
+++ b/demo/nextjs/app/(auth)/sign-in/page.tsx
@@ -3,8 +3,14 @@
 import SignIn from "@/components/sign-in";
 import { SignUp } from "@/components/sign-up";
 import { Tabs } from "@/components/ui/tabs2";
+import { client } from "@/lib/auth-client";
+import { useEffect } from "react";
 
 export default function Page() {
+	useEffect(() => {
+		client.oneTap();
+	}, []);
+
 	return (
 		<div className="w-full">
 			<div className="flex items-center flex-col justify-center w-full md:py-10">
diff --git a/demo/nextjs/app/admin/page.tsx b/demo/nextjs/app/admin/page.tsx
index d8b645df..6365a543 100644
--- a/demo/nextjs/app/admin/page.tsx
+++ b/demo/nextjs/app/admin/page.tsx
@@ -76,16 +76,21 @@ export default function AdminDashboard() {
 
 	const { data: users, isLoading: isUsersLoading } = useQuery({
 		queryKey: ["users"],
-		queryFn: () =>
-			client.admin
-				.listUsers({
+		queryFn: async () => {
+			const data = await client.admin.listUsers(
+				{
 					query: {
 						limit: 10,
 						sortBy: "createdAt",
 						sortDirection: "desc",
 					},
-				})
-				.then((res) => res.data?.users ?? []),
+				},
+				{
+					throw: true,
+				},
+			);
+			return data?.users || [];
+		},
 	});
 
 	const handleCreateUser = async (e: React.FormEvent) => {
diff --git a/demo/nextjs/app/dashboard/user-card.tsx b/demo/nextjs/app/dashboard/user-card.tsx
index 2c3180a9..b81e0b5a 100644
--- a/demo/nextjs/app/dashboard/user-card.tsx
+++ b/demo/nextjs/app/dashboard/user-card.tsx
@@ -42,10 +42,9 @@ import {
 } from "lucide-react";
 import Image from "next/image";
 import { useRouter } from "next/navigation";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { toast } from "sonner";
 import { UAParser } from "ua-parser-js";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
 import {
 	Table,
 	TableBody,
@@ -63,14 +62,7 @@ export default function UserCard(props: {
 }) {
 	const router = useRouter();
 	const { data, isPending, error } = useSession();
-	const [ua, setUa] = useState<UAParser.UAParserInstance>();
-
 	const session = data || props.session;
-
-	useEffect(() => {
-		setUa(new UAParser(session?.session.userAgent));
-	}, [session?.session.userAgent]);
-
 	const [isTerminating, setIsTerminating] = useState<string>();
 	const [isPendingTwoFa, setIsPendingTwoFa] = useState<boolean>(false);
 	const [twoFaPassword, setTwoFaPassword] = useState<string>("");
@@ -668,7 +660,6 @@ function EditUserDialog(props: { session: Session | null }) {
 function AddPasskey() {
 	const [isOpen, setIsOpen] = useState(false);
 	const [passkeyName, setPasskeyName] = useState("");
-	const queryClient = useQueryClient();
 	const [isLoading, setIsLoading] = useState(false);
 
 	const handleAddPasskey = async () => {
diff --git a/demo/nextjs/components/account-swtich.tsx b/demo/nextjs/components/account-swtich.tsx
index 9044d9ee..98991f92 100644
--- a/demo/nextjs/components/account-swtich.tsx
+++ b/demo/nextjs/components/account-swtich.tsx
@@ -26,25 +26,8 @@ export default function AccountSwitcher({
 }: {
 	sessions: Session[];
 }) {
-	const { data: users } = useQuery({
-		queryKey: ["users"],
-		queryFn: async () => {
-			return;
-		},
-	});
 	const { data: currentUser } = useSession();
 	const [open, setOpen] = useState(false);
-
-	const handleUserSelect = (user: Session) => {
-		// setCurrentUser(user);
-		setOpen(false);
-	};
-
-	const handleAddAccount = () => {
-		// Implement add account logic here
-		console.log("Add account clicked");
-		setOpen(false);
-	};
 	const router = useRouter();
 	return (
 		<Popover open={open} onOpenChange={setOpen}>
diff --git a/demo/nextjs/components/logo.tsx b/demo/nextjs/components/logo.tsx
index 21d2afc8..319fc6b2 100644
--- a/demo/nextjs/components/logo.tsx
+++ b/demo/nextjs/components/logo.tsx
@@ -11,8 +11,8 @@ export const Logo = (props: SVGProps<any>) => {
 			xmlns="http://www.w3.org/2000/svg"
 		>
 			<path
-				fill-rule="evenodd"
-				clip-rule="evenodd"
+				fillRule="evenodd"
+				clipRule="evenodd"
 				d="M0 0H15V15H30V30H15V45H0V30V15V0ZM45 30V15H30V0H45H60V15V30V45H45H30V30H45Z"
 				className="fill-black dark:fill-white"
 			/>
diff --git a/demo/nextjs/lib/auth-client.ts b/demo/nextjs/lib/auth-client.ts
index bc881960..69b7a87c 100644
--- a/demo/nextjs/lib/auth-client.ts
+++ b/demo/nextjs/lib/auth-client.ts
@@ -5,6 +5,7 @@ import {
 	twoFactorClient,
 	adminClient,
 	multiSessionClient,
+	oneTapClient,
 } from "better-auth/client/plugins";
 import { toast } from "sonner";
 
@@ -18,6 +19,9 @@ export const client = createAuthClient({
 		passkeyClient(),
 		adminClient(),
 		multiSessionClient(),
+		oneTapClient({
+			clientId: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID!,
+		}),
 	],
 	fetchOptions: {
 		onError(e) {
diff --git a/demo/nextjs/lib/auth.ts b/demo/nextjs/lib/auth.ts
index ebbcbda0..9c8c3a72 100644
--- a/demo/nextjs/lib/auth.ts
+++ b/demo/nextjs/lib/auth.ts
@@ -6,6 +6,7 @@ import {
 	organization,
 	passkey,
 	twoFactor,
+	oneTap,
 } from "better-auth/plugins";
 import { reactInvitationEmail } from "./email/invitation";
 import { LibsqlDialect } from "@libsql/kysely-libsql";
@@ -120,5 +121,6 @@ export const auth = betterAuth({
 		bearer(),
 		admin(),
 		multiSession(),
+		oneTap(),
 	],
 });
diff --git a/docs/components/sidebar-content.tsx b/docs/components/sidebar-content.tsx
index d001d8a1..3de467e7 100644
--- a/docs/components/sidebar-content.tsx
+++ b/docs/components/sidebar-content.tsx
@@ -759,6 +759,26 @@ export const contents: Content[] = [
 				),
 			},
 
+			{
+				title: "One Tap",
+				href: "/docs/plugins/one-tap",
+				icon: () => (
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						width="1.2em"
+						height="1.2em"
+						viewBox="0 0 14 14"
+					>
+						<path
+							fill="currentColor"
+							fillRule="evenodd"
+							d="M3.254 4.361a2.861 2.861 0 1 1 5.647.651a.75.75 0 0 0 1.461.34a4.361 4.361 0 1 0-8.495 0a.75.75 0 0 0 1.461-.34a3 3 0 0 1-.074-.651m1.63 5.335V4.26a1.26 1.26 0 0 1 2.518 0v4.077h2.464a2.573 2.573 0 0 1 2.573 2.573V13a1 1 0 0 1-1 1H4.83a1 1 0 0 1-.823-.433l-.764-1.11a1.715 1.715 0 0 1 1.097-2.66l.543-.102Z"
+							clipRule="evenodd"
+						></path>
+					</svg>
+				),
+			},
+
 			{
 				title: "Authorization",
 				group: true,
diff --git a/docs/content/docs/plugins/one-tap.mdx b/docs/content/docs/plugins/one-tap.mdx
new file mode 100644
index 00000000..52b261df
--- /dev/null
+++ b/docs/content/docs/plugins/one-tap.mdx
@@ -0,0 +1,89 @@
+---
+title: One Tap
+description: One Tap plugin for BetterAuth
+---
+
+The One Tap plugin allows users to login with a single tap using Google's One Tap API.
+
+## Installation
+
+<Steps>
+<Step>
+### Add the server Plugin
+
+Add the One Tap plugin to your auth config.
+
+```ts title="auth.ts"
+import { betterAuth } from "better-auth";
+import { oneTap } from "better-auth/plugins";
+
+export const auth = betterAuth({
+    plugins: [ // [!code highlight]
+        oneTap(), // [!code highlight]
+    ] // [!code highlight]
+})
+```
+</Step>
+
+<Step>
+        ### Add the client Plugin
+
+        Add the client plugin and Specify where the user should be redirected if they need to verify 2nd factor
+
+        ```ts title="client.ts"
+        import { createAuthClient } from "better-auth/client"
+        import { oneTapClient } from "better-auth/client/plugins"
+
+        const client = createAuthClient({
+            plugins: [
+                oneTapClient({
+                    clientId: "YOUR_CLIENT_ID"
+                })
+            ]
+        })
+        ```
+        </Step>
+</Steps>
+
+## Usage
+
+To make the one tap pop up appear, you can call the `oneTap` method.
+
+```ts
+await authClient.oneTap()
+```
+
+By default, the plugin will automatically redirect the user to "/" after the user has successfully logged in. It does a hard redirect, so the page will be reloaded. If you want to 
+avoid this, you can pass `fetchOptions` to the `oneTap` method.
+
+```tsx
+authClient.oneTap({
+    fetchOptions: {
+        onSuccess: () => {
+            router.push("/dashboard")
+        }
+    }
+})
+```
+
+If you want it to hard redirect to a different page, you can pass the `callbackURL` option to the `oneTap` method.
+
+```tsx
+authClient.oneTap({
+    callbackURL: "/dashboard"
+})
+```
+
+## Client Options
+
+**clientId**: The client ID of your Google One Tap API
+
+**autoSelect**: Automatically select the first account in the list. Default is `false`
+
+**context**: The context in which the One Tap API should be used. Default is `signin`
+
+**cancelOnTapOutside**: Cancel the One Tap popup when the user taps outside of the popup. Default is `true`.
+
+## Server Options
+
+**disableSignUp**: Disable the sign up option. Default is `false`. If set to `true`, the user will only be able to sign in with an existing account.
\ No newline at end of file
diff --git a/packages/better-auth/src/api/routes/session.ts b/packages/better-auth/src/api/routes/session.ts
index 55df8581..030a4888 100644
--- a/packages/better-auth/src/api/routes/session.ts
+++ b/packages/better-auth/src/api/routes/session.ts
@@ -67,7 +67,6 @@ export const getSession = <Option extends BetterAuthOptions>() =>
 
 				const session =
 					await ctx.context.internalAdapter.findSession(sessionCookieToken);
-				console.log({ session });
 
 				if (!session || session.session.expiresAt < new Date()) {
 					deleteSessionCookie(ctx);
diff --git a/packages/better-auth/src/api/routes/sign-in.ts b/packages/better-auth/src/api/routes/sign-in.ts
index 2b5c04f0..3a58a007 100644
--- a/packages/better-auth/src/api/routes/sign-in.ts
+++ b/packages/better-auth/src/api/routes/sign-in.ts
@@ -1,12 +1,10 @@
 import { APIError } from "better-call";
-import { generateCodeVerifier } from "oslo/oauth2";
 import { z } from "zod";
 import { createAuthEndpoint } from "../call";
 import { setSessionCookie } from "../../cookies";
 import { socialProviderList } from "../../social-providers";
 import { createEmailVerificationToken } from "./email-verification";
 import { generateState, logger } from "../../utils";
-import { hmac } from "../../crypto/hash";
 
 export const signInOAuth = createAuthEndpoint(
 	"/sign-in/social",
diff --git a/packages/better-auth/src/client/plugins/index.ts b/packages/better-auth/src/client/plugins/index.ts
index 767fa9f7..dab1096c 100644
--- a/packages/better-auth/src/client/plugins/index.ts
+++ b/packages/better-auth/src/client/plugins/index.ts
@@ -12,3 +12,4 @@ export * from "../../plugins/generic-oauth/client";
 export * from "../../plugins/jwt/client";
 export * from "../../plugins/multi-session/client";
 export * from "../../plugins/email-otp/client";
+export * from "../../plugins/one-tap/client";
diff --git a/packages/better-auth/src/client/types.ts b/packages/better-auth/src/client/types.ts
index 2f7cf211..0d28fb46 100644
--- a/packages/better-auth/src/client/types.ts
+++ b/packages/better-auth/src/client/types.ts
@@ -91,7 +91,7 @@ export type InferActions<O extends ClientOptions> = O["plugins"] extends Array<
 >
 	? UnionToIntersection<
 			Plugin extends BetterAuthClientPlugin
-				? Plugin["getActions"] extends ($fetch: BetterFetch) => infer Actions
+				? Plugin["getActions"] extends (...args: any) => infer Actions
 					? Actions
 					: {}
 				: {}
diff --git a/packages/better-auth/src/db/internal-adapter.ts b/packages/better-auth/src/db/internal-adapter.ts
index ae480edc..55279151 100644
--- a/packages/better-auth/src/db/internal-adapter.ts
+++ b/packages/better-auth/src/db/internal-adapter.ts
@@ -146,7 +146,7 @@ export const createInternalAdapter = (
 		},
 		createSession: async (
 			userId: string,
-			request?: Request | Headers,
+			request: Request | Headers | undefined,
 			dontRememberMe?: boolean,
 			override?: Partial<Session> & Record<string, any>,
 		) => {
diff --git a/packages/better-auth/src/plugins/index.ts b/packages/better-auth/src/plugins/index.ts
index 5ae33868..15790bdb 100644
--- a/packages/better-auth/src/plugins/index.ts
+++ b/packages/better-auth/src/plugins/index.ts
@@ -14,3 +14,4 @@ export * from "./generic-oauth";
 export * from "./jwt";
 export * from "./multi-session";
 export * from "./email-otp";
+export * from "./one-tap";
diff --git a/packages/better-auth/src/plugins/one-tap/client.ts b/packages/better-auth/src/plugins/one-tap/client.ts
new file mode 100644
index 00000000..d5620083
--- /dev/null
+++ b/packages/better-auth/src/plugins/one-tap/client.ts
@@ -0,0 +1,132 @@
+import type { BetterFetchOption } from "@better-fetch/fetch";
+import type { BetterAuthClientPlugin } from "../../types";
+
+declare global {
+	interface Window {
+		google?: {
+			accounts: {
+				id: {
+					initialize: (config: any) => void;
+					prompt: () => void;
+				};
+			};
+		};
+		googleScriptInitialized?: boolean;
+	}
+}
+
+interface GoogleOneTapOptions {
+	/**
+	 * Google client ID
+	 */
+	clientId: string;
+	/**
+	 * Auto select the account if the user is already signed in
+	 */
+	autoSelect?: boolean;
+	/**
+	 * Cancel the flow when the user taps outside the prompt
+	 */
+	cancelOnTapOutside?: boolean;
+	/**
+	 * Context of the Google One Tap flow
+	 */
+	context?: "signin" | "signup" | "use";
+}
+
+interface GoogleOneTapActionOptions
+	extends Omit<GoogleOneTapOptions, "clientId"> {
+	fetchOptions?: BetterFetchOption;
+	callbackURL?: string;
+}
+
+let isRequestInProgress = false;
+
+export const oneTapClient = (options: GoogleOneTapOptions) => {
+	return {
+		id: "one-tap",
+		getActions: ($fetch, _) => ({
+			oneTap: async (
+				opts?: GoogleOneTapActionOptions,
+				fetchOptions?: BetterFetchOption,
+			) => {
+				if (isRequestInProgress) {
+					console.warn(
+						"A Google One Tap request is already in progress. Please wait.",
+					);
+					return;
+				}
+
+				isRequestInProgress = true;
+
+				try {
+					if (typeof window === "undefined" || !window.document) {
+						console.warn(
+							"Google One Tap is only available in browser environments",
+						);
+						return;
+					}
+
+					const { autoSelect, cancelOnTapOutside, context } = opts ?? {};
+					const contextValue = context ?? options.context ?? "signin";
+
+					await loadGoogleScript();
+
+					await new Promise<void>((resolve) => {
+						window.google?.accounts.id.initialize({
+							client_id: options.clientId,
+							callback: async (response: { credential: string }) => {
+								await $fetch("/one-tap/callback", {
+									method: "POST",
+									body: { idToken: response.credential },
+									...opts?.fetchOptions,
+									...fetchOptions,
+								});
+
+								// Redirect if no fetch options are provided or a callbackURL is specified
+								if (
+									(!opts?.fetchOptions && !fetchOptions) ||
+									opts?.callbackURL
+								) {
+									window.location.href = opts?.callbackURL ?? "/";
+								}
+								resolve();
+							},
+							auto_select: autoSelect,
+							cancel_on_tap_outside: cancelOnTapOutside,
+							context: contextValue,
+						});
+						window.google?.accounts.id.prompt();
+					});
+				} catch (error) {
+					console.error("Error during Google One Tap flow:", error);
+					throw error;
+				} finally {
+					isRequestInProgress = false;
+				}
+			},
+		}),
+		getAtoms($fetch) {
+			return {};
+		},
+	} satisfies BetterAuthClientPlugin;
+};
+
+const loadGoogleScript = (): Promise<void> => {
+	return new Promise((resolve) => {
+		if (window.googleScriptInitialized) {
+			resolve();
+			return;
+		}
+
+		const script = document.createElement("script");
+		script.src = "https://accounts.google.com/gsi/client";
+		script.async = true;
+		script.defer = true;
+		script.onload = () => {
+			window.googleScriptInitialized = true;
+			resolve();
+		};
+		document.head.appendChild(script);
+	});
+};
diff --git a/packages/better-auth/src/plugins/one-tap/index.ts b/packages/better-auth/src/plugins/one-tap/index.ts
new file mode 100644
index 00000000..012831c7
--- /dev/null
+++ b/packages/better-auth/src/plugins/one-tap/index.ts
@@ -0,0 +1,97 @@
+import { z } from "zod";
+import { APIError, createAuthEndpoint } from "../../api";
+import { setSessionCookie } from "../../cookies";
+import type { BetterAuthPlugin } from "../../types";
+import { betterFetch } from "@better-fetch/fetch";
+import { toBoolean } from "../../utils/boolean";
+
+interface OneTapOptions {
+	/**
+	 * Disable the signup flow
+	 *
+	 * @default false
+	 */
+	disableSignup?: boolean;
+}
+
+export const oneTap = (options?: OneTapOptions) =>
+	({
+		id: "one-tap",
+		endpoints: {
+			oneTapCallback: createAuthEndpoint(
+				"/one-tap/callback",
+				{
+					method: "POST",
+					body: z.object({
+						idToken: z.string(),
+					}),
+				},
+				async (c) => {
+					const { idToken } = c.body;
+					const { data, error } = await betterFetch<{
+						email: string;
+						email_verified: string;
+						name: string;
+						picture: string;
+						sub: string;
+					}>("https://oauth2.googleapis.com/tokeninfo?id_token=" + idToken);
+					if (error) {
+						return c.json({
+							error: "Invalid token",
+						});
+					}
+					const user = await c.context.internalAdapter.findUserByEmail(
+						data.email,
+					);
+					if (!user) {
+						if (options?.disableSignup) {
+							throw new APIError("BAD_GATEWAY", {
+								message: "User not found",
+							});
+						}
+						const user = await c.context.internalAdapter.createOAuthUser(
+							{
+								email: data.email,
+								emailVerified: toBoolean(data.email_verified),
+								name: data.name,
+								image: data.picture,
+							},
+							{
+								providerId: "google",
+								accountId: data.sub,
+							},
+						);
+						if (!user) {
+							throw new APIError("INTERNAL_SERVER_ERROR", {
+								message: "Could not create user",
+							});
+						}
+						const session = await c.context.internalAdapter.createSession(
+							user?.user.id,
+							c.request,
+						);
+						await setSessionCookie(c, {
+							user: user.user,
+							session,
+						});
+						return c.json({
+							session,
+							user,
+						});
+					}
+					const session = await c.context.internalAdapter.createSession(
+						user.user.id,
+						c.request,
+					);
+					await setSessionCookie(c, {
+						user: user.user,
+						session,
+					});
+					return c.json({
+						session,
+						user,
+					});
+				},
+			),
+		},
+	}) satisfies BetterAuthPlugin;
diff --git a/packages/better-auth/src/plugins/organization/routes/crud-org.ts b/packages/better-auth/src/plugins/organization/routes/crud-org.ts
index 6802d14d..b5cc664a 100644
--- a/packages/better-auth/src/plugins/organization/routes/crud-org.ts
+++ b/packages/better-auth/src/plugins/organization/routes/crud-org.ts
@@ -218,15 +218,17 @@ export const getFullOrganization = createAuthEndpoint(
 	"/organization/get-full",
 	{
 		method: "GET",
-		query: z.object({
-			orgId: z.string().optional(),
-		}),
+		query: z.optional(
+			z.object({
+				orgId: z.string().optional(),
+			}),
+		),
 		requireHeaders: true,
 		use: [orgMiddleware, orgSessionMiddleware],
 	},
 	async (ctx) => {
 		const session = ctx.context.session;
-		const orgId = ctx.query.orgId || session.session.activeOrganizationId;
+		const orgId = ctx.query?.orgId || session.session.activeOrganizationId;
 		if (!orgId) {
 			return ctx.json(null, {
 				status: 400,
diff --git a/packages/better-auth/src/plugins/two-factor/index.ts b/packages/better-auth/src/plugins/two-factor/index.ts
index 59bb093b..62228545 100644
--- a/packages/better-auth/src/plugins/two-factor/index.ts
+++ b/packages/better-auth/src/plugins/two-factor/index.ts
@@ -84,6 +84,7 @@ export const twoFactor = (options?: TwoFactorOptions) => {
 						);
 						const newSession = await ctx.context.internalAdapter.createSession(
 							updatedUser.id,
+							ctx.request,
 						);
 						/**
 						 * Update the session cookie with the new user data
diff --git a/packages/better-auth/src/plugins/two-factor/totp/index.ts b/packages/better-auth/src/plugins/two-factor/totp/index.ts
index 1903f2b2..d43814d0 100644
--- a/packages/better-auth/src/plugins/two-factor/totp/index.ts
+++ b/packages/better-auth/src/plugins/two-factor/totp/index.ts
@@ -178,6 +178,7 @@ export const totp2fa = (options: TOTPOptions, twoFactorTable: string) => {
 				);
 				const newSession = await ctx.context.internalAdapter.createSession(
 					user.id,
+					ctx.request,
 				);
 				await setSessionCookie(ctx, {
 					session: newSession,
diff --git a/packages/better-auth/src/utils/boolean.ts b/packages/better-auth/src/utils/boolean.ts
new file mode 100644
index 00000000..c149bd3c
--- /dev/null
+++ b/packages/better-auth/src/utils/boolean.ts
@@ -0,0 +1,3 @@
+export function toBoolean(value: any): boolean {
+	return value === "true" || value === true;
+}