Merge branch 'hamster1963:main' into main

app/(main)/layout.tsx

@@ -8,16 +8,24 @@ import React from "react";
 type DashboardProps = {
   children: React.ReactNode;
 };
-export default async function MainLayout({ children }: DashboardProps) {
+export default function MainLayout({ children }: DashboardProps) {
-  const session = await auth();
-
   return (
     <div className="flex min-h-screen w-full flex-col">
       <main className="flex min-h-[calc(100vh_-_theme(spacing.16))] flex-1 flex-col gap-4 bg-background p-4 md:p-10 md:pt-8">
         <Header />
-        {!session && getEnv("SitePassword") ? <SignIn /> : children}
+        <AuthProtected>{children}</AuthProtected>
         <Footer />
       </main>
     </div>
   );
 }
+
+async function AuthProtected({ children }: DashboardProps) {
+  if (getEnv("SitePassword")) {
+    const session = await auth();
+    if (!session) {
+      return <SignIn />;
+    }
+  }
+  return children;
+}

app/api/detail/route.ts

@@ -12,11 +12,12 @@ interface ResError extends Error {
 }
 
 export async function GET(req: NextRequest) {
+  if (getEnv("SitePassword")) {
     const session = await auth();
-
+    if (!session) {
-  if (!session && getEnv("SitePassword")) {
       redirect("/");
     }
+  }
 
   const { searchParams } = new URL(req.url);
   const server_id = searchParams.get("server_id");

app/api/monitor/route.ts

@@ -12,14 +12,16 @@ interface ResError extends Error {
 }
 
 export async function GET(req: NextRequest) {
+  if (getEnv("SitePassword")) {
     const session = await auth();
-
+    if (!session) {
-  if (!session && getEnv("SitePassword")) {
       redirect("/");
     }
+  }
 
   const { searchParams } = new URL(req.url);
   const server_id = searchParams.get("server_id");
+
   if (!server_id) {
     return NextResponse.json(
       { error: "server_id is required" },

app/api/server/route.ts

@@ -12,11 +12,12 @@ interface ResError extends Error {
 }
 
 export async function GET() {
+  if (getEnv("SitePassword")) {
     const session = await auth();
-
+    if (!session) {
-  if (!session && getEnv("SitePassword")) {
       redirect("/");
     }
+  }
 
   try {
     const data = await GetNezhaData();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nezha-dash",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "private": true,
   "scripts": {
     "dev": "next dev -p 3020",