将next-auth替换为better-auth

src/app/(features)/memorize/Memorize.tsx

@@ -1,13 +1,13 @@
 "use client";
 
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import LightButton from "@/components/buttons/LightButton";
 import { useAudioPlayer } from "@/hooks/useAudioPlayer";
 import { getTTSAudioUrl } from "@/lib/browser/tts";
 import { VOICES } from "@/config/locales";
 import { useTranslations } from "next-intl";
 import localFont from "next/font/local";
-import { isNonNegativeInteger } from "@/lib/utils";
+import { isNonNegativeInteger, SeededRandom } from "@/lib/utils";
 import { Pair } from "../../../../generated/prisma/browser";
 
 const myFont = localFont({
@@ -27,20 +27,16 @@ const Memorize: React.FC<MemorizeProps> = ({ textPairs }) => {
   const [show, setShow] = useState<"question" | "answer">("question");
   const { load, play } = useAudioPlayer();
 
-  const [disorderedTextPairs, setDisorderedTextPairs] = useState<Pair[]>(
-    [],
-  );
+  if (textPairs.length === 0) {
+    return <p>{t("noTextPairs")}</p>;
+  }
 
-  useEffect(() => {
-    setDisorderedTextPairs(textPairs.toSorted(() => Math.random() - 0.5));
-  }, [textPairs]);
+  const rng = new SeededRandom(textPairs[0].folderId);
+  const disorderedTextPairs = textPairs.toSorted(() => rng.next() - 0.5);
 
-  const getTextPairs = () => {
-    if (disorder) {
-      return disorderedTextPairs;
-    }
-    return textPairs.toSorted((a, b) => a.id - b.id);
-  };
+  textPairs.sort((a, b) => a.id - b.id);
+
+  const getTextPairs = () => disorder ? disorderedTextPairs : textPairs;
 
   return (
     <>
@@ -120,7 +116,7 @@ const Memorize: React.FC<MemorizeProps> = ({ textPairs }) => {
                         (v) =>
                           v.locale ===
                           getTextPairs()[newIndex][
-                            reverse ? "locale2" : "locale1"
+                          reverse ? "locale2" : "locale1"
                           ],
                       )!.short_name,
                     ).then((url) => {

src/app/(features)/memorize/page.tsx

@@ -1,51 +1,51 @@
-"use server";
-
 import { redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import {
   getFoldersWithTotalPairsByUserId,
   getUserIdByFolderId,
-} from "@/lib/actions/services/folderService";
+} from "@/lib/server/services/folderService";
 import { isNonNegativeInteger } from "@/lib/utils";
 import FolderSelector from "./FolderSelector";
 import Memorize from "./Memorize";
-import { getPairsByFolderId } from "@/lib/actions/services/pairService";
+import { getPairsByFolderId } from "@/lib/server/services/pairService";
 import { auth } from "@/auth";
+import { headers } from "next/headers";
 
 export default async function MemorizePage({
   searchParams,
 }: {
-  searchParams: Promise<{ folder_id?: string }>;
+  searchParams: Promise<{ folder_id?: string; }>;
 }) {
-  const session = await auth();
-  const userId = session?.user?.id;
+  const session = await auth.api.getSession({ headers: await headers() });
+  const tParam = (await searchParams).folder_id;
+
+  if (!session) {
+    redirect(
+      `/login?redirect=/memorize${(await searchParams).folder_id
+        ? `?folder_id=${tParam}`
+        : ""
+      }`,
+    );
+  }
+
   const t = await getTranslations("memorize.page");
 
-  const tParam = (await searchParams).folder_id;
   const folder_id = tParam
     ? isNonNegativeInteger(tParam)
       ? parseInt(tParam)
       : null
     : null;
 
-  if (!userId) {
-    redirect(
-      `/login?redirect=/memorize${folder_id ? `?folder_id=${folder_id}` : ""}`,
-    );
-  }
-
-  const uid = Number(userId);
-
   if (!folder_id) {
     return (
       <FolderSelector
-        folders={await getFoldersWithTotalPairsByUserId(uid)}
+        folders={await getFoldersWithTotalPairsByUserId(session.user.id)}
       />
     );
   }
 
   const owner = await getUserIdByFolderId(folder_id);
-  if (owner !== uid) {
+  if (owner !== session.user.id) {
     return <p>{t("unauthorized")}</p>;
   }