Merge pull request #6082 from ethereum/logingithub

Logingithub

Author: yann300

apps/remix-ide/src/app.ts

@@ -67,6 +67,7 @@ import { FoundryHandleDesktop } from './app/plugins/electron/foundryPlugin'
 import { HardhatHandle } from './app/files/hardhat-handle'
 import { HardhatHandleDesktop } from './app/plugins/electron/hardhatPlugin'
 import { circomPlugin } from './app/plugins/electron/circomElectronPlugin'
+import { GitHubAuthHandler } from './app/plugins/electron/gitHubAuthHandler'
 import { GitPlugin } from './app/plugins/git'
 import { Matomo } from './app/plugins/matomo'
 import { WalletConnect } from './app/plugins/walletconnect'
@@ -469,6 +470,8 @@ class AppComponent {
       this.engine.register([appUpdater])
       const remixAIDesktop = new remixAIDesktopPlugin()
       this.engine.register([remixAIDesktop])
+      const githubAuthHandler = new GitHubAuthHandler()
+      this.engine.register([githubAuthHandler])
     }
 
     const compilerloader = isElectron() ? new compilerLoaderPluginDesktop() : new compilerLoaderPlugin()
@@ -611,7 +614,7 @@ class AppComponent {
     await this.appManager.activatePlugin(['solidity-script', 'remix-templates'])
 
     if (isElectron()) {
-      await this.appManager.activatePlugin(['isogit', 'electronconfig', 'electronTemplates', 'xterm', 'ripgrep', 'appUpdater', 'slither', 'foundry', 'hardhat', 'circom']) // 'remixAID'
+      await this.appManager.activatePlugin(['isogit', 'electronconfig', 'electronTemplates', 'xterm', 'ripgrep', 'appUpdater', 'slither', 'foundry', 'hardhat', 'circom', 'githubAuthHandler']) // 'remixAID'
     }
 
     this.appManager.on(

apps/remix-ide/src/app/pages/GitHubPopupCallback.tsx

@@ -0,0 +1,81 @@
+import React, { useEffect, useRef } from 'react'
+import axios from 'axios'
+import '../components/styles/preload.css'
+import { endpointUrls } from "@remix-endpoints-helper"
+
+const extractCode = () => {
+  const searchParams = new URLSearchParams(window.location.search)
+  if (searchParams.get('code')) return searchParams.get('code')
+
+  // If not found in search, check the hash
+  const hashParams = new URLSearchParams(window.location.hash.slice(1)) // strip #
+  return hashParams.get('code')
+}
+
+const logo = (
+  <svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 105 100">
+    <path d="M91.84,35a.09.09,0,0,1-.1-.07,41,41,0,0,0-79.48,0,.09.09,0,0,1-.1.07C9.45,35,1,35.35,1,42.53c0,8.56,1,16,6,20.32,2.16,1.85,5.81,2.3,9.27,2.22a44.4,44.4,0,0,0,6.45-.68.09.09,0,0,0,.06-.15A34.81,34.81,0,0,1,17,45c0-.1,0-.21,0-.31a35,35,0,0,1,70,0c0,.1,0,.21,0,.31a34.81,34.81,0,0,1-5.78,19.24.09.09,0,0,0,.06.15,44.4,44.4,0,0,0,6.45.68c3.46.08,7.11-.37,9.27-2.22,5-4.27,6-11.76,6-20.32C103,35.35,94.55,35,91.84,35Z" />
+    <path d="M52,74,25.4,65.13a.1.1,0,0,0-.1.17L51.93,91.93a.1.1,0,0,0,.14,0L78.7,65.3a.1.1,0,0,0-.1-.17L52,74A.06.06,0,0,1,52,74Z" />
+    <path d="M75.68,46.9,82,45a.09.09,0,0,0,.08-.09,29.91,29.91,0,0,0-.87-6.94.11.11,0,0,0-.09-.08l-6.43-.58a.1.1,0,0,1-.06-.18l4.78-4.18a.13.13,0,0,0,0-.12,30.19,30.19,0,0,0-3.65-6.07.09.09,0,0,0-.11,0l-5.91,2a.1.1,0,0,1-.12-.14L72.19,23a.11.11,0,0,0,0-.12,29.86,29.86,0,0,0-5.84-4.13.09.09,0,0,0-.11,0l-4.47,4.13a.1.1,0,0,1-.17-.07l.09-6a.1.1,0,0,0-.07-.1,30.54,30.54,0,0,0-7-1.47.1.1,0,0,0-.1.07l-2.38,5.54a.1.1,0,0,1-.18,0l-2.37-5.54a.11.11,0,0,0-.11-.06,30,30,0,0,0-7,1.48.12.12,0,0,0-.07.1l.08,6.05a.09.09,0,0,1-.16.07L37.8,18.76a.11.11,0,0,0-.12,0,29.75,29.75,0,0,0-5.83,4.13.11.11,0,0,0,0,.12l2.59,5.6a.11.11,0,0,1-.13.14l-5.9-2a.11.11,0,0,0-.12,0,30.23,30.23,0,0,0-3.62,6.08.11.11,0,0,0,0,.12l4.79,4.19a.1.1,0,0,1-.06.17L23,37.91a.1.1,0,0,0-.09.07A29.9,29.9,0,0,0,22,44.92a.1.1,0,0,0,.07.1L28.4,47a.1.1,0,0,1,0,.18l-5.84,3.26a.16.16,0,0,0,0,.11,30.17,30.17,0,0,0,2.1,6.76c.32.71.67,1.4,1,2.08a.1.1,0,0,0,.06,0L52,68.16H52l26.34-8.78a.1.1,0,0,0,.06-.05,30.48,30.48,0,0,0,3.11-8.88.1.1,0,0,0-.05-.11l-5.83-3.26A.1.1,0,0,1,75.68,46.9Z" />
+  </svg>
+)
+
+export const GitHubPopupCallback = () => {
+  const hasRun = useRef(false)
+
+  const exchangeToken = async () => {
+
+    const code = extractCode()
+    window.history.replaceState({}, document.title, window.location.pathname)
+
+    if (!code) {
+      console.warn('[GitHubPopupCallback] Missing code', { code })
+      window.opener?.postMessage({ type: 'GITHUB_AUTH_FAILURE', error: 'missing code' }, window.location.origin)
+      return
+    }
+
+    try {
+      const { data } = await axios.post(`${endpointUrls.gitHubLoginProxy}/login/oauth/access_token?_=${Date.now()}`, {
+        code,
+        redirect_uri: window.location.origin + '/auth/github/callback'
+      }, {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json'
+        }
+      })
+
+      if (data.access_token) {
+        window.opener?.postMessage({ type: 'GITHUB_AUTH_SUCCESS', token: data.access_token }, window.location.origin)
+      } else {
+        console.log('[GitHubPopupCallback] Posting failure message')
+        window.opener?.postMessage({ type: 'GITHUB_AUTH_FAILURE', error: 'no access token' }, window.location.origin)
+      }
+    } catch (error) {
+      console.error('[GitHubPopupCallback] Token exchange error:', error)
+      window.opener?.postMessage({ type: 'GITHUB_AUTH_FAILURE', error: error instanceof Error ? error.message : String(error), code }, window.location.origin)
+    }
+  }
+
+  useEffect(() => {
+    if (!hasRun.current) {
+      hasRun.current = true
+      exchangeToken()
+    }
+  }, [])
+
+  return (
+    <>
+      <div className="preload-container">
+        <div className="preload-logo pb-4">
+          {logo}
+          <div>
+            <div className='text-center'>
+              <i className="fas fa-spinner fa-spin fa-2x"></i>
+            </div>
+          </div>
+        </div>
+      </div>
+    </>
+  )
+}

apps/remix-ide/src/app/plugins/electron/gitHubAuthHandler.ts

@@ -0,0 +1,13 @@
+import { ElectronPlugin } from '@remixproject/engine-electron';
+
+export class GitHubAuthHandler extends ElectronPlugin {
+  constructor() {
+    super({
+      displayName: 'githubAuthHandler',
+      name: 'githubAuthHandler',
+      description: 'githubAuthHandler',
+    })
+    this.methods = []
+  }
+
+}

apps/remix-ide/src/app/tabs/theme-module.js

@@ -54,7 +54,11 @@ export class ThemeModule extends Plugin {
     themes.map((theme) => {
       this.themes[theme.name.toLocaleLowerCase()] = {
         ...theme,
-        url: isElectron() ? theme.url : window.location.origin + (window.location.pathname.startsWith('/address/') || window.location.pathname.endsWith('.sol') ? '/' : window.location.pathname) + theme.url
+        url: isElectron()
+          ? theme.url
+          : window.location.pathname.startsWith('/auth')
+            ? window.location.origin + '/' + theme.url
+            : window.location.origin + (window.location.pathname.startsWith('/address/') || window.location.pathname.endsWith('.sol') ? '/' : window.location.pathname) + theme.url
       }
     })
     this._paq = _paq
@@ -123,6 +127,8 @@ export class ThemeModule extends Plugin {
     if (!this.forced) this._deps.config.set('settings/theme', next)
     document.getElementById('theme-link') ? document.getElementById('theme-link').remove() : null
 
+    
+
     const theme = document.createElement('link')
     theme.setAttribute('rel', 'stylesheet')
     theme.setAttribute('href', nextTheme.url)

apps/remix-ide/src/index.tsx

@@ -3,24 +3,33 @@ 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'
 import { Storage } from '@remix-project/remix-lib'
 
 import { createRoot } from 'react-dom/client'
 
-;(async function () {
+; (async function () {
   try {
     const configStorage = new Storage('config-v0.8:')
     const config = new Config(configStorage)
     Registry.getInstance().put({ api: config, name: 'config' })
-  } catch (e) {}
+  } catch (e) { }
   const theme = new ThemeModule()
   theme.initTheme()
 
   const container = document.getElementById('root');
   const root = createRoot(container)
   if (container) {
-    root.render(<Preload root={root} />);
+    root.render(
+      <BrowserRouter>
+        <Routes>
+          <Route path="/auth/github/callback" element={<GitHubPopupCallback />} />
+          <Route path="*" element={<Preload root={root} />} />
+        </Routes>
+      </BrowserRouter>
+    )
   }
 })()

apps/remix-ide/src/remixAppManager.ts

@@ -91,7 +91,8 @@ let requiredModules = [
   'walletconnect',
   'popupPanel',
   'remixAI',
-  'remixAID'
+  'remixAID',
+  'githubAuthHandler'
 ]
 
 // dependentModules shouldn't be manually activated (e.g hardhat is activated by remixd)

apps/remix-ide/webpack.config.js

@@ -7,6 +7,7 @@ const fs = require('fs')
 const TerserPlugin = require('terser-webpack-plugin')
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
 const path = require('path')
+const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 
 const versionData = {
   version: version,
@@ -126,6 +127,7 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
       url: ['url', 'URL'],
       process: 'process/browser'
     })
+    //,new BundleAnalyzerPlugin()
   )
 
   // set the define plugin to load the WALLET_CONNECT_PROJECT_ID

apps/remixdesktop/Info.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
+ "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleURLTypes</key>
+  <array>
+    <dict>
+      <key>CFBundleURLName</key>
+      <string>Remix URL Scheme</string>
+      <key>CFBundleURLSchemes</key>
+      <array>
+        <string>remix</string>
+      </array>
+    </dict>
+  </array>
+</dict>
+</plist>

apps/remixdesktop/insiders.json

@@ -26,7 +26,8 @@
         "hardenedRuntime": true,
         "gatekeeperAssess": false,
         "entitlements": "entitlements.mac.plist",
-        "entitlementsInherit": "entitlements.mac.plist"
+        "entitlementsInherit": "entitlements.mac.plist",
+        "extendInfo": "Info.plist"
     },
     "dmg": {
         "writeUpdateInfo": true,
@@ -58,5 +59,11 @@
     },
     "directories": {
         "output": "release"
+    },
+    "protocols": [
+    {
+      "name": "Remix",
+      "schemes": ["remix"]
     }
+  ]
 }

apps/remixdesktop/src/engine.ts

@@ -16,6 +16,7 @@ import { FoundryPlugin } from './plugins/foundryPlugin';
 import { HardhatPlugin } from './plugins/hardhatPlugin';
 import { CircomElectronPlugin } from './plugins/circomElectronBasePlugin';
 import { isE2E } from './main';
+import { GitHubAuthHandler } from './plugins/githubAuthHandler';
 
 const engine = new Engine()
 const appManager = new PluginManager()
@@ -32,6 +33,7 @@ const foundryPlugin = new FoundryPlugin()
 const hardhatPlugin = new HardhatPlugin()
 const remixAIDesktopPlugin = new RemixAIDesktopPlugin()
 const circomPlugin = new CircomElectronPlugin()
+export const githubAuthHandlerPlugin  = new GitHubAuthHandler()
 
 engine.register(appManager)
 engine.register(fsPlugin)
@@ -47,6 +49,7 @@ engine.register(appUpdaterPlugin)
 engine.register(hardhatPlugin)
 engine.register(remixAIDesktopPlugin)
 engine.register(circomPlugin)
+engine.register(githubAuthHandlerPlugin)
 
 appManager.activatePlugin('electronconfig')
 appManager.activatePlugin('fs')
@@ -88,7 +91,6 @@ ipcMain.handle('getWebContentsID', (event, message) => {
   return event.sender.id
 })
 
-
 app.on('before-quit', async (event) => {
   await appManager.call('fs', 'removeCloseListener')
   await appManager.call('fs', 'closeWatch')