From 22ddfcfe00436c86b006486aa3503f093c978184 Mon Sep 17 00:00:00 2001
From: Bereket Engida <bekacru@gmail.com>
Date: Sat, 14 Sep 2024 01:20:12 +0300
Subject: [PATCH] feat: org types

---
 packages/better-auth/src/client/react.ts      | 14 -------------
 .../src/plugins/organization/client.ts        | 20 +++++++++++++++++++
 todo.md                                       |  3 ++-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/better-auth/src/client/react.ts b/packages/better-auth/src/client/react.ts
index 689da81785..e2778394e1 100644
--- a/packages/better-auth/src/client/react.ts
+++ b/packages/better-auth/src/client/react.ts
@@ -53,21 +53,7 @@ export function createAuthClient<Option extends ClientOptions>(
 
 	type InitialValue = ReturnType<(typeof $session)["get"]>["data"] | null;
 	function useSession(initialValue?: InitialValue) {
-		const [isClient, setIsClient] = useState(false);
 		const storeValue = useStore($session);
-
-		useEffect(() => {
-			setIsClient(true);
-		}, []);
-
-		if (!isClient && initialValue !== undefined) {
-			return {
-				data: initialValue || undefined,
-				loading: false,
-				error: undefined,
-				promise: () => Promise.resolve(),
-			} as unknown as typeof storeValue;
-		}
 		return storeValue;
 	}
 	const routes = {
diff --git a/packages/better-auth/src/plugins/organization/client.ts b/packages/better-auth/src/plugins/organization/client.ts
index 8dbed3fcb1..664f7cf727 100644
--- a/packages/better-auth/src/plugins/organization/client.ts
+++ b/packages/better-auth/src/plugins/organization/client.ts
@@ -37,6 +37,26 @@ export const organizationClient = <O extends OrganizationClientOptions>(
 		$InferServerPlugin: {} as ReturnType<typeof organization>,
 		getActions: ($fetch) => ({
 			organization: {
+				$Infer: {
+					ActiveOrganization: {} as Prettify<
+						Organization & {
+							members: Prettify<
+								Member & {
+									user: {
+										id: string;
+										name: string;
+										email: string;
+										image: string;
+									};
+								}
+							>[];
+							invitations: Invitation[];
+						}
+					>,
+					Organization: {} as Organization,
+					Invitation: {} as Invitation,
+					Member: {} as Member,
+				},
 				setActive(orgId: string | null) {
 					activeOrgId.set(orgId);
 				},
diff --git a/todo.md b/todo.md
index 7e098d2b5d..19507423a9 100644
--- a/todo.md
+++ b/todo.md
@@ -19,4 +19,5 @@
 [ ] add a note about better-sqlite3 requiring to be added to webpack externals or find alternative that doesn't require it
 [ ] add a section about updating user and changing password
 [ ] mention how users can get user and session types
-[ ] add a doc about account linking
\ No newline at end of file
+[ ] add a doc about account linking
+[ ] remove the section about using useSession in next with initialValue
\ No newline at end of file