fix: oauth login

Author: hyochan

app/[lang]/sign-in/SocialButtons.tsx

@@ -25,18 +25,23 @@ export default function SocialButtons({
   const supabase = getSupabaseBrowserClient();
   const pathname = usePathname();
   const oauthRedirectUrl = useMemo(() => {
-    if (!process.env.NEXT_PUBLIC_ROOT_URL) {
-      return undefined;
-    }
+    const lang = pathname?.split('/')[1] || 'en';
+    const siteOrigin =
+      (typeof window !== 'undefined' && window.location.origin) ||
+      process.env.NEXT_PUBLIC_ROOT_URL;
 
-    const normalizedRoot = process.env.NEXT_PUBLIC_ROOT_URL.replace(/\/$/, '');
+    if (!siteOrigin) return undefined;
+
+    const normalizedSiteOrigin = siteOrigin.replace(/\/$/, '');
 
     // If we're on the sign-in page, redirect to home after successful login
     const nextPath = pathname?.includes('/sign-in')
       ? pathname.replace(/\/sign-in.*$/, '') || '/'
       : pathname || '/';
 
-    return `${normalizedRoot}/auth/callback?next=${encodeURIComponent(nextPath)}`;
+    const nextUrl = `${normalizedSiteOrigin}${nextPath}?lang=${lang}`;
+    const nextParam = encodeURIComponent(nextUrl);
+    return `${normalizedSiteOrigin}/auth/callback?next=${nextParam}`;
   }, [pathname]);
 
   const socialButtons: SocialButton[] = [

proxy.ts

@@ -41,21 +41,24 @@ export async function proxy(
     NEXT_PUBLIC_SUPABASE_ANON_KEY,
     {
       cookies: {
-        getAll() {
-          return req.cookies.getAll();
+        get(name) {
+          return req.cookies.get(name)?.value;
         },
-        setAll(cookiesToSet) {
-          cookiesToSet.forEach(({name, value, options}) => {
-            req.cookies.set(name, value);
-            res.cookies.set(name, value, options);
-          });
+        set(name, value, options) {
+          res.cookies.set(name, value, options);
+        },
+        remove(name, options) {
+          res.cookies.set(name, '', {...options, maxAge: 0});
         },
       },
     },
   );
+
   const {
-    data: {user},
-  } = await supabase.auth.getUser();
+    data: {session},
+  } = await supabase.auth.getSession();
+
+  const user = session?.user;
 
   if (user) {
     upsertUser({supabase, user});

styles/output.css

@@ -1499,11 +1499,6 @@ input[type='search']::-webkit-search-decoration,
   min-width: 70px;
 }
 
-.min-w-fit {
-  min-width: -moz-fit-content;
-  min-width: fit-content;
-}
-
 .min-w-full {
   min-width: 100%;
 }

utils/supabase/middleware.ts

@@ -0,0 +1,36 @@
+import {createServerClient} from '@supabase/ssr';
+import {NextResponse} from 'next/server';
+import type {NextRequest} from 'next/server';
+
+import type {Database} from '~/types/supabase';
+
+export async function updateSession(request: NextRequest): Promise<NextResponse> {
+  let response = NextResponse.next({
+    request: {
+      headers: request.headers,
+    },
+  });
+
+  const supabase = createServerClient<Database>(
+    process.env.NEXT_PUBLIC_SUPABASE_URL || '',
+    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || '',
+    {
+      cookies: {
+        get(name) {
+          return request.cookies.get(name)?.value;
+        },
+        set(name, value, options) {
+          response.cookies.set(name, value, options);
+        },
+        remove(name, options) {
+          response.cookies.set(name, '', {...options, maxAge: 0});
+        },
+      },
+    },
+  );
+
+  // Refresh session if needed and forward cookies to client
+  await supabase.auth.getSession();
+
+  return response;
+}