From ef2ff4ce56076103fc09324689eb3fe0c26adf4d Mon Sep 17 00:00:00 2001
From: Bereket Engida <86073083+Bekacru@users.noreply.github.com>
Date: Thu, 26 Dec 2024 18:44:16 +0300
Subject: [PATCH] fix(expo): local session cache should be scopped (#1020)

---
 examples/expo-example/src/lib/auth-client.ts  |  1 -
 examples/expo-example/src/lib/auth.ts         |  1 +
 .../better-auth/src/client/react/index.ts     |  2 ++
 packages/expo/src/client.ts                   | 24 +++++++++++--------
 packages/expo/src/expo.test.ts                |  8 -------
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/examples/expo-example/src/lib/auth-client.ts b/examples/expo-example/src/lib/auth-client.ts
index aef5926af4..aebc1ed579 100644
--- a/examples/expo-example/src/lib/auth-client.ts
+++ b/examples/expo-example/src/lib/auth-client.ts
@@ -5,7 +5,6 @@ import Constants from "expo-constants";
 
 export const getBaseUrl = () => {
 	const debuggerHost = Constants.expoConfig?.hostUri;
-	const localhost = debuggerHost?.split(":")[0];
 	return `http://${"localhost"}:8081`;
 };
 
diff --git a/examples/expo-example/src/lib/auth.ts b/examples/expo-example/src/lib/auth.ts
index 091bd9ebf7..3c70d3277f 100644
--- a/examples/expo-example/src/lib/auth.ts
+++ b/examples/expo-example/src/lib/auth.ts
@@ -16,4 +16,5 @@ export const auth = betterAuth({
 			clientSecret: process.env.GITHUB_CLIENT_SECRET!,
 		},
 	},
+	trustedOrigins: ["exp://"],
 });
diff --git a/packages/better-auth/src/client/react/index.ts b/packages/better-auth/src/client/react/index.ts
index 8b31fb84ad..d71fd19291 100644
--- a/packages/better-auth/src/client/react/index.ts
+++ b/packages/better-auth/src/client/react/index.ts
@@ -102,3 +102,5 @@ export function createAuthClient<Option extends ClientOptions>(
 export type * from "@better-fetch/fetch";
 //@ts-expect-error
 export type * from "zod";
+
+export { useStore };
diff --git a/packages/expo/src/client.ts b/packages/expo/src/client.ts
index 87ee2a3bde..ffe1667071 100644
--- a/packages/expo/src/client.ts
+++ b/packages/expo/src/client.ts
@@ -2,6 +2,7 @@ import type { BetterAuthClientPlugin, Store } from "better-auth";
 import * as Browser from "expo-web-browser";
 import * as Linking from "expo-linking";
 import { Platform } from "react-native";
+import { useStore } from "better-auth/react";
 import Constants from "expo-constants";
 import type { BetterFetchOption } from "@better-fetch/fetch";
 
@@ -108,16 +109,6 @@ export const expoClient = (opts: ExpoClientOptions) => {
 	return {
 		id: "expo",
 		getActions(_, $store) {
-			if (Platform.OS !== "web") {
-				store = $store;
-				const localSession = storage.getItem(cookieName);
-				localSession &&
-					$store.atoms.session.set({
-						data: JSON.parse(localSession),
-						error: null,
-						isPending: false,
-					});
-			}
 			return {
 				/**
 				 * Get the stored cookie.
@@ -138,6 +129,19 @@ export const expoClient = (opts: ExpoClientOptions) => {
 					const cookie = storage.getItem(cookieName);
 					return getCookie(cookie || "{}");
 				},
+				useSession: () => {
+					if (Platform.OS !== "web" && !opts.disableCache) {
+						store = $store;
+						const localSession = storage.getItem(localCacheName);
+						localSession &&
+							$store.atoms.session.set({
+								data: JSON.parse(localSession),
+								error: null,
+								isPending: false,
+							});
+					}
+					return useStore($store.atoms.session);
+				},
 			};
 		},
 		fetchPlugins: [
diff --git a/packages/expo/src/expo.test.ts b/packages/expo/src/expo.test.ts
index 75ef7383bc..fa1c433f5b 100644
--- a/packages/expo/src/expo.test.ts
+++ b/packages/expo/src/expo.test.ts
@@ -42,14 +42,6 @@ vi.mock("expo-linking", async () => {
 	};
 });
 
-vi.mock("expo-secure-store", async () => {
-	return {
-		getItemAsync: vi.fn(async (key) => null),
-		setItemAsync: vi.fn(),
-		deleteItemAsync: vi.fn(),
-	};
-});
-
 const fn = vi.fn();
 
 describe("expo", async () => {