From 6a87c3da75a9561a82ca500e04fb8ef50e89248d Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 23 Aug 2019 16:44:46 +0300 Subject: [PATCH] Code cleanup --- lib/data/models/document_model.dart | 2 +- lib/data/repositories/auth_repository.dart | 6 +++--- lib/redux/app/app_state.dart | 3 ++- lib/redux/auth/auth_middleware.dart | 8 ++++---- lib/redux/auth/auth_reducer.dart | 4 ++-- lib/ui/auth/login_view.dart | 4 ++-- lib/utils/formatting.dart | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/data/models/document_model.dart b/lib/data/models/document_model.dart index 16dcfe080..ed3652f90 100644 --- a/lib/data/models/document_model.dart +++ b/lib/data/models/document_model.dart @@ -120,7 +120,7 @@ abstract class DocumentEntity extends Object : '${round(size / 1000, 0).toInt()} KB'; String previewUrl(String baseUrl) => - formatApiUrlMachine( + formatApiUrl( baseUrl != null && baseUrl.startsWith('http') ? baseUrl : kAppUrl) + '/documents/$id'; diff --git a/lib/data/repositories/auth_repository.dart b/lib/data/repositories/auth_repository.dart index 0392dee2e..9998b19af 100644 --- a/lib/data/repositories/auth_repository.dart +++ b/lib/data/repositories/auth_repository.dart @@ -29,7 +29,7 @@ class AuthRepository { 'one_time_password': oneTimePassword, }; - url = formatApiUrlMachine(url) + '/login'; + url = formatApiUrl(url) + '/login'; return sendRequest(url: url, data: credentials); } @@ -42,7 +42,7 @@ class AuthRepository { 'token': token, 'provider': 'google', }; - url = formatApiUrlMachine(url) + '/oauth_login'; + url = formatApiUrl(url) + '/oauth_login'; return sendRequest(url: url, data: credentials); } @@ -53,7 +53,7 @@ class AuthRepository { 'token_name': 'invoice-ninja-$platform-app', }; - url = formatApiUrlMachine(url) + '/refresh'; + url = formatApiUrl(url) + '/refresh'; return sendRequest(url: url, data: credentials, token: token); } diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart index 609d13a65..2fd842c50 100644 --- a/lib/redux/app/app_state.dart +++ b/lib/redux/app/app_state.dart @@ -266,7 +266,8 @@ abstract class AppState implements Built { @override String toString() { - return 'Is Testing: ${uiState.isTesting}'; + return 'URL: ${authState.url}'; + //return 'Is Testing: ${uiState.isTesting}'; //return 'Route: ${uiState.currentRoute}, Previous: ${uiState.previousRoute}, Layout: ${uiState.layout}, Menu: ${uiState.isMenuVisible}, History: ${uiState.isHistoryVisible}'; } } diff --git a/lib/redux/auth/auth_middleware.dart b/lib/redux/auth/auth_middleware.dart index 6c15a057e..de7ef4e26 100644 --- a/lib/redux/auth/auth_middleware.dart +++ b/lib/redux/auth/auth_middleware.dart @@ -30,8 +30,8 @@ void _saveAuthLocal({String email, String url, String secret}) async { final SharedPreferences prefs = await SharedPreferences.getInstance(); prefs.setString(kSharedPrefEmail, email ?? ''); - if (formatApiUrlReadable(url) != kAppUrl) { - prefs.setString(kSharedPrefUrl, formatApiUrlMachine(url)); + if (cleanApiUrl(url).isNotEmpty && cleanApiUrl(url) != kAppUrl) { + prefs.setString(kSharedPrefUrl, formatApiUrl(url)); prefs.setString(kSharedPrefSecret, secret); } } @@ -39,7 +39,7 @@ void _saveAuthLocal({String email, String url, String secret}) async { void _loadAuthLocal(Store store) async { final SharedPreferences prefs = await SharedPreferences.getInstance(); final String email = prefs.getString(kSharedPrefEmail) ?? ''; - final String url = formatApiUrlMachine(prefs.getString(kSharedPrefUrl) ?? ''); + final String url = formatApiUrl(prefs.getString(kSharedPrefUrl) ?? ''); final String secret = prefs.getString(kSharedPrefSecret) ?? ''; store.dispatch(UserLoginLoaded(email, url, secret)); @@ -153,7 +153,7 @@ Middleware _createRefreshRequest(AuthRepository repository) { final SharedPreferences prefs = await SharedPreferences.getInstance(); final String url = - formatApiUrlMachine(prefs.getString(kSharedPrefUrl) ?? Config.TEST_URL); + formatApiUrl(prefs.getString(kSharedPrefUrl) ?? Config.TEST_URL); final String token = prefs.getString(getCompanyTokenKey()); repository diff --git a/lib/redux/auth/auth_reducer.dart b/lib/redux/auth/auth_reducer.dart index 37805f322..019216284 100644 --- a/lib/redux/auth/auth_reducer.dart +++ b/lib/redux/auth/auth_reducer.dart @@ -28,7 +28,7 @@ AuthState userLoginRequestReducer( AuthState authState, UserLoginRequest action) { return authState.rebuild((b) => b ..error = null - ..url = formatApiUrlMachine(action.url) + ..url = formatApiUrl(action.url) ..secret = action.secret ..email = action.email ..password = action.password); @@ -38,7 +38,7 @@ AuthState oauthLoginRequestReducer( AuthState authState, OAuthLoginRequest action) { return authState.rebuild((b) => b ..error = null - ..url = formatApiUrlMachine(action.url) + ..url = formatApiUrl(action.url) ..secret = action.secret); } diff --git a/lib/ui/auth/login_view.dart b/lib/ui/auth/login_view.dart index 5b2206e0a..387c82270 100644 --- a/lib/ui/auth/login_view.dart +++ b/lib/ui/auth/login_view.dart @@ -41,10 +41,10 @@ class _LoginState extends State { final state = widget.viewModel.authState; _emailController.text = state.email; _passwordController.text = state.password; - _urlController.text = formatApiUrlReadable(state.url); + _urlController.text = cleanApiUrl(state.url); _secretController.text = state.secret; - if (state.url.isNotEmpty) { + if (cleanApiUrl(state.url).isNotEmpty) { _isSelfHosted = true; } diff --git a/lib/utils/formatting.dart b/lib/utils/formatting.dart index 949b2b4b7..d9d7d6ad5 100644 --- a/lib/utils/formatting.dart +++ b/lib/utils/formatting.dart @@ -277,9 +277,9 @@ String formatDate(String value, BuildContext context, } } -String formatApiUrlMachine(String url) => formatApiUrlReadable(url) + '/api/v1'; +String formatApiUrl(String url) => cleanApiUrl(url) + '/api/v1'; -String formatApiUrlReadable(String url) => url +String cleanApiUrl(String url) => url .trim() .replaceFirst(RegExp(r'/api/v1'), '') .replaceFirst(RegExp(r'/$'), '');