Merge remote-tracking branch 'origin/development' into feature/comple…

…te-d2-relationship-contraints
EyeSeeTea · May 11, 2021 · 925efaa · 925efaa
2 parents 69e6af4 + e82464d
commit 925efaa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@eyeseetea/d2-api",
     "description": "Typed wrapper over DHIS2 API",
-    "version": "1.8.2",
+    "version": "1.8.3",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "repository": {

diff --git a/src/api/dataStore.ts b/src/api/dataStore.ts
@@ -82,13 +82,17 @@ export class DataStore {
     }
 }
 
+function validate2xx(status: number): boolean {
+    return (status >= 200 && status < 300);
+}
+
 function validate404(status: number): boolean {
-    return (status >= 200 && status < 300) || status === 404;
+    return validate2xx(status) || status === 404;
 }
 
 function validateResponse(response: HttpClientResponse<HttpResponse<unknown>>): undefined {
     const { data } = response;
-    if (response.status === 200 && data.status === "OK") {
+    if (validate2xx(response.status) && data.status === "OK") {
         return;
     } else {
         throw new Error(data.message || "Invalid response from server");