From 7b0acd951e2b8a3fcd07d1069d938783bf07be76 Mon Sep 17 00:00:00 2001
From: Luke Vella <me@lukevella.com>
Date: Thu, 6 Feb 2025 16:18:36 +0700
Subject: [PATCH] Rename callbackUrl to redirectTo

---
 .../[locale]/(auth)/login/components/login-email-form.tsx | 8 ++++----
 .../[locale]/(auth)/login/components/login-with-oidc.tsx  | 6 +++---
 .../app/[locale]/(auth)/login/components/sso-provider.tsx | 6 +++---
 apps/web/src/app/[locale]/(auth)/login/page.tsx           | 6 +++---
 .../[locale]/(auth)/login/verify/components/otp-form.tsx  | 2 +-
 .../(auth)/register/verify/components/otp-form.tsx        | 2 +-
 apps/web/src/app/api/user/verify-email-change/route.ts    | 2 +-
 apps/web/src/components/login-link.tsx                    | 2 +-
 apps/web/src/components/register-link.tsx                 | 2 +-
 apps/web/src/middleware.ts                                | 2 +-
 apps/web/tests/create-delete-poll.spec.ts                 | 2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx b/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
index 141e281f365..5c8a2692058 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
@@ -53,13 +53,13 @@ export function LoginWithEmailForm() {
           if (doesExist) {
             await signIn("email", {
               email: identifier,
-              redirectTo: searchParams?.get("callbackUrl") ?? undefined,
+              redirectTo: searchParams?.get("redirectTo") ?? undefined,
               redirect: false,
             });
-            // redirect to verify page with callbackUrl
+            // redirect to verify page with redirectTo
             router.push(
-              `/login/verify?callbackUrl=${encodeURIComponent(
-                searchParams?.get("callbackUrl") ?? "",
+              `/login/verify?redirectTo=${encodeURIComponent(
+                searchParams?.get("redirectTo") ?? "",
               )}`,
             );
           } else {
diff --git a/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx b/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx
index 083124ddb78..ebe251b2831 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx
@@ -6,16 +6,16 @@ import { Trans } from "@/components/trans";
 
 export async function LoginWithOIDC({
   name,
-  callbackUrl,
+  redirectTo,
 }: {
   name: string;
-  callbackUrl?: string;
+  redirectTo?: string;
 }) {
   return (
     <Button
       onClick={() => {
         signIn("oidc", {
-          redirectTo: callbackUrl,
+          redirectTo: redirectTo,
         });
       }}
       variant="link"
diff --git a/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx b/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx
index cf3ff306fdd..1e0ec531999 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx
@@ -40,11 +40,11 @@ function SSOImage({ provider }: { provider: string }) {
 export function SSOProvider({
   providerId,
   name,
-  callbackUrl,
+  redirectTo,
 }: {
   providerId: string;
   name: string;
-  callbackUrl?: string;
+  redirectTo?: string;
 }) {
   const { t } = useTranslation();
   return (
@@ -58,7 +58,7 @@ export function SSOProvider({
       key={providerId}
       onClick={() => {
         signIn(providerId, {
-          redirectTo: callbackUrl,
+          redirectTo: redirectTo,
         });
       }}
     >
diff --git a/apps/web/src/app/[locale]/(auth)/login/page.tsx b/apps/web/src/app/[locale]/(auth)/login/page.tsx
index 2162676e1af..9750322fb23 100644
--- a/apps/web/src/app/[locale]/(auth)/login/page.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/page.tsx
@@ -24,7 +24,7 @@ export default async function LoginPage({
   searchParams,
 }: {
   searchParams?: {
-    callbackUrl?: string;
+    redirectTo?: string;
   };
 }) {
   const { t } = await getTranslation();
@@ -54,7 +54,7 @@ export default async function LoginPage({
         {oidcProvider ? (
           <LoginWithOIDC
             name={oidcProvider.name}
-            callbackUrl={searchParams?.callbackUrl}
+            redirectTo={searchParams?.redirectTo}
           />
         ) : null}
         {socialProviders ? (
@@ -65,7 +65,7 @@ export default async function LoginPage({
                   key={provider.id}
                   providerId={provider.id}
                   name={provider.options?.name || provider.name}
-                  callbackUrl={searchParams?.callbackUrl}
+                  redirectTo={searchParams?.redirectTo}
                 />
               ) : null,
             )}
diff --git a/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx b/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx
index d0b432bd23a..d9d21e2be5e 100644
--- a/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx
@@ -50,7 +50,7 @@ export function OTPForm({ email }: { email: string }) {
         message: t("wrongVerificationCode"),
       });
     } else {
-      window.location.href = searchParams?.get("callbackUrl") ?? "/";
+      window.location.href = searchParams?.get("redirectTo") ?? "/";
     }
   });
 
diff --git a/apps/web/src/app/[locale]/(auth)/register/verify/components/otp-form.tsx b/apps/web/src/app/[locale]/(auth)/register/verify/components/otp-form.tsx
index 844898ae787..fcc5289a028 100644
--- a/apps/web/src/app/[locale]/(auth)/register/verify/components/otp-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/register/verify/components/otp-form.tsx
@@ -68,7 +68,7 @@ export function OTPForm({ token }: { token: string }) {
 
     signIn("registration-token", {
       token,
-      redirectTo: searchParams?.get("callbackUrl") ?? "/",
+      redirectTo: searchParams?.get("redirectTo") ?? "/",
     });
   });
 
diff --git a/apps/web/src/app/api/user/verify-email-change/route.ts b/apps/web/src/app/api/user/verify-email-change/route.ts
index 9ebe60d6fe8..b941013e9ac 100644
--- a/apps/web/src/app/api/user/verify-email-change/route.ts
+++ b/apps/web/src/app/api/user/verify-email-change/route.ts
@@ -54,7 +54,7 @@ export const GET = async (request: NextRequest) => {
 
   if (!session?.user || !session.user.email) {
     return NextResponse.redirect(
-      new URL(`/login?callbackUrl=${request.url}`, request.url),
+      new URL(`/login?redirectTo=${request.url}`, request.url),
     );
   }
 
diff --git a/apps/web/src/components/login-link.tsx b/apps/web/src/components/login-link.tsx
index ce69d2b0ab0..1902ccfbac4 100644
--- a/apps/web/src/components/login-link.tsx
+++ b/apps/web/src/components/login-link.tsx
@@ -12,7 +12,7 @@ export const LoginLink = React.forwardRef<
     <Link
       ref={ref}
       {...props}
-      href={`/login?callbackUrl=${encodeURIComponent(pathname)}`}
+      href={`/login?redirectTo=${encodeURIComponent(pathname)}`}
     >
       {children}
     </Link>
diff --git a/apps/web/src/components/register-link.tsx b/apps/web/src/components/register-link.tsx
index ab6829441e5..a8cfccc4bc6 100644
--- a/apps/web/src/components/register-link.tsx
+++ b/apps/web/src/components/register-link.tsx
@@ -17,7 +17,7 @@ export const RegisterLink = React.forwardRef<
       onClick={async (e) => {
         e.preventDefault();
         props.onClick?.(e);
-        router.push("/register?callbackUrl=" + encodeURIComponent(pathname));
+        router.push("/register?redirectTo=" + encodeURIComponent(pathname));
       }}
     >
       {children}
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 6bb267c12c5..4a573f144cf 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -40,7 +40,7 @@ export default auth(async (req) => {
     !publicRoutes.some((route) => newUrl.pathname.startsWith(route))
   ) {
     if (newUrl.pathname !== "/") {
-      newUrl.searchParams.set("callbackUrl", newUrl.pathname);
+      newUrl.searchParams.set("redirectTo", newUrl.pathname);
     }
     newUrl.pathname = "/login";
     return NextResponse.redirect(newUrl);
diff --git a/apps/web/tests/create-delete-poll.spec.ts b/apps/web/tests/create-delete-poll.spec.ts
index b688a0704b5..78a6bca442f 100644
--- a/apps/web/tests/create-delete-poll.spec.ts
+++ b/apps/web/tests/create-delete-poll.spec.ts
@@ -31,6 +31,6 @@ test.describe.serial(() => {
 
     deletePollDialog.getByRole("button", { name: "delete" }).click();
 
-    await expect(page).toHaveURL("/login?callbackUrl=%2Fpolls");
+    await expect(page).toHaveURL("/login?redirectTo=%2Fpolls");
   });
 });