update login error message

This commit is contained in:
Fran Jurmanović
2025-08-27 21:33:28 +02:00
parent 9ce5802dc6
commit 55e0370004
5 changed files with 51 additions and 10 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 126 KiB

View File

@@ -1,6 +1,15 @@
import { loginAction } from '@/lib/actions/auth'; 'use client';
import { loginAction, LoginResult } from '@/lib/actions/auth';
import { useActionState } from 'react';
const initialState: LoginResult = {
message: '',
success: true
};
export default function LoginPage() { export default function LoginPage() {
const [state, formAction] = useActionState(loginAction, initialState);
return ( return (
<div className="flex min-h-screen items-center justify-center bg-gray-900 px-4"> <div className="flex min-h-screen items-center justify-center bg-gray-900 px-4">
<div className="w-full max-w-md space-y-8 rounded-lg bg-gray-800 p-8 shadow-lg"> <div className="w-full max-w-md space-y-8 rounded-lg bg-gray-800 p-8 shadow-lg">
@@ -8,8 +17,13 @@ export default function LoginPage() {
<h1 className="text-3xl font-bold text-white">ACC Server Manager</h1> <h1 className="text-3xl font-bold text-white">ACC Server Manager</h1>
<p className="mt-2 text-gray-400">Sign in to manage your servers</p> <p className="mt-2 text-gray-400">Sign in to manage your servers</p>
</div> </div>
{state?.success ? null : (
<div className="rounded-md border border-red-700 bg-red-900/50 p-3 text-sm text-red-200">
{state?.message}
</div>
)}
<form action={loginAction} className="space-y-6"> <form action={formAction} className="space-y-6">
<div> <div>
<label htmlFor="username" className="mb-2 block text-sm font-medium text-gray-300"> <label htmlFor="username" className="mb-2 block text-sm font-medium text-gray-300">
Username Username

View File

@@ -4,13 +4,21 @@ import { redirect } from 'next/navigation';
import { loginUser } from '@/lib/api/server/auth'; import { loginUser } from '@/lib/api/server/auth';
import { login, logout } from '@/lib/auth/server'; import { login, logout } from '@/lib/auth/server';
export async function loginAction(formData: FormData) { export type LoginResult = {
success: boolean;
message: string;
};
export async function loginAction(prevState: LoginResult, formData: FormData) {
try { try {
const username = formData.get('username') as string; const username = formData.get('username') as string;
const password = formData.get('password') as string; const password = formData.get('password') as string;
if (!username || !password) { if (!username || !password) {
throw new Error('Username and password are required'); return {
success: false,
message: 'Username and password are required'
};
} }
const result = await loginUser(username, password); const result = await loginUser(username, password);
@@ -18,10 +26,16 @@ export async function loginAction(formData: FormData) {
if (result.token && result.user) { if (result.token && result.user) {
await login(result.token, result.user); await login(result.token, result.user);
} else { } else {
throw new Error('Invalid credentials'); return {
success: false,
message: 'Invalid credentials'
};
} }
} catch (error) { } catch (error) {
throw new Error(error instanceof Error ? error.message : 'Authentication failed'); return {
success: false,
message: error instanceof Error ? error.message : 'Authentication failed'
};
} }
redirect('/dashboard'); redirect('/dashboard');

View File

@@ -11,7 +11,10 @@ export async function startServerAction(serverId: string) {
revalidatePath('/dashboard'); revalidatePath('/dashboard');
revalidatePath(`/dashboard/server/${serverId}`); revalidatePath(`/dashboard/server/${serverId}`);
} catch (error) { } catch (error) {
throw new Error(error instanceof Error ? error.message : 'Failed to start server'); return {
success: false,
message: error instanceof Error ? error.message : 'Failed to start server'
};
} }
} }
@@ -22,7 +25,10 @@ export async function stopServerAction(serverId: string) {
revalidatePath('/dashboard'); revalidatePath('/dashboard');
revalidatePath(`/dashboard/server/${serverId}`); revalidatePath(`/dashboard/server/${serverId}`);
} catch (error) { } catch (error) {
throw new Error(error instanceof Error ? error.message : 'Failed to stop server'); return {
success: false,
message: error instanceof Error ? error.message : 'Failed to stop server'
};
} }
} }
@@ -33,6 +39,9 @@ export async function restartServerAction(serverId: string) {
revalidatePath('/dashboard'); revalidatePath('/dashboard');
revalidatePath(`/dashboard/server/${serverId}`); revalidatePath(`/dashboard/server/${serverId}`);
} catch (error) { } catch (error) {
throw new Error(error instanceof Error ? error.message : 'Failed to restart server'); return {
success: false,
message: error instanceof Error ? error.message : 'Failed to restart server'
};
} }
} }

View File

@@ -15,7 +15,11 @@ export async function loginUser(username: string, password: string) {
}); });
if (!response.ok) { if (!response.ok) {
throw new Error(`Login failed: ${response.statusText} - ${BASE_URL}${authRoute}/login`); if (response.status === 401) {
throw new Error(`Invalid credentials`);
}
throw new Error(`Login failed: ${response.statusText}`);
} }
const { token } = await response.json(); const { token } = await response.json();