From 0e312636a7b0df58665e102d67023ceef53e5c24 Mon Sep 17 00:00:00 2001
From: MohammadTaha Basiri <m.taha.basiri@gmail.com>
Date: Tue, 4 Jan 2022 17:34:25 +0330
Subject: [PATCH] D1APP-22 request service another bug fixed!

---
 lib/services/network/request.dart        | 9 +++++----
 lib/services/network/request_helper.dart | 7 ++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/services/network/request.dart b/lib/services/network/request.dart
index 435a17b..fdc3aab 100644
--- a/lib/services/network/request.dart
+++ b/lib/services/network/request.dart
@@ -150,6 +150,7 @@ class RequestService {
         _body = json.decode(response.body);
       }
     }
+    errorMessage = _errorMessageGenerator();
   }
 
   bool _handleError(http.Response? response) {
@@ -159,7 +160,6 @@ class RequestService {
         name: 'Request fail error',
       );
       isSuccess = false;
-      errorMessage = _errorMessageGenerator(response);
       return false;
     }
     if (response.statusCode != 200 && response.statusCode != 204) {
@@ -176,14 +176,15 @@ class RequestService {
         name: 'Request fail error',
       );
       isSuccess = false;
-      errorMessage = _errorMessageGenerator(response);
       return false;
     }
     isSuccess = true;
     return true;
   }
 
-  String _errorMessageGenerator(http.Response? response) {
-    return '';
+  String _errorMessageGenerator() {
+    return isSuccess
+        ? result['msg']
+        : 'خطا! لطفا اتصال اینترنت خود را بررسی و مجددا تلاش نمایید.';
   }
 }
diff --git a/lib/services/network/request_helper.dart b/lib/services/network/request_helper.dart
index 4e25ff3..b33d39d 100644
--- a/lib/services/network/request_helper.dart
+++ b/lib/services/network/request_helper.dart
@@ -1 +1,6 @@
-class RequestHelper {}
+class RequestHelper {
+  static const String _baseUrl = 'https://didvan-greatsam.fandogh.cloud';
+
+  static const String confirmUsername = _baseUrl + '/user/confirmUsername';
+  static const String login = _baseUrl + '/user/login';
+}