makearmy/makearmy-app
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity Actions

account routing fix

Browse source
This commit is contained in:
makearmy 2025-09-30 01:10:20 -04:00
parent b694e90548
commit 6a3f69486c
1 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/api/account/route.ts
View file

@ -5,44 +5,34 @@ import { NextResponse } from "next/server";
import { requireBearer } from "@/app/api/_lib/auth"; import { requireBearer } from "@/app/api/_lib/auth";
const API = (process.env.NEXT_PUBLIC_API_BASE_URL || "").replace(/\/$/, ""); const API = (process.env.NEXT_PUBLIC_API_BASE_URL || "").replace(/\/$/, "");
const bad = (m: string, c = 400) => NextResponse.json({ error: m }, { status: c }); const bad = (m: string, c = 400) => NextResponse.json({ error: m }, { status: c });
/** /** GET: current user's profile */
* GET: return current user's profile export async function GET(req: Request) {
* shape: { ok: true, user: {...} } or { error }
*/
export async function GET() {
try { try {
const bearer = requireBearer(); // reads cookie from NextRequest internally const bearer = requireBearer(req); // ← pass req
const fields = const fields =
"id,username,first_name,last_name,email,location,avatar.id,avatar.filename_download"; "id,username,first_name,last_name,email,location,avatar.id,avatar.filename_download";
const res = await fetch(`${API}/users/me?fields=${encodeURIComponent(fields)}`, { const res = await fetch(
headers: { Authorization: bearer }, `${API}/users/me?fields=${encodeURIComponent(fields)}`,
cache: "no-store", { headers: { Authorization: bearer }, cache: "no-store" }
}); );
const j = await res.json().catch(() => ({})); const j = await res.json().catch(() => ({}));
if (!res.ok) { if (!res.ok) {
// propagate Directus status (401, 403, etc) instead of throwing
const msg = j?.errors?.[0]?.message || "Failed to load profile"; const msg = j?.errors?.[0]?.message || "Failed to load profile";
return NextResponse.json({ error: msg }, { status: res.status }); return NextResponse.json({ error: msg }, { status: res.status });
} }
return NextResponse.json({ ok: true, user: j?.data ?? j }); return NextResponse.json({ ok: true, user: j?.data ?? j });
} catch (e: any) { } catch (e: any) {
// if requireBearer threw due to missing cookie, present 401 cleanly
const status = e?.status === 401 ? 401 : e?.status || 500; const status = e?.status === 401 ? 401 : e?.status || 500;
return bad(e?.message || "Unexpected error", status); return bad(e?.message || "Unexpected error", status);
} }
} }
/** /** PATCH: update editable fields for current user */
* PATCH: update current user's editable fields
* accepts any subset of: first_name, last_name, email (optional), location, avatar
*/
export async function PATCH(req: Request) { export async function PATCH(req: Request) {
try { try {
const bearer = requireBearer(req); const bearer = requireBearer(req);
@ -53,7 +43,7 @@ export async function PATCH(req: Request) {
if (typeof body.last_name === "string") payload.last_name = body.last_name.trim(); if (typeof body.last_name === "string") payload.last_name = body.last_name.trim();
if ("email" in body) { if ("email" in body) {
const e = String(body.email ?? "").trim(); const e = String(body.email ?? "").trim();
payload.email = e ? e : null; // email optional; blank clears payload.email = e ? e : null; // optional; blank clears
} }
if (typeof body.location === "string") payload.location = body.location.trim(); if (typeof body.location === "string") payload.location = body.location.trim();
if (typeof body.avatar === "string") payload.avatar = body.avatar; // file id if (typeof body.avatar === "string") payload.avatar = body.avatar; // file id
@ -65,7 +55,6 @@ export async function PATCH(req: Request) {
headers: { Authorization: bearer, "Content-Type": "application/json" }, headers: { Authorization: bearer, "Content-Type": "application/json" },
body: JSON.stringify(payload), body: JSON.stringify(payload),
}); });
const j = await res.json().catch(() => ({})); const j = await res.json().catch(() => ({}));
if (!res.ok) { if (!res.ok) {