Merge pull request #6092 from ethereum/routingfix

login route fix

Author: bunsenstraat

apps/remix-ide/src/index.tsx

@@ -3,7 +3,6 @@ import React from 'react'
 import './index.css'
 import { ThemeModule } from './app/tabs/theme-module'
 import { Preload } from './app/components/preload'
-import { BrowserRouter, Routes, Route } from 'react-router-dom'
 import { GitHubPopupCallback } from './app/pages/GitHubPopupCallback'
 import Config from './config'
 import { Registry } from '@remix-project/remix-lib'
@@ -23,13 +22,13 @@ import { createRoot } from 'react-dom/client'
   const container = document.getElementById('root');
   const root = createRoot(container)
   if (container) {
-    root.render(
-      <BrowserRouter>
-        <Routes>
-          <Route path="/auth/github/callback" element={<GitHubPopupCallback />} />
-          <Route path="*" element={<Preload root={root} />} />
-        </Routes>
-      </BrowserRouter>
-    )
+    if (window.location.hash.includes('source=github')) {
+      root.render(
+        <GitHubPopupCallback />
+      )
+    } else {
+      root.render(
+        <Preload root={root} />)
+    }
   }
 })()

libs/remix-ui/git/src/components/github/devicecode.tsx

@@ -49,7 +49,7 @@ export const GetDeviceCode = () => {
     }
 
     const clientId = await getClientId()
-    const redirectUri = `${window.location.origin}/auth/github/callback`
+    const redirectUri = `${window.location.origin}/?source=github`
     const scope = 'repo gist user:email read:user'
 
     const url = `https://github.com/login/oauth/authorize?client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}&scope=${encodeURIComponent(scope)}&response_type=code`