keep #211 fix but still fixes bad missing /api/ urls

medialab · Sep 4, 2023 · c55da0c · c55da0c
1 parent 09579e4
commit c55da0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/app/actions/corpora.js b/app/actions/corpora.js
@@ -51,7 +51,7 @@ export const fetchCorpora = (serverUrl) => (dispatch) => {
       return dispatch(receiveCorpora(serverUrl, res))
     })
     .catch((error) => {
-      console.log("ERROR", res);
+      console.log("ERROR", error);
       return dispatch({
         type: FETCH_CORPORA_FAILURE,
         payload: { error, serverUrl }

diff --git a/app/containers/Login/ServerForm.js b/app/containers/Login/ServerForm.js
@@ -132,28 +132,8 @@ const ServerForm = ({
         fetchCorpora(server.url)
         saveAndRedirect()
       }, () => {
-        // Try alternative url ending with /api/ if missing and fix it automatically if working
-        const altUrl = server.url.replace(/(\/|api)*$/, '/api/')
-        console.log("API server url", server.url, "seems unaccessible, trying to rewrite it:", altUrl)
-        if (! /\/api\/$/.test(server.url)) {
-          fetchServerStatus(altUrl)
-            .then(() => {
-              if (fullConfig && typeof fullConfig === 'object') {
-                fullConfig.url = altUrl
-              }
-              data.url = altUrl
-              setSubmitting(true)
-              setErrors([])
-              fetchCorpora(altUrl)
-              saveAndRedirect()
-            }, () => {
-              setSubmitting(false)
-              setErrors(['error.server-url'])
-            })
-        } else {
-          setSubmitting(false)
-          setErrors(['error.server-url'])
-        }
+        setSubmitting(false)
+        setErrors(['error.server-url'])
       })
   }
 
@@ -172,7 +152,7 @@ const ServerForm = ({
       fullConfig :
       { ...data }
 
-    server.url = server.url.replace(/#.*$/, '')
+    server.url = server.url.replace(/#.*$/, '').replace(/(\/|api)*$/, '/api/')
 
     if (!server.password) delete server.password
     server.home = server.url.replace(/[/-]+api\/+?$/, '/')