FIX OF ALL ISSUES WITH LOG IN PAGE. EVERYTHING TO THE POINT OF TESTING THE MAP WORKS SO FAR.

This commit is contained in:
bobbert committed 2025-03-15 00:22:47 +00:00
1 parent 84f010cb87
commit c79a9636a7
10 files changed
+228 -233

No files matched your search

+24 -31
View File
@@ -1,44 +1,40 @@
import { query, queryOne } from "@/lib/db";
import { cookies } from "next/headers";
import { verifyToken } from "@/app/api/auth/[...nextauth]/route";
import { queryOne, query } from "@/lib/db";
import { getToken } from "next-auth/jwt";
export const dynamic = "force-dynamic"; // Disable static rendering and caching
export async function GET(request, context) {
try {
// Use our custom token verification
const cookieStore = await cookies();
const sessionToken = cookieStore.get("next-auth.session-token")?.value;
if (!sessionToken) {
const token = await getToken({
req: request,
secret:
process.env.NEXTAUTH_SECRET ||
"your-fallback-secret-should-be-at-least-32-chars",
});
if (!token) {
return Response.json({ error: "Unauthorized" }, { status: 401 });
}
const userData = verifyToken(sessionToken);
if (!userData) {
return Response.json({ error: "Invalid session" }, { status: 401 });
// Use token.teamId for validation
if (
!token.teamId ||
parseInt(token.teamId, 10) !== parseInt(context.params.teamId, 10)
) {
return Response.json(
{ error: "Not authorized to view this team" },
{ status: 403 }
);
}
// FIXED: Always await context.params before accessing properties
// This approach ensures we properly handle the promise before accessing teamId
const params = await Promise.resolve(context.params);
const teamId = params?.teamId;
// Validate teamId
if (!teamId || isNaN(parseInt(teamId, 10))) {
return Response.json({ error: "Invalid team ID" }, { status: 400 });
}
const team = await queryOne("SELECT * FROM teams WHERE id = ?", [teamId]);
const team = await queryOne("SELECT * FROM teams WHERE id = ?", [
token.teamId,
]);
if (!team) {
return Response.json({ error: "Team not found" }, { status: 404 });
}
// Use a fresh query to get the latest team members each time
const members = await query(
"SELECT id, username FROM users WHERE team_id = ? ORDER BY username ASC",
[teamId]
[token.teamId]
);
const timestamp = new Date().toISOString(); // Add timestamp for debugging
@@ -62,10 +58,7 @@ export async function GET(request, context) {
}
);
} catch (error) {
console.error("Team fetch error:", error);
return Response.json(
{ error: "Failed to fetch team data" },
{ status: 500 }
);
console.error("Team route error:", error);
return Response.json({ error: "Server error" }, { status: 500 });
}
}