refactor: pure JWT auth, no cookies
All checks were successful
Deploy Web Client / deploy (push) Successful in 12s
All checks were successful
Deploy Web Client / deploy (push) Successful in 12s
- Remove middleware (no SSR auth check) - AuthGuard component checks localStorage token - Protected route group (protected) wraps all pages - Login page is public - All API calls use Authorization: Bearer header
This commit is contained in:
parent
747ad8d7a8
commit
5ce87e088b
5
src/app/(protected)/layout.tsx
Normal file
5
src/app/(protected)/layout.tsx
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
import AuthGuard from "@/components/AuthGuard";
|
||||||
|
|
||||||
|
export default function ProtectedLayout({ children }: { children: React.ReactNode }) {
|
||||||
|
return <AuthGuard>{children}</AuthGuard>;
|
||||||
|
}
|
||||||
@ -1,15 +1,20 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { getProjects } from "@/lib/api";
|
import { getProjects, Project } from "@/lib/api";
|
||||||
|
import { logout } from "@/lib/auth-client";
|
||||||
|
|
||||||
export const dynamic = "force-dynamic";
|
export default function Home() {
|
||||||
|
const [projects, setProjects] = useState<Project[]>([]);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
export default async function Home() {
|
useEffect(() => {
|
||||||
let projects;
|
getProjects()
|
||||||
try {
|
.then(setProjects)
|
||||||
projects = await getProjects();
|
.catch(() => {})
|
||||||
} catch {
|
.finally(() => setLoading(false));
|
||||||
projects = [];
|
}, []);
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-screen">
|
<div className="flex h-screen">
|
||||||
@ -18,7 +23,9 @@ export default async function Home() {
|
|||||||
<h1 className="text-4xl font-bold mb-2">Team Board</h1>
|
<h1 className="text-4xl font-bold mb-2">Team Board</h1>
|
||||||
<p className="text-[var(--muted)] mb-8">AI Agent Collaboration Platform</p>
|
<p className="text-[var(--muted)] mb-8">AI Agent Collaboration Platform</p>
|
||||||
|
|
||||||
{projects.length > 0 ? (
|
{loading ? (
|
||||||
|
<p className="text-[var(--muted)]">Загрузка...</p>
|
||||||
|
) : projects.length > 0 ? (
|
||||||
<div className="flex flex-col gap-2">
|
<div className="flex flex-col gap-2">
|
||||||
{projects.map((p) => (
|
{projects.map((p) => (
|
||||||
<Link
|
<Link
|
||||||
@ -35,6 +42,13 @@ export default async function Home() {
|
|||||||
) : (
|
) : (
|
||||||
<p className="text-[var(--muted)]">Нет проектов. Создайте первый через API.</p>
|
<p className="text-[var(--muted)]">Нет проектов. Создайте первый через API.</p>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
<button
|
||||||
|
onClick={logout}
|
||||||
|
className="mt-8 text-xs text-[var(--muted)] hover:text-[var(--fg)] transition-colors"
|
||||||
|
>
|
||||||
|
Выйти
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
@ -1,31 +1,37 @@
|
|||||||
import { getProjects, getTasks } from "@/lib/api";
|
"use client";
|
||||||
import { notFound } from "next/navigation";
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useParams } from "next/navigation";
|
||||||
|
import { getProjects, Project } from "@/lib/api";
|
||||||
import Sidebar from "@/components/Sidebar";
|
import Sidebar from "@/components/Sidebar";
|
||||||
import KanbanBoard from "@/components/KanbanBoard";
|
import KanbanBoard from "@/components/KanbanBoard";
|
||||||
|
|
||||||
export const dynamic = "force-dynamic";
|
export default function ProjectPage() {
|
||||||
|
const { slug } = useParams<{ slug: string }>();
|
||||||
|
const [projects, setProjects] = useState<Project[]>([]);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
interface Props {
|
useEffect(() => {
|
||||||
params: Promise<{ slug: string }>;
|
getProjects()
|
||||||
}
|
.then(setProjects)
|
||||||
|
.catch(() => {})
|
||||||
export default async function ProjectPage({ params }: Props) {
|
.finally(() => setLoading(false));
|
||||||
const { slug } = await params;
|
}, []);
|
||||||
let projects;
|
|
||||||
try {
|
|
||||||
projects = await getProjects();
|
|
||||||
} catch {
|
|
||||||
projects = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
const project = projects.find((p) => p.slug === slug);
|
const project = projects.find((p) => p.slug === slug);
|
||||||
if (!project) return notFound();
|
|
||||||
|
if (loading) {
|
||||||
|
return <div className="flex h-screen items-center justify-center text-[var(--muted)]">Загрузка...</div>;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!project) {
|
||||||
|
return <div className="flex h-screen items-center justify-center text-[var(--muted)]">Проект не найден</div>;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-screen">
|
<div className="flex h-screen">
|
||||||
<Sidebar projects={projects} activeSlug={slug} />
|
<Sidebar projects={projects} activeSlug={slug} />
|
||||||
<main className="flex-1 flex flex-col overflow-hidden">
|
<main className="flex-1 flex flex-col overflow-hidden">
|
||||||
{/* Header */}
|
|
||||||
<header className="border-b border-[var(--border)] px-6 py-4 flex items-center gap-4">
|
<header className="border-b border-[var(--border)] px-6 py-4 flex items-center gap-4">
|
||||||
<div>
|
<div>
|
||||||
<h1 className="text-xl font-bold">{project.name}</h1>
|
<h1 className="text-xl font-bold">{project.name}</h1>
|
||||||
@ -34,8 +40,6 @@ export default async function ProjectPage({ params }: Props) {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
{/* Kanban */}
|
|
||||||
<div className="flex-1 overflow-hidden">
|
<div className="flex-1 overflow-hidden">
|
||||||
<KanbanBoard projectId={project.id} />
|
<KanbanBoard projectId={project.id} />
|
||||||
</div>
|
</div>
|
||||||
@ -1,4 +1,3 @@
|
|||||||
import { cookies } from "next/headers";
|
|
||||||
import { NextRequest, NextResponse } from "next/server";
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
import { createToken } from "@/lib/auth";
|
import { createToken } from "@/lib/auth";
|
||||||
|
|
||||||
@ -14,17 +13,6 @@ export async function POST(req: NextRequest) {
|
|||||||
name: username,
|
name: username,
|
||||||
provider: "local",
|
provider: "local",
|
||||||
});
|
});
|
||||||
|
|
||||||
// Set cookie server-side (reliable, httpOnly)
|
|
||||||
const jar = await cookies();
|
|
||||||
jar.set("tb_token", token, {
|
|
||||||
httpOnly: true,
|
|
||||||
secure: true,
|
|
||||||
sameSite: "lax",
|
|
||||||
maxAge: 7 * 24 * 3600,
|
|
||||||
path: "/",
|
|
||||||
});
|
|
||||||
|
|
||||||
return NextResponse.json({ token, user: { name: username, provider: "local" } });
|
return NextResponse.json({ token, user: { name: username, provider: "local" } });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,14 +1,13 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { useRouter } from "next/navigation";
|
import { setToken } from "@/lib/auth-client";
|
||||||
|
|
||||||
export default function LoginPage() {
|
export default function LoginPage() {
|
||||||
const [username, setUsername] = useState("");
|
const [username, setUsername] = useState("");
|
||||||
const [password, setPassword] = useState("");
|
const [password, setPassword] = useState("");
|
||||||
const [error, setError] = useState("");
|
const [error, setError] = useState("");
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const router = useRouter();
|
|
||||||
|
|
||||||
const handleSubmit = async (e: React.FormEvent) => {
|
const handleSubmit = async (e: React.FormEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@ -22,9 +21,7 @@ export default function LoginPage() {
|
|||||||
});
|
});
|
||||||
const data = await res.json();
|
const data = await res.json();
|
||||||
if (res.ok && data.token) {
|
if (res.ok && data.token) {
|
||||||
// Token stored in localStorage for API calls
|
setToken(data.token);
|
||||||
localStorage.setItem("tb_token", data.token);
|
|
||||||
// Cookie set server-side via Set-Cookie header
|
|
||||||
window.location.href = "/";
|
window.location.href = "/";
|
||||||
} else {
|
} else {
|
||||||
setError(data.error || "Ошибка авторизации");
|
setError(data.error || "Ошибка авторизации");
|
||||||
|
|||||||
28
src/components/AuthGuard.tsx
Normal file
28
src/components/AuthGuard.tsx
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { isAuthenticated } from "@/lib/auth-client";
|
||||||
|
|
||||||
|
export default function AuthGuard({ children }: { children: React.ReactNode }) {
|
||||||
|
const router = useRouter();
|
||||||
|
const [checked, setChecked] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!isAuthenticated()) {
|
||||||
|
router.replace("/login");
|
||||||
|
} else {
|
||||||
|
setChecked(true);
|
||||||
|
}
|
||||||
|
}, [router]);
|
||||||
|
|
||||||
|
if (!checked) {
|
||||||
|
return (
|
||||||
|
<div className="flex h-screen items-center justify-center text-[var(--muted)]">
|
||||||
|
Загрузка...
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return <>{children}</>;
|
||||||
|
}
|
||||||
@ -1,10 +1,21 @@
|
|||||||
/**
|
/**
|
||||||
* Client-side auth helpers.
|
* Client-side JWT auth.
|
||||||
|
* Token stored in localStorage, sent as Authorization: Bearer header.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
const TOKEN_KEY = "tb_token";
|
||||||
|
|
||||||
export function getToken(): string | null {
|
export function getToken(): string | null {
|
||||||
if (typeof window === "undefined") return null;
|
if (typeof window === "undefined") return null;
|
||||||
return localStorage.getItem("tb_token");
|
return localStorage.getItem(TOKEN_KEY);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setToken(token: string) {
|
||||||
|
localStorage.setItem(TOKEN_KEY, token);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function clearToken() {
|
||||||
|
localStorage.removeItem(TOKEN_KEY);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isAuthenticated(): boolean {
|
export function isAuthenticated(): boolean {
|
||||||
@ -12,7 +23,6 @@ export function isAuthenticated(): boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function logout() {
|
export function logout() {
|
||||||
localStorage.removeItem("tb_token");
|
clearToken();
|
||||||
document.cookie = "tb_token=; path=/; max-age=0";
|
|
||||||
window.location.href = "/login";
|
window.location.href = "/login";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,27 +0,0 @@
|
|||||||
import { NextRequest, NextResponse } from "next/server";
|
|
||||||
import { verifyToken } from "@/lib/auth";
|
|
||||||
|
|
||||||
export async function middleware(req: NextRequest) {
|
|
||||||
// Check Authorization header (API calls)
|
|
||||||
const authHeader = req.headers.get("authorization");
|
|
||||||
if (authHeader) {
|
|
||||||
const token = authHeader.replace("Bearer ", "");
|
|
||||||
const payload = await verifyToken(token);
|
|
||||||
if (payload) return NextResponse.next();
|
|
||||||
return NextResponse.json({ error: "Invalid token" }, { status: 401 });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check cookie (browser navigation)
|
|
||||||
const token = req.cookies.get("tb_token")?.value;
|
|
||||||
if (token) {
|
|
||||||
const payload = await verifyToken(token);
|
|
||||||
if (payload) return NextResponse.next();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Redirect to login
|
|
||||||
return NextResponse.redirect(new URL("/login", req.url));
|
|
||||||
}
|
|
||||||
|
|
||||||
export const config = {
|
|
||||||
matcher: ["/((?!login|api/auth|_next/static|_next/image|favicon.ico).*)"],
|
|
||||||
};
|
|
||||||
Loading…
Reference in New Issue
Block a user