feat: set basename as auth

decentraland · Dec 19, 2023 · 300c312 · 300c312
1 parent a5dc0e2
commit 300c312
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/components/Pages/LoginPage/utils.ts b/src/components/Pages/LoginPage/utils.ts
@@ -1,3 +1,4 @@
+import { useHref } from 'react-router-dom'
 import { ethers } from 'ethers'
 import { AuthIdentity, Authenticator } from '@dcl/crypto'
 import { ProviderType } from '@dcl/schemas/dist/dapps/provider-type'
@@ -62,7 +63,7 @@ export async function connectToProvider(connectionOption: ConnectionOptionType):
     })
 
     const url = new URL(window.location.href)
-    url.pathname = '/callback'
+    url.pathname = useHref({ pathname: '/callback' })
 
     await magic.oauth.loginWithRedirect({
       provider: connectionOption,

diff --git a/src/main.tsx b/src/main.tsx
@@ -12,11 +12,9 @@ import { LoginPage } from './components/Pages/LoginPage'
 import 'decentraland-ui/dist/themes/alternative/dark-theme.css'
 import './index.css'
 
-const basename = /^decentraland.(zone|org|today)$/.test(window.location.host) ? '/auth' : '/'
-
 ReactDOM.render(
   <React.StrictMode>
-    <BrowserRouter basename={basename}>
+    <BrowserRouter basename="/auth">
       <Routes>
         <Route path="/login" element={<LoginPage />} />
         <Route path="/callback" element={<CallbackPage />} />