diff --git a/lib/features/email/domain/usecases/download_attachments_interactor.dart b/lib/features/email/domain/usecases/download_attachments_interactor.dart
index c62c89bfe..28a1348be 100644
--- a/lib/features/email/domain/usecases/download_attachments_interactor.dart
+++ b/lib/features/email/domain/usecases/download_attachments_interactor.dart
@@ -4,7 +4,7 @@ import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/email/domain/state/download_attachments_state.dart';
-import 'package:tmail_ui_user/features/login/data/extensions/oidc_configuration_extensions.dart';
+import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
 import 'package:tmail_ui_user/features/login/data/network/config/authorization_interceptors.dart';
 import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart';
 import 'package:tmail_ui_user/features/login/domain/repository/account_repository.dart';
diff --git a/lib/features/login/data/network/authentication_client/authentication_client_mobile.dart b/lib/features/login/data/network/authentication_client/authentication_client_mobile.dart
index 694daaf9c..1947d1ff6 100644
--- a/lib/features/login/data/network/authentication_client/authentication_client_mobile.dart
+++ b/lib/features/login/data/network/authentication_client/authentication_client_mobile.dart
@@ -6,7 +6,7 @@ import 'package:model/oidc/oidc_configuration.dart';
 import 'package:model/oidc/token_id.dart';
 import 'package:model/oidc/token_oidc.dart';
 import 'package:tmail_ui_user/features/login/data/extensions/authentication_token_extension.dart';
-import 'package:tmail_ui_user/features/login/data/extensions/oidc_configuration_extensions.dart';
+import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
 import 'package:tmail_ui_user/features/login/data/extensions/token_response_extension.dart';
 import 'package:tmail_ui_user/features/login/data/network/authentication_client/authentication_client_base.dart';
 import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart';
diff --git a/lib/features/login/data/network/authentication_client/authentication_client_web.dart b/lib/features/login/data/network/authentication_client/authentication_client_web.dart
index 348e6ecfc..4c2f72b4f 100644
--- a/lib/features/login/data/network/authentication_client/authentication_client_web.dart
+++ b/lib/features/login/data/network/authentication_client/authentication_client_web.dart
@@ -2,7 +2,7 @@
 import 'package:core/utils/app_logger.dart';
 import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/login/data/extensions/authentication_token_extension.dart';
-import 'package:tmail_ui_user/features/login/data/extensions/oidc_configuration_extensions.dart';
+import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
 import 'package:tmail_ui_user/features/login/data/extensions/token_response_extension.dart';
 import 'package:tmail_ui_user/features/login/data/network/config/oidc_constant.dart';
 import 'package:tmail_ui_user/features/login/data/utils/library_platform/app_auth_plugin/app_auth_plugin.dart';
diff --git a/lib/features/login/data/network/config/authorization_interceptors.dart b/lib/features/login/data/network/config/authorization_interceptors.dart
index a9c5af296..0b98b536e 100644
--- a/lib/features/login/data/network/config/authorization_interceptors.dart
+++ b/lib/features/login/data/network/config/authorization_interceptors.dart
@@ -8,7 +8,7 @@ import 'package:model/account/authentication_type.dart';
 import 'package:model/oidc/oidc_configuration.dart';
 import 'package:model/oidc/token.dart';
 import 'package:model/oidc/token_oidc.dart';
-import 'package:tmail_ui_user/features/login/data/extensions/oidc_configuration_extensions.dart';
+import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.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';
diff --git a/lib/features/login/data/extensions/oidc_configuration_extensions.dart b/lib/features/login/domain/extensions/oidc_configuration_extensions.dart
similarity index 94%
rename from lib/features/login/data/extensions/oidc_configuration_extensions.dart
rename to lib/features/login/domain/extensions/oidc_configuration_extensions.dart
index c88facfd5..c262e799c 100644
--- a/lib/features/login/data/extensions/oidc_configuration_extensions.dart
+++ b/lib/features/login/domain/extensions/oidc_configuration_extensions.dart
@@ -1,6 +1,6 @@
 
 import 'package:core/utils/build_utils.dart';
-import 'package:model/model.dart';
+import 'package:model/oidc/oidc_configuration.dart';
 import 'package:tmail_ui_user/main/utils/app_config.dart';
 
 extension OidcConfigurationExtensions on OIDCConfiguration {
diff --git a/lib/features/login/domain/usecases/authenticate_oidc_on_browser_interactor.dart b/lib/features/login/domain/usecases/authenticate_oidc_on_browser_interactor.dart
index 24dcf9d07..764c3e886 100644
--- a/lib/features/login/domain/usecases/authenticate_oidc_on_browser_interactor.dart
+++ b/lib/features/login/domain/usecases/authenticate_oidc_on_browser_interactor.dart
@@ -4,7 +4,7 @@ import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:dartz/dartz.dart';
 import 'package:model/oidc/oidc_configuration.dart';
-import 'package:tmail_ui_user/features/login/data/extensions/oidc_configuration_extensions.dart';
+import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
 import 'package:tmail_ui_user/features/login/domain/repository/authentication_oidc_repository.dart';
 import 'package:tmail_ui_user/features/login/domain/state/authenticate_oidc_on_browser_state.dart';
 
diff --git a/lib/features/login/domain/usecases/get_token_oidc_interactor.dart b/lib/features/login/domain/usecases/get_token_oidc_interactor.dart
index 9f3b91c19..9428ac346 100644
--- a/lib/features/login/domain/usecases/get_token_oidc_interactor.dart
+++ b/lib/features/login/domain/usecases/get_token_oidc_interactor.dart
@@ -7,7 +7,7 @@ import 'package:model/account/account.dart';
 import 'package:model/account/authentication_type.dart';
 import 'package:model/oidc/oidc_configuration.dart';
 import 'package:model/oidc/token_oidc.dart';
-import 'package:tmail_ui_user/features/login/data/extensions/oidc_configuration_extensions.dart';
+import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
 import 'package:tmail_ui_user/features/login/domain/repository/account_repository.dart';
 import 'package:tmail_ui_user/features/login/domain/repository/authentication_oidc_repository.dart';
 import 'package:tmail_ui_user/features/login/domain/repository/credential_repository.dart';
diff --git a/lib/features/login/domain/usecases/refresh_token_oidc_interactor.dart b/lib/features/login/domain/usecases/refresh_token_oidc_interactor.dart
index 524789158..83ea9359b 100644
--- a/lib/features/login/domain/usecases/refresh_token_oidc_interactor.dart
+++ b/lib/features/login/domain/usecases/refresh_token_oidc_interactor.dart
@@ -2,7 +2,7 @@
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:model/model.dart';
-import 'package:tmail_ui_user/features/login/data/extensions/oidc_configuration_extensions.dart';
+import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
 import 'package:tmail_ui_user/features/login/domain/repository/account_repository.dart';
 import 'package:tmail_ui_user/features/login/domain/repository/authentication_oidc_repository.dart';
 import 'package:tmail_ui_user/features/login/domain/state/refresh_token_oidc_state.dart';