support custom cors-proxy

Author: drafish

apps/remix-ide/src/app/files/dgitProvider.ts

@@ -74,14 +74,19 @@ class DGitProvider extends Plugin {
   }
 
   async parseInput(input) {
+    const corsproxy = await this.call('config', 'getAppParameter', 'settings/corsproxy-url')
+    const gitlabToken = await this.call('config', 'getAppParameter', 'settings/gitlab-token')
     return {
-      corsProxy: 'https://corsproxy.remixproject.org/',
+      corsProxy: corsproxy || 'https://corsproxy.remixproject.org/',
       http,
       onAuth: url => {
         url
-        const auth = {
+        const auth = url.startsWith('https://github.com') ? {
           username: input.token,
           password: ''
+        } : {
+          username: 'oauth2',
+          password: gitlabToken
         }
         return auth
       }

apps/remix-ide/src/app/tabs/locales/en/filePanel.json

@@ -27,6 +27,12 @@
   "filePanel.workspace.clone": "Clone Git Repository",
   "filePanel.workspace.cloneMessage": "Please provide a valid git repository url.",
   "filePanel.workspace.enterGitUrl": "Enter git repository url",
+  "filePanel.workspace.enterCorsproxyUrl": "Enter cors proxy url, default to be https://corsproxy.remixproject.org/",
+  "filePanel.workspace.gitRepoUrl": "Git Repo Url:",
+  "filePanel.workspace.corsProxyUrl": "Cors Proxy Url (Optional):",
+  "filePanel.workspace.corsproxyText1": "Note: To run CorsProxy on your system, run:",
+  "filePanel.workspace.corsproxyText2": "Note: Cors Proxy Url must be end with /, such as http://127.0.0.1:9999/",
+  "filePanel.workspace.corsproxyText3": "For more info, visit: <a>CorsProxy Documentation</a>",
   "filePanel.workspace.switch": "Switch To Workspace",
   "filePanel.workspace.solghaction": "Adds a preset yml file to run solidity unit tests on github actions CI.",
   "filePanel.solghaction": "Solidity Test Workflow",

libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@@ -49,6 +49,8 @@ export function Workspace() {
   const workspaceCreateTemplateInput = useRef()
   const intl = useIntl()
   const cloneUrlRef = useRef<HTMLInputElement>()
+  const config = global.plugin.registry.get('config').api
+  const corsproxyUrlRef = useRef<HTMLInputElement>()
   const initGitRepoRef = useRef<HTMLInputElement>()
   const filteredBranches = selectedWorkspace ? (selectedWorkspace.branches || []).filter((branch) => branch.name.includes(branchFilter) && branch.name !== 'HEAD').slice(0, 20) : []
   const currentBranch = selectedWorkspace ? selectedWorkspace.currentBranch : null
@@ -423,6 +425,11 @@ export function Workspace() {
 
   const handleTypingUrl = () => {
     const url = cloneUrlRef.current.value
+    const corsproxy = corsproxyUrlRef.current.value
+
+    if (corsproxy) {
+      config.set('corsproxy', corsproxy)
+    }
 
     if (url) {
       global.dispatchCloneRepository(url)
@@ -910,6 +917,7 @@ export function Workspace() {
   const cloneModalMessage = () => {
     return (
       <>
+        <div><FormattedMessage id="filePanel.workspace.gitRepoUrl" /></div>
         <input
           type="text"
           data-id="modalDialogCustomPromptTextClone"
@@ -919,6 +927,43 @@ export function Workspace() {
           ref={cloneUrlRef}
           className="form-control"
         />
+        <div className="pt-4"><FormattedMessage id="filePanel.workspace.corsProxyUrl" /></div>
+        <input
+          type="text"
+          data-id="modalDialogCustomPromptTextCorsproxy"
+          placeholder={intl.formatMessage({
+            id: 'filePanel.workspace.enterCorsproxyUrl'
+          })}
+          ref={corsproxyUrlRef}
+          defaultValue={config.get('corsproxy')}
+          className="form-control"
+        />
+        <div className="pt-2">
+          <FormattedMessage id="filePanel.workspace.corsproxyText1" />
+          <div className="p-1 pl-3">
+            <b>npm install -g @drafish/cors-proxy</b>
+          </div>
+          <div className="p-1 pl-3">
+            <b>cors-proxy start</b>
+          </div>
+          <div className="pt-2">
+            <FormattedMessage
+              id="filePanel.workspace.corsproxyText2"
+            />
+          </div>
+          <div className="pt-2">
+            <FormattedMessage
+              id="filePanel.workspace.corsproxyText3"
+              values={{
+                a: (chunks) => (
+                  <a href="https://github.com/drafish/cors-proxy" target="_blank">
+                    {chunks}
+                  </a>
+                )
+              }}
+            />
+          </div>
+        </div>
       </>
     )
   }