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'; +}