File tree Expand file tree Collapse file tree 3 files changed +20
-19
lines changed
Expand file tree Collapse file tree 3 files changed +20
-19
lines changed Original file line number Diff line number Diff line change @@ -25,18 +25,21 @@ export default function SocialButtons({
2525 const supabase = getSupabaseBrowserClient ( ) ;
2626 const pathname = usePathname ( ) ;
2727 const oauthRedirectUrl = useMemo ( ( ) => {
28- if ( ! process . env . NEXT_PUBLIC_ROOT_URL ) {
29- return undefined ;
30- }
28+ const siteOrigin =
29+ ( typeof window !== ' undefined' && window . location . origin ) ||
30+ process . env . NEXT_PUBLIC_ROOT_URL ;
3131
32- const normalizedRoot = process . env . NEXT_PUBLIC_ROOT_URL . replace ( / \/ $ / , '' ) ;
32+ if ( ! siteOrigin ) return undefined ;
33+
34+ const normalizedSiteOrigin = siteOrigin . replace ( / \/ $ / , '' ) ;
3335
3436 // If we're on the sign-in page, redirect to home after successful login
3537 const nextPath = pathname ?. includes ( '/sign-in' )
3638 ? pathname . replace ( / \/ s i g n - i n .* $ / , '' ) || '/'
3739 : pathname || '/' ;
3840
39- return `${ normalizedRoot } /auth/callback?next=${ encodeURIComponent ( nextPath ) } ` ;
41+ const nextParam = encodeURIComponent ( nextPath ) ;
42+ return `${ normalizedSiteOrigin } /auth/callback?next=${ nextParam } ` ;
4043 } , [ pathname ] ) ;
4144
4245 const socialButtons : SocialButton [ ] = [
Original file line number Diff line number Diff line change @@ -41,21 +41,24 @@ export async function proxy(
4141 NEXT_PUBLIC_SUPABASE_ANON_KEY ,
4242 {
4343 cookies : {
44- getAll ( ) {
45- return req . cookies . getAll ( ) ;
44+ get ( name ) {
45+ return req . cookies . get ( name ) ?. value ;
4646 } ,
47- setAll ( cookiesToSet ) {
48- cookiesToSet . forEach ( ( { name, value, options} ) => {
49- req . cookies . set ( name , value ) ;
50- res . cookies . set ( name , value , options ) ;
51- } ) ;
47+ set ( name , value , options ) {
48+ res . cookies . set ( name , value , options ) ;
49+ } ,
50+ remove ( name , options ) {
51+ res . cookies . set ( name , '' , { ... options , maxAge : 0 } ) ;
5252 } ,
5353 } ,
5454 } ,
5555 ) ;
56+
5657 const {
57- data : { user} ,
58- } = await supabase . auth . getUser ( ) ;
58+ data : { session} ,
59+ } = await supabase . auth . getSession ( ) ;
60+
61+ const user = session ?. user ;
5962
6063 if ( user ) {
6164 upsertUser ( { supabase, user} ) ;
Original file line number Diff line number Diff line change @@ -1499,11 +1499,6 @@ input[type='search']::-webkit-search-decoration,
14991499 min-width : 70px ;
15001500}
15011501
1502- .min-w-fit {
1503- min-width : -moz-fit-content;
1504- min-width : fit-content;
1505- }
1506-
15071502.min-w-full {
15081503 min-width : 100% ;
15091504}
You can’t perform that action at this time.
0 commit comments