Lista mensajerias

src/API.js

@@ -566,7 +566,7 @@
 var refreshToken = function(baseURL, refreshToken) {
 
   return axios({
     method: 'POST',
     url: `${baseURL}/api/token/refresh`,
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -695,14 +695,14 @@
   }
 }
 
-const checkServer = function(server) {
+const checkServer = function(server, quick) {
   return new Promise((resolve, reject) => {
     resolveBaseURL(server)
       .then((baseURL) => {
-
-        console.log('Base URL is ' + baseURL)
-
+        if (quick == true) {
+          resolve(baseURL);
+        }
         axios
           .get(`${baseURL}/api`, {
             headers: {
               'Content-Type': 'application/json',
@@ -731,6 +731,7 @@
           .catch(error => {
             if (error.response) {
               if (error.response.status === 503) {
+                console.log(baseURL + ' is under maintenace');
                 reject(createError(ERROR_MAINTENANCE_ON))
               } else {
                 reject(createError(ERROR_NOT_COMPATIBLE))

src/Server.js

@@ -1,5 +1,6 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import axios from 'axios'
+import API from './API'
 
 const load = () => {
 
@@ -8,10 +9,8 @@
       AsyncStorage.getItem('@CoopCycle.servers')
         .then((data, e) => {
           if (e || !data) {
-
             return resolve([])
           }
-
           resolve(JSON.parse(data))
         })
     } catch (e) {
@@ -47,9 +46,25 @@
   })
 }
 
-function overrideCity(values) {
 
+async function overrideCity(values) {
+  const fail = Symbol()
+
+    const promises = values.map(async(n) => ({
+      value: n,
+      include: await API.checkServer(n.url, true).then(value => {
+        return true;
+      }).catch(err => {
+        console.log(err); // 👉️ "Something went wrong"
+        return false;
+      })
+    }));
+    const data_with_includes = await Promise.all(promises);
+    const filtered_data_with_includes = data_with_includes.filter(v => v.include);
+    const filtered_data = filtered_data_with_includes.map(data => data.value);
+  values = filtered_data;
   return values.map((value) => {
+
     if (value.city.startsWith('Ciudad de México')) {
       return {
         ...value,
@@ -86,4 +101,4 @@
 
 }
 
-export default Server
+export default Server

src/redux/App/actions.js

@@ -287,13 +287,13 @@ function loadAll(getState) {
 }
 
 export function selectServer(server) {
-
+  console.log('selected server: ' + server);
   return function (dispatch, getState) {
 
     dispatch(setLoading(true))
     dispatch(_clearSelectServerError())
 
-    return API.checkServer(server)
+    return API.checkServer(server, false)
       .then(baseURL =>
         Settings.synchronize(baseURL)
           .then((settings) => {