Fix ajax for challenge creation

[vchess.git] / client / src / utils / ajax.js

diff --git a/client/src/utils/ajax.js b/client/src/utils/ajax.js
index 065f382..5b46078 100644 (file)
--- a/client/src/utils/ajax.js
+++ b/client/src/utils/ajax.js
@@ -1,3 +1,8 @@
+import params from "../parameters"; //for server URL
+
+// TODO: replace by fetch API ?
+// https://www.sitepoint.com/xmlhttprequest-vs-the-fetch-api-whats-best-for-ajax-in-2019/
+
 // From JSON (encoded string values!) to "arg1=...&arg2=..."
 function toQueryString(data)
 {
@@ -12,28 +17,30 @@ function toQueryString(data)
 export function ajax(url, method, data, success, error)
 {
        let xhr = new XMLHttpRequest();
-       if (typeof(data) === "function") //no data
+       if (data === undefined || typeof(data) === "function") //no data
        {
                error = success;
                success = data;
                data = {};
        }
+  if (!success)
+    success = () => {}; //by default, do nothing
        if (!error)
                error = errmsg => { alert(errmsg); };
-
        xhr.onreadystatechange = function() {
                if (this.readyState == 4 && this.status == 200)
                {
+      let res_json = "";
                        try {
-                               let res_json = JSON.parse(xhr.responseText);
-                               if (!res_json.errmsg)
-                                       success(res_json);
-                               else
-                                       error(res_json.errmsg);
-                       } catch (e) {
+                               res_json = JSON.parse(xhr.responseText);
+      } catch (e) {
                                // Plain text (e.g. for rules retrieval)
-                               success(xhr.responseText);
-                       }
+                               return success(xhr.responseText);
+      }
+      if (!res_json.errmsg)
+        success(res_json);
+                       else
+                               error(res_json.errmsg);
                }
        };
 
@@ -42,9 +49,12 @@ export function ajax(url, method, data, success, error)
                // Append query params to URL
                url += "/?" + toQueryString(data);
        }
-       xhr.open(method, url, true);
+       xhr.open(method, params.serverUrl + url, true);
        xhr.setRequestHeader('X-Requested-With', "XMLHttpRequest");
-       if (["POST","PUT"].includes(method))
+       // Next line to allow cross-domain cookies in dev mode (TODO: if...)
+  if (params.cors)
+    xhr.withCredentials = true;
+  if (["POST","PUT"].includes(method))
        {
                xhr.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
                xhr.send(JSON.stringify(data));