Skip to content

Commit 5aa7554

Browse files
committed
updated route error from NextResponse
1 parent c1e33c0 commit 5aa7554

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

app/classrooms/join/[code]/route.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { NextResponse, NextRequest } from "next/server";
1+
import { NextRequest } from "next/server";
22
import { createServiceClient } from "@shared/utils/supabase/service-server";
33
import { getCurrentUserIdServer } from "@shared/lib/supabase/shared";
4+
import { redirect } from "next/navigation";
45

56
export async function GET(
67
request: NextRequest,
@@ -21,7 +22,7 @@ export async function GET(
2122

2223
if (classroomError || !classroom) {
2324
console.error("Classroom not found:", classroomError);
24-
return NextResponse.redirect(new URL("/classrooms", request.url));
25+
return redirect("/classrooms");
2526
}
2627

2728
//ensures that the user is authenticated
@@ -30,7 +31,7 @@ export async function GET(
3031
if (!userId) {
3132
console.error("User is not authenticated");
3233
//login page
33-
return NextResponse.redirect(new URL("/login", request.url));
34+
return redirect("/classrooms/login");
3435
}
3536

3637
//if the person is already in there, should be redirect to just classroom
@@ -43,11 +44,11 @@ export async function GET(
4344

4445
if (memberError) {
4546
console.error("Error checking membership:", memberError);
46-
return NextResponse.redirect(new URL("/classrooms", request.url));
47+
return redirect("/classrooms");
4748
}
4849

4950
if (existingMember) {
50-
return NextResponse.redirect(new URL("/classrooms", request.url));
51+
return redirect("/classrooms");
5152
}
5253

5354
const { error: insertError } = await supabase
@@ -59,11 +60,12 @@ export async function GET(
5960

6061
if (insertError) {
6162
console.error("Error adding member to classroom:", insertError);
62-
return NextResponse.redirect(new URL("/classrooms", request.url));
63+
return redirect("/classrooms");
6364
}
6465
//redirect to classroom
6566

66-
const success_url = new URL("/classrooms", request.url);
67-
success_url.searchParams.append("join_success", classroom.id.toString());
68-
return NextResponse.redirect(success_url);
67+
const successParams = new URLSearchParams({
68+
join_success: classroom.id.toString(),
69+
});
70+
return redirect(`/classrooms?${successParams.toString()}`);
6971
}

0 commit comments

Comments
 (0)