simplify impl

Author: aster-void

packages/web/src/components/FilterUI/FilterUI.tsx

@@ -2,12 +2,7 @@
  * 全てのフィルターを表示するコンポーネント
  */
 
-import type {
-  ClassSeries,
-  ClassType,
-  Evaluation,
-  Semester,
-} from "@packages/models";
+import type { ClassSeries, Evaluation, Semester } from "@packages/models";
 import { useState } from "react";
 import { ClassSeriesFilter } from "./FilterComponents/ClassType.tsx";
 import { EvaluationFilter } from "./FilterComponents/Evaluation.tsx";

packages/web/src/lib/auth-client.ts

@@ -1,30 +1,16 @@
 import { createAuthClient } from "better-auth/react";
-import { writable } from "svelte/store";
 
 export const auth = createAuthClient({
   baseURL: window.location.origin,
 });
 
-export const onAuthChange = writable({ loggedIn: false });
-
 export async function logout() {
   await auth.signOut();
-  onAuthChange.set({ loggedIn: false });
 }
 
 export async function signInWithGoogle(callbackURL: string) {
   await auth.signIn.social({
     provider: "google",
     callbackURL,
   });
-
-  onAuthChange.set({ loggedIn: true });
 }
-
-(async () => {
-  const session = await auth.getSession();
-  console.log("[auth debug] ", session);
-  if (session.data) {
-    onAuthChange.set({ loggedIn: true });
-  }
-})();

packages/web/src/pages/Profile.tsx

@@ -5,11 +5,11 @@ import { useCurrentUserQuery } from "@/services/user/user";
 export default function Profile() {
   const user = useCurrentUserQuery();
 
-  if (!user.data) {
+  if (user.isPending) {
     return <div>Loading...</div>;
   }
 
-  if (!user.data.ok) {
+  if (!user.data) {
     return (
       <div>
         Hello anonymous user <GoogleLoginButton callbackURL="/profile" />
@@ -19,10 +19,10 @@ export default function Profile() {
 
   return (
     <div>
-      <div>Hello {user.data.data.name}</div>
-      {user.data.data.image && (
+      <div>Hello {user.data.name}</div>
+      {user.data.image && (
         <img
-          src={user.data.data.image}
+          src={user.data.image}
           alt="profile"
           className="w-20 h-20 rounded-full"
         />

packages/web/src/pages/SignIn.tsx

@@ -1,18 +1,8 @@
-import { useNavigate } from "react-router-dom";
 import { GoogleLoginButton } from "@/components/auth/GoogleLoginButton";
-import { onAuthChange } from "@/lib/auth-client";
-import { useStoreEffect } from "@/lib/utils/stores";
 
 // TODO: style it
+// TODO: if user is already logged in, go to /profile
 export default function SignIn() {
-  const navigate = useNavigate();
-
-  useStoreEffect(onAuthChange, (auth) => {
-    console.log("[auth debug] ", auth);
-    if (auth.loggedIn) {
-      navigate("/profile");
-    }
-  });
   return (
     <div>
       <GoogleLoginButton callbackURL="/profile" />

packages/web/src/services/user/user.ts

@@ -1,49 +1,18 @@
 import type { UserData } from "@packages/models";
-import type { SelectUser } from "@packages/server/types";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
 import { env } from "elysia";
 import { api } from "@/lib/api";
-import { onAuthChange } from "@/lib/auth-client.ts";
+import { auth } from "@/lib/auth-client.ts";
 import { queryClient } from "@/lib/tanstack/client.ts";
 import { keys } from "@/lib/tanstack/keys";
 import { sleep } from "@/lib/utils/sleep";
 
-onAuthChange.subscribe(() => {
-  queryClient.invalidateQueries({
-    queryKey: keys.users.currentUser,
-  });
-});
-
 export const useCurrentUserQuery = () => {
-  return useQuery({
-    queryKey: keys.users.currentUser,
-    queryFn: async (): Promise<
-      | {
-          ok: true;
-          data: SelectUser;
-        }
-      | {
-          ok: false;
-          error: Error;
-        }
-    > => {
-      if (env.dev) {
-        await sleep(500);
-      }
-      // TODO: set up mocker
-      const { data, error } = await api.users.me.get();
-      if (error) {
-        return {
-          ok: false,
-          error,
-        };
-      }
-      return {
-        ok: true,
-        data,
-      };
-    },
-  });
+  const session = auth.useSession();
+  return {
+    ...session,
+    data: session.data?.user,
+  };
 };
 
 export const useUpdateUserMutation = () => {