取消了memorize folder界面的身份验证
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -2,7 +2,6 @@ import { redirect } from "next/navigation";
|
|||||||
import { getTranslations } from "next-intl/server";
|
import { getTranslations } from "next-intl/server";
|
||||||
import {
|
import {
|
||||||
getFoldersWithTotalPairsByUserId,
|
getFoldersWithTotalPairsByUserId,
|
||||||
getUserIdByFolderId,
|
|
||||||
} from "@/lib/server/services/folderService";
|
} from "@/lib/server/services/folderService";
|
||||||
import { isNonNegativeInteger } from "@/lib/utils";
|
import { isNonNegativeInteger } from "@/lib/utils";
|
||||||
import FolderSelector from "./FolderSelector";
|
import FolderSelector from "./FolderSelector";
|
||||||
@@ -16,18 +15,8 @@ export default async function MemorizePage({
|
|||||||
}: {
|
}: {
|
||||||
searchParams: Promise<{ folder_id?: string; }>;
|
searchParams: Promise<{ folder_id?: string; }>;
|
||||||
}) {
|
}) {
|
||||||
const session = await auth.api.getSession({ headers: await headers() });
|
|
||||||
const tParam = (await searchParams).folder_id;
|
const tParam = (await searchParams).folder_id;
|
||||||
|
|
||||||
if (!session) {
|
|
||||||
redirect(
|
|
||||||
`/auth?redirect=/memorize${(await searchParams).folder_id
|
|
||||||
? `?folder_id=${tParam}`
|
|
||||||
: ""
|
|
||||||
}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const t = await getTranslations("memorize.page");
|
const t = await getTranslations("memorize.page");
|
||||||
|
|
||||||
const folder_id = tParam
|
const folder_id = tParam
|
||||||
@@ -37,6 +26,8 @@ export default async function MemorizePage({
|
|||||||
: null;
|
: null;
|
||||||
|
|
||||||
if (!folder_id) {
|
if (!folder_id) {
|
||||||
|
const session = await auth.api.getSession({ headers: await headers() });
|
||||||
|
if(!session) redirect("/auth?redirect=/memorize")
|
||||||
return (
|
return (
|
||||||
<FolderSelector
|
<FolderSelector
|
||||||
folders={await getFoldersWithTotalPairsByUserId(session.user.id)}
|
folders={await getFoldersWithTotalPairsByUserId(session.user.id)}
|
||||||
@@ -44,10 +35,5 @@ export default async function MemorizePage({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const owner = await getUserIdByFolderId(folder_id);
|
|
||||||
if (owner !== session.user.id) {
|
|
||||||
return <p>{t("unauthorized")}</p>;
|
|
||||||
}
|
|
||||||
|
|
||||||
return <Memorize textPairs={await getPairsByFolderId(folder_id)} />;
|
return <Memorize textPairs={await getPairsByFolderId(folder_id)} />;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user