From d5210c23b04dcfd537b22a470762b2a4c8f8757b Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 26 Jan 2024 08:33:28 +0700 Subject: [PATCH] TF-2461 Remove `TimeOutInterceptor` unnecessary Signed-off-by: dab246 --- .../network/config/time_out_interceptors.dart | 22 ------------------- lib/features/login/data/network/endpoint.dart | 1 - .../bindings/network/network_bindings.dart | 5 +---- .../network/network_isolate_binding.dart | 4 +--- 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 lib/features/login/data/network/config/time_out_interceptors.dart diff --git a/lib/features/login/data/network/config/time_out_interceptors.dart b/lib/features/login/data/network/config/time_out_interceptors.dart deleted file mode 100644 index adae5cf1f..000000000 --- a/lib/features/login/data/network/config/time_out_interceptors.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:core/utils/app_logger.dart'; -import 'package:core/utils/platform_info.dart'; -import 'package:dio/dio.dart'; -import 'package:tmail_ui_user/features/login/data/network/endpoint.dart'; - -class TimeOutInterceptors extends InterceptorsWrapper { - - static const Duration _sessionConnectTimeout = Duration(milliseconds: 5000); - static const Duration _sessionReceiveTimeout = Duration(milliseconds: 5000); - - @override - void onRequest(RequestOptions options, RequestInterceptorHandler handler) { - log('TimeOutInterceptors::onRequest():url: ${options.uri}'); - if (PlatformInfo.isMobile && _validateToGetSession(options.uri)) { - options.connectTimeout = _sessionConnectTimeout; - options.receiveTimeout = _sessionReceiveTimeout; - } - super.onRequest(options, handler); - } - - bool _validateToGetSession(Uri uri) => uri.toString().endsWith(Endpoint.sessionPath.path); -} diff --git a/lib/features/login/data/network/endpoint.dart b/lib/features/login/data/network/endpoint.dart index e3209b692..3429b27d4 100644 --- a/lib/features/login/data/network/endpoint.dart +++ b/lib/features/login/data/network/endpoint.dart @@ -2,5 +2,4 @@ import 'package:core/data/network/config/service_path.dart'; class Endpoint { static final ServicePath webFinger = ServicePath('/.well-known/webfinger'); - static final ServicePath sessionPath = ServicePath('/.well-known/jmap'); } diff --git a/lib/main/bindings/network/network_bindings.dart b/lib/main/bindings/network/network_bindings.dart index 3a54e6d22..7cb95c253 100644 --- a/lib/main/bindings/network/network_bindings.dart +++ b/lib/main/bindings/network/network_bindings.dart @@ -17,9 +17,8 @@ import 'package:tmail_ui_user/features/login/data/local/account_cache_manager.da import 'package:tmail_ui_user/features/login/data/local/authentication_info_cache_manager.dart'; import 'package:tmail_ui_user/features/login/data/local/token_oidc_cache_manager.dart'; import 'package:tmail_ui_user/features/login/data/network/authentication_client/authentication_client_base.dart'; -import 'package:tmail_ui_user/features/login/data/network/config/authorization_interceptors.dart'; -import 'package:tmail_ui_user/features/login/data/network/config/time_out_interceptors.dart'; import 'package:tmail_ui_user/features/login/data/network/dns_service.dart'; +import 'package:tmail_ui_user/features/login/data/network/interceptors/authorization_interceptors.dart'; import 'package:tmail_ui_user/features/login/data/network/oidc_http_client.dart'; import 'package:tmail_ui_user/features/login/data/utils/library_platform/app_auth_plugin/app_auth_plugin.dart'; import 'package:tmail_ui_user/features/mailbox/data/local/state_cache_manager.dart'; @@ -90,14 +89,12 @@ class NetworkBindings extends Bindings { Get.find(), )); Get.put(LocaleInterceptor()); - Get.put(TimeOutInterceptors()); Get.find().interceptors.add(Get.find()); Get.find().interceptors.add(Get.find()); if (kDebugMode) { Get.find().interceptors.add(LogInterceptor(requestBody: true)); } Get.find().interceptors.add(Get.find()); - Get.find().interceptors.add(Get.find()); } void _bindingApi() { diff --git a/lib/main/bindings/network/network_isolate_binding.dart b/lib/main/bindings/network/network_isolate_binding.dart index b1f6aa911..b99d9f51a 100644 --- a/lib/main/bindings/network/network_isolate_binding.dart +++ b/lib/main/bindings/network/network_isolate_binding.dart @@ -8,8 +8,7 @@ import 'package:tmail_ui_user/features/email/data/network/email_api.dart'; import 'package:tmail_ui_user/features/login/data/local/account_cache_manager.dart'; import 'package:tmail_ui_user/features/login/data/local/token_oidc_cache_manager.dart'; import 'package:tmail_ui_user/features/login/data/network/authentication_client/authentication_client_base.dart'; -import 'package:tmail_ui_user/features/login/data/network/config/authorization_interceptors.dart'; -import 'package:tmail_ui_user/features/login/data/network/config/time_out_interceptors.dart'; +import 'package:tmail_ui_user/features/login/data/network/interceptors/authorization_interceptors.dart'; import 'package:tmail_ui_user/features/login/data/utils/library_platform/app_auth_plugin/app_auth_plugin.dart'; import 'package:tmail_ui_user/features/mailbox/data/network/mailbox_isolate_worker.dart'; import 'package:tmail_ui_user/features/thread/data/network/thread_api.dart'; @@ -52,7 +51,6 @@ class NetworkIsolateBindings extends Bindings { dio.interceptors.add(LogInterceptor(requestBody: true)); } dio.interceptors.add(Get.find()); - dio.interceptors.add(Get.find()); } void _bindingApi() {