X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Futils%2Fajax.js;h=7d520ec8cc6a5e78b0387b61a4b9a15139b0a3dc;hb=d9a7a1e40254bda6e545514596a7363048c084f9;hp=86925b03765006dae3eaeeb36bc388f61b884efb;hpb=4f298adbee00942323fc7ec517117552aeb5a08a;p=vchess.git

diff --git a/client/src/utils/ajax.js b/client/src/utils/ajax.js
index 86925b03..7d520ec8 100644
--- a/client/src/utils/ajax.js
+++ b/client/src/utils/ajax.js
@@ -1,12 +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/
-// Problem: fetch() does not set req.xhr... see access/ajax() security especially for /whoami
+import { store } from "../store"; //for translations
 
 // From JSON (encoded string values!) to "arg1=...&arg2=..."
-function toQueryString(data)
-{
+function toQueryString(data) {
   let data_str = "";
   Object.keys(data).forEach(k => {
     data_str += k + "=" + encodeURIComponent(data[k]) + "&";
@@ -14,57 +10,45 @@ function toQueryString(data)
   return data_str.slice(0, -1); //remove last "&"
 }
 
-// data, error: optional
-export function ajax(url, method, data, success, error)
-{
-  let xhr = new XMLHttpRequest();
-  if (data === undefined || typeof(data) === "function") //no data
-  {
-    error = success;
-    success = data;
-    data = {};
+// TODO: use this syntax https://stackoverflow.com/a/29823632 ?
+// data, success, error: optional
+export function ajax(url, method, options) {
+  options = options || {};
+  const data = options.data || {};
+  // By default, do nothing on success and print errors:
+  if (!options.success)
+    options.success = () => {};
+  if (!options.error) {
+    options.error = (errmsg) => {
+      alert(store.state.tr[errmsg] || errmsg);
+    };
   }
-  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 {
-        res_json = JSON.parse(xhr.responseText);
-      } catch (e) {
-        // Plain text (e.g. for rules retrieval)
-        return success(xhr.responseText);
-      }
-      if (!res_json.errmsg && !res_json.errno)
-        success(res_json);
-      else
-      {
-        if (!!res_json.errmsg)
-          error(res_json.errmsg);
-        else
-          error(res_json.code + ". errno = " + res_json.errno);
-      }
-    }
-  };
-
-  if (["GET","DELETE"].includes(method) && !!data)
-  {
+  if (["GET", "DELETE"].includes(method) && !!data)
     // Append query params to URL
     url += "/?" + toQueryString(data);
+  const headers = {
+    "Content-Type": "application/json;charset=UTF-8",
+    "X-Requested-With": "XMLHttpRequest"
+  };
+  let fetchOptions = {
+    method: method,
+    headers: headers,
+  };
+  if (["POST", "PUT"].includes(method))
+    fetchOptions["body"] = JSON.stringify(data);
+  if (
+    !!options.credentials ||
+    (method != "GET" && !options.nocredentials)
+  ) {
+    fetchOptions["credentials"] = params.credentials;
   }
-  xhr.open(method, params.serverUrl + url, true);
-  xhr.setRequestHeader('X-Requested-With', "XMLHttpRequest");
-  // Next line to allow cross-domain cookies in dev mode
-  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));
-  }
-  else
-    xhr.send();
+  fetch(params.serverUrl + url, fetchOptions)
+  .then(res => res.json())
+  .then(json => {
+    if (!json.errmsg && !json.errno) options.success(json);
+    else {
+      if (!!json.errmsg) options.error(json.errmsg);
+      else options.error(json.code + ". errno = " + json.errno);
+    }
+  });
 }