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

hopefully final username and source/lens submission fix

Browse source
This commit is contained in:
makearmy 2025-09-28 10:55:44 -04:00
parent 28d363cdfe
commit 23ede9c872
5 changed files with 736 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/api/me/route.ts
View file

@ -1,28 +1,34 @@
// app/api/me/route.ts
import { NextResponse } from "next/server";
/** Read a cookie value from a raw Cookie header string */
function readCookie(name: string, cookieHeader: string) {
const m = cookieHeader.match(new RegExp(`(?:^|;\\s*)${name}=([^;]+)`));
return m?.[1] ?? null;
}
export async function GET(req: Request) {
const base = process.env.NEXT_PUBLIC_API_BASE_URL!;
const url = `${base}/users/me?fields=id,username,display_name,first_name,last_name,email`;
// Prefer DIRECTUS_URL if present; fall back to NEXT_PUBLIC_API_BASE_URL
const base =
process.env.DIRECTUS_URL || process.env.NEXT_PUBLIC_API_BASE_URL || "";
const url = `${base.replace(/\/$/, "")}/users/me?fields=id,username,display_name,first_name,last_name,email`;
// Forward the incoming cookies (session), and also ma_at as Bearer (token setups)
const cookieHeader = req.headers.get("cookie") ?? "";
const ma_at = readCookie("ma_at", cookieHeader);
const headers: Record<string, string> = { "cache-control": "no-store" };
if (cookieHeader) headers.cookie = cookieHeader; // session cookie
if (ma_at) headers.authorization = `Bearer ${ma_at}`; // direct token (if present)
if (cookieHeader) headers.cookie = cookieHeader;
if (ma_at) headers.authorization = `Bearer ${ma_at}`;
const res = await fetch(url, { headers, cache: "no-store" });
const raw = await res.json().catch(() => ({}));
const data = raw?.data ?? raw ?? null; // normalize
const res = await fetch(url, { headers, cache: "no-store" });
const body = await res.json().catch(() => ({}));
return NextResponse.json(
{ data },
{ status: res.status, headers: { "content-type": "application/json", "cache-control": "no-store" } }
);
return new NextResponse(JSON.stringify(body), {
status: res.status,
headers: {
"content-type": "application/json",
"cache-control": "no-store",
},
});
}