fix base app client

5 years ago · 7c4e0d929f
parent 531a9f0545
commit 7c4e0d929f
2 changed files with 82 additions and 27 deletions
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -7,6 +7,8 @@ PODS:
  - connectivity (0.0.1):
    - Flutter
    - Reachability
+  - connectivity_for_web (0.1.0):
+    - Flutter
  - connectivity_macos (0.0.1):
    - Flutter
  - device_info (0.0.1):
@ -22,17 +24,27 @@ PODS:
    - Flutter
  - local_auth (0.0.1):
    - Flutter
+  - maps_launcher (0.0.1):
+    - Flutter
  - MTBBarcodeScanner (5.0.11)
  - OpenTok (2.15.3)
-  - "permission_handler (5.0.0+hotfix.5)":
+  - path_provider_linux (0.0.1):
+    - Flutter
+  - path_provider_windows (0.0.1):
+    - Flutter
+  - "permission_handler (5.0.1+1)":
    - Flutter
  - Reachability (3.2)
  - shared_preferences (0.0.1):
    - Flutter
+  - shared_preferences_linux (0.0.1):
+    - Flutter
  - shared_preferences_macos (0.0.1):
    - Flutter
  - shared_preferences_web (0.0.1):
    - Flutter
+  - shared_preferences_windows (0.0.1):
+    - Flutter
  - speech_to_text (0.0.1):
    - Flutter
    - Try
@ -40,15 +52,20 @@ PODS:
  - Try (2.1.1)
  - url_launcher (0.0.1):
    - Flutter
+  - url_launcher_linux (0.0.1):
+    - Flutter
  - url_launcher_macos (0.0.1):
    - Flutter
  - url_launcher_web (0.0.1):
    - Flutter
+  - url_launcher_windows (0.0.1):
+    - Flutter

 DEPENDENCIES:
  - Alamofire
  - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
  - connectivity (from `.symlinks/plugins/connectivity/ios`)
+  - connectivity_for_web (from `.symlinks/plugins/connectivity_for_web/ios`)
  - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
  - device_info (from `.symlinks/plugins/device_info/ios`)
  - Flutter (from `Flutter`)
@ -57,15 +74,22 @@ DEPENDENCIES:
  - hexcolor (from `.symlinks/plugins/hexcolor/ios`)
  - imei_plugin (from `.symlinks/plugins/imei_plugin/ios`)
  - local_auth (from `.symlinks/plugins/local_auth/ios`)
+  - maps_launcher (from `.symlinks/plugins/maps_launcher/ios`)
  - OpenTok
+  - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
+  - path_provider_windows (from `.symlinks/plugins/path_provider_windows/ios`)
  - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
  - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+  - shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`)
  - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
  - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
+  - shared_preferences_windows (from `.symlinks/plugins/shared_preferences_windows/ios`)
  - speech_to_text (from `.symlinks/plugins/speech_to_text/ios`)
  - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
+  - url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`)
  - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)
  - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
+  - url_launcher_windows (from `.symlinks/plugins/url_launcher_windows/ios`)

 SPEC REPOS:
  trunk:
@ -81,6 +105,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/barcode_scan/ios"
  connectivity:
    :path: ".symlinks/plugins/connectivity/ios"
+  connectivity_for_web:
+    :path: ".symlinks/plugins/connectivity_for_web/ios"
  connectivity_macos:
    :path: ".symlinks/plugins/connectivity_macos/ios"
  device_info:
@ -97,27 +123,42 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/imei_plugin/ios"
  local_auth:
    :path: ".symlinks/plugins/local_auth/ios"
+  maps_launcher:
+    :path: ".symlinks/plugins/maps_launcher/ios"
+  path_provider_linux:
+    :path: ".symlinks/plugins/path_provider_linux/ios"
+  path_provider_windows:
+    :path: ".symlinks/plugins/path_provider_windows/ios"
  permission_handler:
    :path: ".symlinks/plugins/permission_handler/ios"
  shared_preferences:
    :path: ".symlinks/plugins/shared_preferences/ios"
+  shared_preferences_linux:
+    :path: ".symlinks/plugins/shared_preferences_linux/ios"
  shared_preferences_macos:
    :path: ".symlinks/plugins/shared_preferences_macos/ios"
  shared_preferences_web:
    :path: ".symlinks/plugins/shared_preferences_web/ios"
+  shared_preferences_windows:
+    :path: ".symlinks/plugins/shared_preferences_windows/ios"
  speech_to_text:
    :path: ".symlinks/plugins/speech_to_text/ios"
  url_launcher:
    :path: ".symlinks/plugins/url_launcher/ios"
+  url_launcher_linux:
+    :path: ".symlinks/plugins/url_launcher_linux/ios"
  url_launcher_macos:
    :path: ".symlinks/plugins/url_launcher_macos/ios"
  url_launcher_web:
    :path: ".symlinks/plugins/url_launcher_web/ios"
+  url_launcher_windows:
+    :path: ".symlinks/plugins/url_launcher_windows/ios"

 SPEC CHECKSUMS:
  Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
  barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
-  connectivity: 6e94255659cc86dcbef1d452ad3e0491bb1b3e75
+  connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
+  connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b
  connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
  device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
@ -126,20 +167,27 @@ SPEC CHECKSUMS:
  hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89
  imei_plugin: cb1af7c223ac2d82dcd1457a7137d93d65d2a3cd
  local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
+  maps_launcher: eae38ee13a9c3f210fa04e04bb4c073fa4c6ed92
  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
  OpenTok: fde03ecc5ea31fe0a453242847c4ee1f47e1d735
-  permission_handler: 6226fcb78b97c7c7458a95c7346a11d5184fec12
+  path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
+  path_provider_windows: a2b81600c677ac1959367280991971cb9a1edb3b
+  permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
  shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
+  shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78
  shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
  shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
+  shared_preferences_windows: 36b76d6f54e76ead957e60b49e2f124b4cd3e6ae
  speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe
  SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932
  Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96
  url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
+  url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
  url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
  url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
+  url_launcher_windows: 683d7c283894db8d1914d3ab2223b20cc1ad95d5

 PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69

-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.0
--- a/lib/client/base_app_client.dart
+++ b/lib/client/base_app_client.dart
@ -41,6 +41,8 @@ class BaseAppClient {
      if (profile != null) {
        DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);

+        body.containsKey('patientArrivalList');
+
        if (body['DoctorID'] == null)
          body['DoctorID'] = doctorProfile?.doctorID;
        body['EditedBy'] = doctorProfile?.doctorID;
@ -79,7 +81,7 @@ class BaseAppClient {
              'Accept': 'application/json'
            });
        final int statusCode = response.statusCode;
-        if (statusCode < 200 || statusCode >= 400 || json == null) {
+        if (statusCode < 200 || statusCode >= 400 ) {
          onFailure('Error While Fetching data', statusCode);
        } else {
          var parsed = json.decode(response.body.toString());
@ -90,29 +92,12 @@ class BaseAppClient {
          //   helpers.showErrorToast('Your session expired Please login agian');
          // } else
          if (parsed['MessageStatus'] == 1) {
-            onSuccess(parsed, statusCode);
+            if(!parsed['IsAuthenticated'])
+              onFailure(getError(parsed), statusCode);
+            else
+              onSuccess(parsed, statusCode);
          } else {
-            String error =
-                parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'];
-
-            if (parsed["ValidationErrors"] != null) {
-              error =
-                  parsed["ValidationErrors"]["StatusMessage"].toString() + "\n";
-
-              if (parsed["ValidationErrors"]["ValidationErrors"] != null &&
-                  parsed["ValidationErrors"]["ValidationErrors"].length != 0) {
-                for (var i = 0;
-                i < parsed["ValidationErrors"]["ValidationErrors"].length;
-                i++) {
-                  error = error +
-                      parsed["ValidationErrors"]["ValidationErrors"][i]
-                          ["Messages"][0] +
-                      "\n";
-                }
-              }
-            }
-
-            onFailure(error, statusCode);
+            onFailure(getError(parsed), statusCode);
          }
        }
      } else {
@ -123,4 +108,26 @@ class BaseAppClient {
      onFailure(e.toString(), -1);
    }
  }
+
+  String getError(parsed){
+    //TODO change this fun
+    String error = parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'];
+    if (parsed["ValidationErrors"] != null) {
+
+      error = parsed["ValidationErrors"]["StatusMessage"].toString() + "\n";
+
+      if (parsed["ValidationErrors"]["ValidationErrors"] != null &&
+          parsed["ValidationErrors"]["ValidationErrors"].length != 0) {
+        for (var i = 0;
+        i < parsed["ValidationErrors"]["ValidationErrors"].length;
+        i++) {
+          error = error +
+              parsed["ValidationErrors"]["ValidationErrors"][i]
+              ["Messages"][0] +
+              "\n";
+        }
+      }
+    }
+    return error;
+  }
 }