client: use xhr for api requests

DmitryScaletta · AlcaDesign · commit 1163a435642e · 2020-08-18T19:31:35.000-05:00
diff --git a/lib/api.js b/lib/api.js
@@ -34,9 +34,9 @@ var api = function api(options, callback) {
 			err => callback(err, response, null)
 		);
 	}
-	// Inside an extension/ReactNative -> we cannot use jsonp!
-	else if(_.isExtension() || _.isReactNative()) {
-		var opts = _.merge({ url, method: "GET", headers: {} }, options);
+	// Web application, extension, React Native etc.
+	else {
+		var opts = _.merge({ method: "GET", headers: {} }, options, { url });
 		// prepare request
 		var xhr = new XMLHttpRequest();
 		xhr.open(opts.method, opts.url, true);
@@ -58,21 +58,6 @@ var api = function api(options, callback) {
 		// submit
 		xhr.send();
 	}
-	// Inside a web application, use jsonp..
-	else {
-		var script = document.createElement("script");
-		// Callbacks must match the regex [a-zA-Z_$][\w$]*(\.[a-zA-Z_$][\w$]*)*
-		var callbackName = `jsonp_callback_${Math.round(100000 * Math.random())}`;
-		window[callbackName] = function(data) {
-			delete window[callbackName];
-			document.body.removeChild(script);
-			callback(null, null, data);
-		};
-
-		// Inject the script in the document..
-		script.src = `${url}${url.includes("?") ? "&" : "?"}callback=${callbackName}`;
-		document.body.appendChild(script);
-	}
 }
 
 module.exports = api;
