Merge branch 'main' of github.com:boundlessfi/boundless into production

Author: 0xdevcollins

app/(landing)/layout.tsx

@@ -2,7 +2,7 @@ import { Metadata } from 'next';
 import { ReactNode } from 'react';
 import { Footer, Navbar } from '@/components/landing-page';
 import { generatePageMetadata } from '@/lib/metadata';
-import { GoogleOneTap } from '@/components/auth/GoogleOneTap';
+// import { GoogleOneTap } from '@/components/auth/GoogleOneTap';
 import { LandingWalletWrapper } from '@/components/wallet/LandingWalletWrapper';
 
 export const metadata: Metadata = generatePageMetadata('home');
@@ -17,7 +17,7 @@ export default function LandingLayout({ children }: LandingLayoutProps) {
       <Navbar />
       <main className='flex-1'>{children}</main>
       <Footer />
-      <GoogleOneTap />
+      {/* <GoogleOneTap /> */}
       <LandingWalletWrapper />
     </div>
   );

components/auth/LoginWrapper.tsx

@@ -35,10 +35,24 @@ const LoginWrapper = ({ setLoadingState }: LoginWrapperProps) => {
   const [lastMethod, setLastMethod] = useState<string | null>(null);
   const [twoFactorRequired, setTwoFactorRequired] = useState(false);
 
-  const callbackUrl = searchParams.get('callbackUrl')
+  const rawCallbackUrl = searchParams.get('callbackUrl')
     ? decodeURIComponent(searchParams.get('callbackUrl')!)
     : process.env.NEXT_PUBLIC_APP_URL || '/';
 
+  const appOrigin =
+    typeof window !== 'undefined'
+      ? window.location.origin
+      : (process.env.NEXT_PUBLIC_APP_URL || 'https://boundlessfi.xyz').replace(
+          /\/$/,
+          ''
+        );
+
+  const callbackUrl =
+    rawCallbackUrl.startsWith('http://') ||
+    rawCallbackUrl.startsWith('https://')
+      ? rawCallbackUrl
+      : `${appOrigin}${rawCallbackUrl.startsWith('/') ? '' : '/'}${rawCallbackUrl}`;
+
   useEffect(() => {
     const method = authClient.getLastUsedLoginMethod();
     setLastMethod(method);