fix(console): fixing sign in / sign up redirects (#504)

* fixing sign in / sign up redirects

* Update apps/web/app/console/sign-up/[[...signUp...]]/page.tsx

Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>

---------

Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>

Author: pellicceama

apps/web/app/console/(authenticated)/layout.tsx

@@ -1,6 +1,7 @@
 import {redirect} from 'next/navigation'
 import React from 'react'
 import {OrganizationSwitcher, UserButton} from '@openint/console-auth/client'
+import {getBaseURLs} from '@openint/env'
 import {AppLayout} from '@openint/ui-v1'
 import {currentViewer} from '@/lib-server/auth.server'
 import {GlobalCommandBarProvider} from '../../../lib-client/GlobalCommandBarProvider'
@@ -15,7 +16,7 @@ export default async function AuthenticatedLayout({
   const {viewer} = await currentViewer()
   console.log('AuthenticatedLayout viewer', viewer)
   if (viewer.role !== 'user') {
-    return redirect('/console/sign-in')
+    return redirect(getBaseURLs(null).console + '/sign-in')
   }
 
   const shouldShowOnboarding = viewer.role === 'user' && !viewer.orgId

apps/web/app/console/sign-in/[[...signIn...]]/page.tsx

@@ -1,5 +1,6 @@
 import {redirect} from 'next/navigation'
 import {SignIn} from '@openint/console-auth/client'
+import {getBaseURLs} from '@openint/env'
 import {FullScreenCenter} from '@openint/ui-v1/components/FullScreenCenter'
 import {currentViewer} from '@/lib-server/auth.server'
 
@@ -10,7 +11,10 @@ export default async function SignInScreen() {
   }
   return (
     <FullScreenCenter>
-      <SignIn signUpUrl="/console/sign-up" forceRedirectUrl="/console" />
+      <SignIn
+        signUpUrl={getBaseURLs(null).console + '/sign-up'}
+        forceRedirectUrl={getBaseURLs(null).console}
+      />
     </FullScreenCenter>
   )
 }

apps/web/app/console/sign-out/[[...signOut...]]/page.tsx

@@ -2,14 +2,15 @@
 
 import React from 'react'
 import {useSession} from '@openint/console-auth/client'
+import {getBaseURLs} from '@openint/env'
 import {FullScreenCenter} from '@openint/ui-v1/components/FullScreenCenter'
 
 export default function SignOutScreen() {
   const {signOut} = useSession()
 
   React.useEffect(() => {
     void signOut().then(() => {
-      window.location.href = '/console/sign-in'
+      window.location.href = getBaseURLs(null).console + '/sign-in'
     })
   }, [signOut])
 

apps/web/app/console/sign-up/[[...signUp...]]/page.tsx

@@ -1,5 +1,6 @@
 import {redirect} from 'next/navigation'
 import {SignUp} from '@openint/console-auth/client'
+import {getBaseURLs} from '@openint/env'
 import {FullScreenCenter} from '@openint/ui-v1/components/FullScreenCenter'
 import {currentViewer} from '@/lib-server/auth.server'
 
@@ -10,7 +11,10 @@ export default async function SignInScreen() {
   }
   return (
     <FullScreenCenter>
-      <SignUp signInUrl="/console/sign-in" signInForceRedirectUrl="/console" />
+      <SignUp
+        signInUrl={getBaseURLs(null).console + '/sign-in'}
+        signInForceRedirectUrl={getBaseURLs(null).console}
+      />
     </FullScreenCenter>
   )
 }

apps/web/next.config.ts

@@ -97,10 +97,6 @@ const nextConfig = {
       destination: 'https://v1-git-:branch*-openint-dev.vercel.app',
       permanent: false,
     },
-    // clerk expects these routes to be present in their UI and we have them inside the dashboard
-    {source: '/sign-in', destination: '/console/sign-in', permanent: false},
-    {source: '/sign-up', destination: '/console/sign-up', permanent: false},
-    {source: '/sign-out', destination: '/console/sign-out', permanent: false},
   ],
   typescript: {ignoreBuildErrors: true},
   eslint: {ignoreDuringBuilds: true},

packages/console-auth/client.tsx

@@ -11,6 +11,7 @@ import {
 import {dark as darkTheme} from '@clerk/themes'
 import dynamic from 'next/dynamic'
 import React from 'react'
+import {getBaseURLs} from '@openint/env'
 import {useTheme} from '@openint/ui-v1/components/ThemeProvider'
 
 export {
@@ -82,6 +83,7 @@ export function UserButton() {
     <DynamicUserButton
       showName
       appearance={{baseTheme: isDark ? darkTheme : undefined}}
+      signInUrl={getBaseURLs(null).console + '/sign-in'}
     />
   )
 }