Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(frontend): simplify login redirect

Lluis Agusti9c3f679f30e4
diff --git a/autogpt_platform/frontend/src/app/(platform)/login/actions.ts b/autogpt_platform/frontend/src/app/(platform)/login/actions.ts
index 4d1cbef8a7..00092470ac 100644
--- a/autogpt_platform/frontend/src/app/(platform)/login/actions.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/login/actions.ts
@@ -55,7 +55,6 @@ export async function login(
return {
success: true,
onboarding,
- next: onboarding ? "/onboarding" : "/",
};
} catch (err) {
Sentry.captureException(err);
diff --git a/autogpt_platform/frontend/src/app/(platform)/login/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/login/helpers.ts
index 0eb0b1910f..e69de29bb2 100644
--- a/autogpt_platform/frontend/src/app/(platform)/login/helpers.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/login/helpers.ts
@@ -1,5 +0,0 @@
-export function computeReturnURL(returnUrl: string | null, result: any) {
- return returnUrl
- ? returnUrl
- : (result?.next as string) || (result?.onboarding ? "/onboarding" : "/");
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts b/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts
index 4c6403c4e5..4faa5b9823 100644
--- a/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts
@@ -4,20 +4,17 @@ import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
import { environment } from "@/services/environment";
import { loginFormSchema, LoginProvider } from "@/types/auth";
import { zodResolver } from "@hookform/resolvers/zod";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
import { useCallback, useState } from "react";
import { useForm } from "react-hook-form";
import z from "zod";
import { login as loginAction } from "./actions";
-import { computeReturnURL } from "./helpers";
export function useLoginPage() {
const { supabase, user, isUserLoading } = useSupabase();
const [feedback, setFeedback] = useState<string | null>(null);
const [captchaKey, setCaptchaKey] = useState(0);
const router = useRouter();
- const searchParams = useSearchParams();
- const returnUrl = searchParams.get("returnUrl");
const { toast } = useToast();
const [isLoading, setIsLoading] = useState(false);
const [isGoogleLoading, setIsGoogleLoading] = useState(false);
@@ -117,9 +114,11 @@ export function useLoginPage() {
throw new Error(result.error || "Login failed");
}
- // Prioritize returnUrl from query params over backend's onboarding logic
- const next = computeReturnURL(returnUrl, result);
- if (next) router.replace(next);
+ if (result.onboarding) {
+ router.replace("/onboarding");
+ } else {
+ router.replace("/marketplace");
+ }
} catch (error) {
toast({
title: