Bump follow-redirects from 1.15.2 to 1.15.4

[nominatim-ui.git] / src / lib / api_utils.js

diff --git a/src/lib/api_utils.js b/src/lib/api_utils.js
index 7510c126c3125d6d43d930789797c94aa310f9d2..3cbc0dfede37242d8657325823079de2d76bc3c0 100644 (file)
--- a/src/lib/api_utils.js
+++ b/src/lib/api_utils.js
@@ -10,12 +10,7 @@ function api_request_progress(status) {
 export async function fetch_from_api(endpoint_name, params, callback) {
   var api_url = generate_nominatim_api_url(endpoint_name, params);
 
-  // For the test suite:
-  // If httpbin_status URL parameter is set we call https://httpbin.org/#/Status_codes
-  var tmp_params = new URLSearchParams(window.location.search);
-  if (tmp_params && tmp_params.get('httpbin_status')) {
-    api_url = 'https://httpbin.org/status/' + parseInt(tmp_params.get('httpbin_status'), 10);
-  }
+  const mock_api_error = (new URLSearchParams(window.location.search)).get('mock_api_error');
 
   api_request_progress('start');
   if (endpoint_name !== 'status') last_api_request_url_store.set(null);
@@ -23,7 +18,9 @@ export async function fetch_from_api(endpoint_name, params, callback) {
   try {
     await fetch(api_url, { headers: Nominatim_Config.Nominatim_API_Endpoint_Headers || {} })
       .then(async (response) => {
-        if (!((response.status >= 200 && response.status < 300) || response.status === 404)) {
+        if ((!((response.status >= 200 && response.status < 300) || response.status === 404))
+            || mock_api_error === 'fetch'
+        ) {
           error_store.set(`Error fetching data from ${api_url} (${response.statusText})`);
           return undefined;
         }
@@ -32,7 +29,11 @@ export async function fetch_from_api(endpoint_name, params, callback) {
         // errors.
         var data;
         try {
-          data = await response.json();
+          if (mock_api_error === 'parse') {
+            data = JSON.parse('{');
+          } else {
+            data = await response.json();
+          }
         } catch (err) {
           // e.g. 'JSON.parse: unexpected non-whitespace character after JSON data at line 1'
           error_store.set(`Error parsing JSON data from ${api_url} (${err})`);