Merge pull request #27 from nuthx/dev-0.0.6

Dev 0.0.6

Author: nuthx

app/api/auth/login/route.js

@@ -1,4 +1,4 @@
-import crypto from "crypto";
+import jwt from "jsonwebtoken";
 import { UAParser } from "ua-parser-js";
 import { cookies } from "next/headers";
 import { prisma } from "@/lib/db";
@@ -38,10 +38,15 @@ export async function POST(request) {
       });
     }
 
-    // Create user token
-    const token = crypto.createHash("sha256")
-      .update(user.password + user.username + Date.now().toString())
-      .digest("hex");
+    // Create JWT
+    const token = jwt.sign(
+      { 
+        userId: user.id,
+        username: user.username
+      },
+      process.env.JWT_SECRET,
+      { expiresIn: "30d" }
+    );
 
     // Get user agent
     const ua = UAParser(request.headers).withClientHints();
@@ -53,11 +58,12 @@ export async function POST(request) {
           token,
           browser: `${ua.browser.name || ""} ${ua.browser.version || ""}`,
           os: `${ua.os.name || ""} ${ua.os.version || ""}`,
-          ip: request.headers.get("x-forwarded-for") || ""
+          ip: request.headers.get("x-forwarded-for") || "",
+          expiredAt: new Date(Date.now() + 30 * 86400 * 1000)  // 30 days
         }
       });
     } else {
-      logger.warn(`Non-browser login, token will not be stored in database, user agent: ${ua.ua}`, { model: "POST /api/auth/login" });
+      logger.warn(`Non-browser login, ua: ${ua.ua}`, { model: "POST /api/auth/login" });
     }
 
     // Set cookie
@@ -66,7 +72,7 @@ export async function POST(request) {
       name: "auth_token",
       value: token,
       sameSite: "strict",
-      expires: new Date(Date.now() + 365 * 86400 * 1000) // 1 year
+      expires: new Date(Date.now() + 30 * 86400 * 1000)  // 30 days
     });
 
     return sendResponse(request, {

app/api/auth/verify/route.js

@@ -1,4 +1,4 @@
-import parser from "cron-parser";
+import schedule from "node-schedule";
 import RSSParser from "rss-parser";
 import { prisma } from "@/lib/db";
 import { sendResponse } from "@/lib/http/response";
@@ -67,9 +67,11 @@ export async function POST(request) {
     }
 
     // Check cron validity
-    // This will throw an error if the cron is invalid
+    // Create a new scheduler instance and cancel it immediately to validate the cron
+    // If the cron is invalid, it will throw an error
     try {
-      parser.parseExpression(data.cron);
+      const job = schedule.scheduleJob(data.cron, () => {});
+      job.cancel();
     } catch (error) {
       throw new Error(`Invalid cron: ${data.cron}, error: ${error.message}`);
     }

app/api/feeds/route.js

@@ -8,7 +8,16 @@ export async function GET(request) {
   try {
     const devices = await prisma.device.findMany({
       orderBy: {
-        lastActiveAt: "desc"
+        createdAt: "desc"
+      }
+    });
+
+    // Delete expired devices
+    await prisma.device.deleteMany({
+      where: {
+        expiredAt: {
+          lt: new Date()
+        }
       }
     });
 

app/api/users/device/[id]/route.js

@@ -43,12 +43,11 @@ import {
 } from "@/components/ui/form"
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import { Trash2, Eye, EyeOff } from "lucide-react"
+import { Eye, EyeOff } from "lucide-react"
 
 export default function Devices() {
   const { t } = useTranslation();
   const [showPassword, setShowPassword] = useState(false);
-  const [logoutDevice, setLogoutDevice] = useState(null);
 
   const usernameForm = createForm({
     new_username: { schema: "username" }
@@ -60,7 +59,7 @@ export default function Devices() {
   })();
 
   const { data: usernameData, isLoading: usernameLoading, mutate: mutateUsername } = useData(API.USERNAME, t("toast.failed.fetch_config"));
-  const { data: deviceData, isLoading: deviceLoading, mutate: mutateDevice } = useData(API.DEVICE, t("toast.failed.fetch_config"));
+  const { data: deviceData, isLoading: deviceLoading } = useData(API.DEVICE, t("toast.failed.fetch_config"));
 
   // Set page title
   useEffect(() => {
@@ -91,13 +90,6 @@ export default function Devices() {
     }
   };
 
-  const handleDelete = async (id) => {
-    const result = await handleRequest("DELETE", `${API.DEVICE}/${id}`, null, t("toast.failed.delete"));
-    if (result) {
-      mutateDevice();
-    }
-  };
-
   if (usernameLoading || deviceLoading) {
     return <></>;
   }
@@ -178,49 +170,29 @@ export default function Devices() {
                 <TableHead className="px-2 py-4">{t("st.user.devices.os")}</TableHead>
                 <TableHead className="px-2 py-4">{t("st.user.devices.browser")}</TableHead>
                 <TableHead className="px-2 py-4">{t("st.user.devices.ip")}</TableHead>
-                <TableHead className="px-2 py-4">{t("st.user.devices.last")}</TableHead>
-                <TableHead className="px-3 py-4 w-4"></TableHead>
+                <TableHead className="px-2 py-4">{t("st.user.devices.created")}</TableHead>
+                <TableHead className="px-2 py-4">{t("st.user.devices.expired")}</TableHead>
               </TableRow>
             </TableHeader>
             <TableBody>
               {deviceData?.devices.map((device) => (
                 <TableRow key={device.id} className="hover:bg-transparent">
                   <TableCell className="px-2 py-4">{device.os}</TableCell>
-                  <TableCell className="px-2 py-4">{device.browser}</TableCell>
-                  <TableCell className="px-2 py-4">{device.ip}</TableCell>
                   <TableCell className="px-2 py-4">
-                    {deviceData.currentDevice === device.id ? (
-                      t("st.user.devices.current")
-                    ) : (
-                      new Date(device.lastActiveAt).toLocaleString()
-                    )}
-                  </TableCell>
-                  <TableCell className="px-3 py-4 w-4">
-                    <Button variant="ghost" size="icon" disabled={deviceData.currentDevice === device.id} onClick={() => setLogoutDevice(device)}>
-                      <Trash2 className="text-muted-foreground"/>
-                    </Button>
+                    <div className="flex items-center gap-2">
+                      {device.browser}
+                      {deviceData.currentDevice === device.id && (
+                        <div className="w-2 h-2 rounded-full bg-green-500"></div>
+                      )}
+                    </div>
                   </TableCell>
+                  <TableCell className="px-2 py-4">{device.ip}</TableCell>
+                  <TableCell className="px-2 py-4">{new Date(device.createdAt).toLocaleString()}</TableCell>
+                  <TableCell className="px-2 py-4">{new Date(device.expiredAt).toLocaleString()}</TableCell>
                 </TableRow>
               ))}
             </TableBody>
           </Table>
-
-          <AlertDialog open={logoutDevice !== null} onOpenChange={(open) => !open && setLogoutDevice(null)}>
-            <AlertDialogContent>
-              <AlertDialogHeader>
-                <AlertDialogTitle>{t("glb.confirm_logout")}</AlertDialogTitle>
-                <AlertDialogDescription>{t("st.user.devices.alert")}</AlertDialogDescription>
-              </AlertDialogHeader>
-              <AlertDialogFooter>
-                <AlertDialogCancel>
-                  {t("glb.cancel")}
-                </AlertDialogCancel>
-                <AlertDialogAction onClick={() => { handleDelete(logoutDevice.id); setLogoutDevice(null); }}>
-                  {t("glb.logout")}
-                </AlertDialogAction>
-              </AlertDialogFooter>
-            </AlertDialogContent>
-          </AlertDialog>
         </CardContent>
       </Card>
     </>

app/api/users/device/route.js

@@ -283,7 +283,8 @@
         "os": "Operating System",
         "browser": "Browser",
         "ip": "IP Address",
-        "last": "Last Used",
+        "created": "Created Time",
+        "expired": "Expired Time",
         "current": "This Device",
         "alert": "After logging out, you will need to log in again the next time you use the device."
       }

app/settings/user/page.js

@@ -283,7 +283,8 @@
         "os": "操作系统",
         "browser": "浏览器",
         "ip": "IP 地址",
-        "last": "最后使用",
+        "created": "创建时间",
+        "expired": "过期时间",
         "current": "当前设备",
         "alert": "登出设备后，下次使用该设备时，需要重新登录"
       }

i18n/locales/en.json

@@ -1,6 +1,6 @@
 import { toast } from "sonner";
 
-export async function handleRequest(method, api, values = null, errorTitle = "", showError = true) {
+export async function handleRequest(method, api, values = null, errorTitle = "") {
   try {
     const response = await fetch(api, {
       method: method,
@@ -15,10 +15,8 @@ export async function handleRequest(method, api, values = null, errorTitle = "",
 
     return result;
   } catch (error) {
-    if (showError) {
-      toast.error(errorTitle, {
-        description: error.message
-      });
-    }
+    toast.error(errorTitle, {
+      description: error.message
+    });
   }
 };

i18n/locales/zh.json

@@ -1,42 +1,41 @@
 import { NextResponse } from "next/server";
-import { handleRequest } from "@/lib/http/request";
+import { jwtVerify } from "jose";
 
 export async function middleware(request) {
   const token = request.cookies.get("auth_token");
-  const isAuthenticated = await verifyToken(token, request.nextUrl.origin);
-
-  // If logged in, redirect login page to homepage
-  if (request.nextUrl.pathname === "/login") {
-    return isAuthenticated
-      ? NextResponse.redirect(new URL("/", request.url))
-      : NextResponse.next();
-  }
+  const isAuthenticated = await verifyToken(token);
 
   // Exclude auth routes
   if (request.nextUrl.pathname.startsWith("/api/auth")) {
     return NextResponse.next();
   }
 
-  // Check login status
-  if (isAuthenticated) {
-    return NextResponse.next();
+  // Redirect login page by login status
+  if (request.nextUrl.pathname === "/login") {
+    return isAuthenticated 
+      ? NextResponse.redirect(new URL("/anime", request.url))
+      : NextResponse.next();
   }
 
   // If not logged in, return with different response
-  if (request.nextUrl.pathname.startsWith("/api")) {
-    // For API routes, return 401 Unauthorized
-    return NextResponse.json({ code: 401, message: "Unauthorized" }, { status: 401 });
-  } else {
-    // For other routes, redirect to login page
-    return NextResponse.redirect(new URL("/login", request.url));
+  if (!isAuthenticated) {
+    return request.nextUrl.pathname.startsWith("/api")
+      ? NextResponse.json({ code: 401, message: "Unauthorized", data: null }, { status: 401 })
+      : NextResponse.redirect(new URL("/login", request.url));
   }
+
+  return NextResponse.next();
 }
 
-// Check token availability
-async function verifyToken(token, origin) {
+async function verifyToken(token) {
   if (!token) return false;
-  const result = await handleRequest("POST", `${origin}/api/auth/verify`, { token }, "", false);
-  return result;
+  try {
+    const secret = new TextEncoder().encode(process.env.JWT_SECRET);
+    await jwtVerify(token.value, secret);
+    return true;
+  } catch (error) {
+    return false;
+  }
 }
 
 export const config = {