Merge pull request #39 from codeunia-dev/updatereturnurl

Refactor: Update returnUrl handling in OAuth callback and SignIn form

Author: codeunia-dev

app/auth/callback/page.tsx

@@ -8,7 +8,7 @@ import { toast } from "sonner";
 function OAuthCallbackContent() {
   const router = useRouter();
   const searchParams = useSearchParams();
-  const returnUrl = searchParams.get("returnUrl") || "/protected";
+  const returnUrl = searchParams.get("returnUrl") || "/";
 
   useEffect(() => {
     const checkSession = async () => {

app/auth/signin/page.tsx

@@ -32,7 +32,7 @@ function SignInForm() {
   })
 
   // Get the return URL from query parameters
-  const returnUrl = searchParams.get('returnUrl') || '/protected'
+  const returnUrl = searchParams.get('returnUrl') || '/'
 
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const { name, value, type, checked } = e.target
@@ -79,7 +79,7 @@ function SignInForm() {
         provider: 'google',
         options: {
           redirectTo: typeof window !== "undefined"
-            ? `${window.location.origin}/protected`
+            ? `${window.location.origin}/auth/callback?returnUrl=${encodeURIComponent(returnUrl)}`
             : undefined,
         },
       });