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): cookies console warnings (#10124)

Ubbef8815703257e
diff --git a/autogpt_platform/frontend/src/app/(platform)/auth/callback/route.ts b/autogpt_platform/frontend/src/app/(platform)/auth/callback/route.ts
index ba5bc0db14..5397bcd698 100644
--- a/autogpt_platform/frontend/src/app/(platform)/auth/callback/route.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/auth/callback/route.ts
@@ -9,7 +9,7 @@ export async function GET(request: Request) {
const next = searchParams.get("next") ?? "/";
if (code) {
- const supabase = getServerSupabase();
+ const supabase = await getServerSupabase();
if (!supabase) {
return NextResponse.redirect(`${origin}/error`);
diff --git a/autogpt_platform/frontend/src/app/(platform)/auth/confirm/route.ts b/autogpt_platform/frontend/src/app/(platform)/auth/confirm/route.ts
index e5d432b8fe..a78efd20ff 100644
--- a/autogpt_platform/frontend/src/app/(platform)/auth/confirm/route.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/auth/confirm/route.ts
@@ -12,7 +12,7 @@ export async function GET(request: NextRequest) {
const next = searchParams.get("next") ?? "/";
if (token_hash && type) {
- const supabase = getServerSupabase();
+ const supabase = await getServerSupabase();
if (!supabase) {
redirect("/error");
diff --git a/autogpt_platform/frontend/src/app/(platform)/login/actions.ts b/autogpt_platform/frontend/src/app/(platform)/login/actions.ts
index 568a04b266..97f472578d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/login/actions.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/login/actions.ts
@@ -21,7 +21,7 @@ export async function login(
turnstileToken: string,
) {
return await Sentry.withServerActionInstrumentation("login", {}, async () => {
- const supabase = getServerSupabase();
+ const supabase = await getServerSupabase();
const api = new BackendAPI();
if (!supabase) {
@@ -60,7 +60,7 @@ export async function providerLogin(provider: LoginProvider) {
"providerLogin",
{},
async () => {
- const supabase = getServerSupabase();
+ const supabase = await getServerSupabase();
const api = new BackendAPI();
if (!supabase) {
diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/settings/actions.ts b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/settings/actions.ts
index 38e8857cae..88d996cf43 100644
--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/settings/actions.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/settings/actions.ts
@@ -6,7 +6,7 @@ import BackendApi from "@/lib/autogpt-server-api";
import { NotificationPreferenceDTO } from "@/lib/autogpt-server-api/types";
export async function updateSettings(formData: FormData) {
- const supabase = getServerSupabase();
+ const supabase = await getServerSupabase();
const {
data: { user },
} = await supabase.auth.getUser();
diff --git a/autogpt_platform/frontend/src/app/(platform)/reset_password/actions.ts b/autogpt_platform/frontend/src/app/(platform)/reset_password/actions.ts
index 6760e911be..e1e8a17af6 100644
--- a/autogpt_platform/frontend/src/app/(platform)/reset_password/actions.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/reset_password/actions.ts
@@ -9,7 +9,7 @@ export async function sendResetEmail(email: string, turnstileToken: string) {
"sendResetEmail",
{},
async () => {
- const supabase = getServerSupabase();
+ const supabase = await getServerSupabase();
const origin = process.env.FRONTEND_BASE_URL || "http://localhost:3000";
if (!supabase) {
@@ -42,7 +42,7 @@ export async function changePassword(password: string, turnstileToken: string) {
"changePassword",
{},
async () => {
- const supabase = getServerSupabase();
+ const supabase = await getServerSupabase();
if (!supabase) {
redirect("/error");
diff --git a/autogpt_platform/frontend/src/app/(platform)/signup/actions.ts b/autogpt_platform/frontend/src/app/(platform)/signup/actions.ts
index 9d9ac98947..3d3819e6d4 100644
--- a/autogpt_platform/frontend/src/app/(platform)/signup/actions.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/signup/actions.ts
@@ -17,7 +17,7 @@ export async function signup(
"signup",
{},
async () => {
- const supabase = getServerSupabase();
+ const supabase = await getServerSupabase();
if (!supabase) {
redirect("/error");
diff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts
index ec32745bca..043205ae84 100644
--- a/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts
+++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts
@@ -89,21 +89,22 @@ export default class BackendAPI {
this.wsUrl = wsUrl;
}
- private get supabaseClient(): SupabaseClient | null {
+ private async getSupabaseClient(): Promise<SupabaseClient | null> {
return isClient
? createBrowserClient(
process.env.NEXT_PUBLIC_SUPABASE_URL!,
process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
{ isSingleton: true },
)
- : getServerSupabase();
+ : await getServerSupabase();
}
async isAuthenticated(): Promise<boolean> {
- if (!this.supabaseClient) return false;
+ const supabaseClient = await this.getSupabaseClient();
+ if (!supabaseClient) return false;
const {
data: { session },
- } = await this.supabaseClient.auth.getSession();
+ } = await supabaseClient.auth.getSession();
return session != null;
}
@@ -750,9 +751,10 @@ export default class BackendAPI {
const maxRetries = 3;
while (retryCount < maxRetries) {
+ const supabaseClient = await this.getSupabaseClient();
const {
data: { session },
- } = (await this.supabaseClient?.auth.getSession()) || {
+ } = (await supabaseClient?.auth.getSession()) || {
data: { session: null },
};
@@ -803,9 +805,10 @@ export default class BackendAPI {
const maxRetries = 3;
while (retryCount < maxRetries) {
+ const supabaseClient = await this.getSupabaseClient();
const {
data: { session },
- } = (await this.supabaseClient?.auth.getSession()) || {
+ } = (await supabaseClient?.auth.getSession()) || {
data: { session: null },
};
@@ -980,8 +983,9 @@ export default class BackendAPI {
async connectWebSocket(): Promise<void> {
return (this.wsConnecting ??= new Promise(async (resolve, reject) => {
try {
+ const supabaseClient = await this.getSupabaseClient();
const token =
- (await this.supabaseClient?.auth.getSession())?.data.session
+ (await supabaseClient?.auth.getSession())?.data.session
?.access_token || "";
const wsUrlWithToken = `${this.wsUrl}?token=${token}`;
this.webSocket = new WebSocket(wsUrlWithToken);
diff --git a/autogpt_platform/frontend/src/lib/supabase/getServerSupabase.ts b/autogpt_platform/frontend/src/lib/supabase/getServerSupabase.ts
index aea3d90a67..ffa61fe997 100644
--- a/autogpt_platform/frontend/src/lib/supabase/getServerSupabase.ts
+++ b/autogpt_platform/frontend/src/lib/supabase/getServerSupabase.ts
@@ -1,10 +1,10 @@
import type { UnsafeUnwrappedCookies } from "next/headers";
import { createServerClient } from "@supabase/ssr";
-export default function getServerSupabase() {
+export default async function getServerSupabase() {
// Need require here, so Next.js doesn't complain about importing this on client side
const { cookies } = require("next/headers");
- const cookieStore = cookies() as UnsafeUnwrappedCookies;
+ const cookieStore = await cookies();
try {
const supabase = createServerClient(
diff --git a/autogpt_platform/frontend/src/lib/supabase/getServerUser.ts b/autogpt_platform/frontend/src/lib/supabase/getServerUser.ts
index d46cd8b85c..b456d768d9 100644
--- a/autogpt_platform/frontend/src/lib/supabase/getServerUser.ts
+++ b/autogpt_platform/frontend/src/lib/supabase/getServerUser.ts
@@ -1,7 +1,7 @@
import getServerSupabase from "./getServerSupabase";
const getServerUser = async () => {
- const supabase = getServerSupabase();
+ const supabase = await getServerSupabase();
if (!supabase) {
return { user: null, error: "Failed to create Supabase client" };