linagora · dab246 · Mar 4, 2025 · Mar 4, 2025 · Mar 4, 2025 · May 19, 2025
diff --git a/lib/features/base/base_controller.dart b/lib/features/base/base_controller.dart
@@ -428,7 +428,7 @@ abstract class BaseController extends GetxController
     if (PlatformInfo.isMobile) {
       showLogoutConfirmDialog(
         context: context,
-        userAddress: session?.getOwnEmailAddress() ?? '',
+        userAddress: session?.getOwnEmailAddressOrEmpty() ?? '',
         onConfirmAction: () => _handleLogoutAction(session, accountId),
       );
     } else {

diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
@@ -243,7 +243,7 @@ class ComposerController extends BaseController
   int? get savedEmailDraftHash => _savedEmailDraftHash;
 
   GetEmailContentInteractor get getEmailContentInteractor => _getEmailContentInteractor;
-  
+
   GetServerSettingInteractor get getServerSettingInteractor => _getServerSettingInteractor;
 
   GetAllIdentitiesInteractor get getAllIdentitiesInteractor => _getAllIdentitiesInteractor;
@@ -622,7 +622,7 @@ class ComposerController extends BaseController
       mailboxDashBoardController.accountId.value,
     );
   }
-  
+
   Future<void> setupComposer() async {
     _isEmailBodyLoaded = false;
     final arguments = PlatformInfo.isWeb ? composerArgs : Get.arguments;
@@ -687,7 +687,7 @@ class ComposerController extends BaseController
     required EmailActionType actionType,
     String? listPost,
   }) {
-    final senderEmailAddress = mailboxDashBoardController.sessionCurrent?.getOwnEmailAddress();
+    final senderEmailAddress = mailboxDashBoardController.sessionCurrent?.getOwnEmailAddressOrEmpty();
     final isSender = presentationEmail.from
       .asList()
       .any((element) => element.emailAddress.isNotEmpty && element.emailAddress == senderEmailAddress);
@@ -1286,7 +1286,7 @@ class ComposerController extends BaseController
       log('ComposerController::handleClickSaveAsTemplateButton: SESSION or ACCOUNT_ID or ARGUMENTS is NULL');
       return;
     }
-    
+
     MailboxId? templateMailboxId = mailboxDashBoardController
       .getMailboxIdByRole(PresentationMailbox.roleTemplates);
     templateMailboxId ??= mailboxDashBoardController.mapMailboxById

diff --git a/lib/features/composer/presentation/extensions/create_email_request_extension.dart b/lib/features/composer/presentation/extensions/create_email_request_extension.dart
@@ -26,16 +26,20 @@ extension CreateEmailRequestExtension on CreateEmailRequest {
   Set<EmailAddress> createSenders() {
     if (identity?.email?.isNotEmpty == true) {
       return { identity!.toEmailAddress() };
+    } else if (session.getOwnEmailAddressOrEmpty().isNotEmpty) {
+      return { EmailAddress(null, session.getOwnEmailAddressOrEmpty()) };
     } else {
-      return { EmailAddress(null, session.getOwnEmailAddress()) };
+      return {};
     }
   }
 
   String createMdnEmailAddress() {
     if (emailActionType == EmailActionType.editDraft && fromSender?.isNotEmpty == true) {
       return fromSender!.first.emailAddress;
+    } else if (session.getOwnEmailAddressOrEmpty().isNotEmpty) {
+      return session.getOwnEmailAddressOrEmpty();
     } else {
-      return session.getOwnEmailAddress();
+      return '';
     }
   }
 
@@ -48,7 +52,9 @@ extension CreateEmailRequestExtension on CreateEmailRequest {
 
     return identity?.replyTo?.isNotEmpty == true
       ? identity!.replyTo!
-      : {EmailAddress(null, session.getOwnEmailAddress())};
+      : session.getOwnEmailAddressOrEmpty().isNotEmpty
+        ? {EmailAddress(null, session.getOwnEmailAddressOrEmpty(
6D47
))}
+        : null;
   }
 
 

diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart
@@ -1623,7 +1623,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
       return;
     }
 
-    final receiverEmailAddress = _getReceiverEmailAddress(currentEmail!) ?? session!.getOwnEmailAddress();
+    final receiverEmailAddress = _getReceiverEmailAddress(currentEmail!) ?? session!.getOwnEmailAddressOrEmpty();
     log('SingleEmailController::_handleSendReceiptToSenderAction():receiverEmailAddress: $receiverEmailAddress');
     final mdnToSender = _generateMDN(context, currentEmail!, receiverEmailAddress);
     final sendReceiptRequest = SendReceiptToSenderRequest(
@@ -2568,13 +2568,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
     }
   }
 
-  String getOwnEmailAddress() {
-    try {
-      return session?.getOwnEmailAddress() ?? '';
-    } catch (e) {
-      return '';
-    }
-  }
+  String getOwnEmailAddress() => session?.getOwnEmailAddressOrEmpty() ?? '';
 
   void onHtmlContentClippedAction(bool isClipped) {
     log('SingleEmailController::onHtmlContentClippedAction:isClipped = $isClipped');

diff --git a/lib/features/home/domain/extensions/session_extensions.dart b/lib/features/home/domain/extensions/session_extensions.dart
@@ -64,7 +64,7 @@ extension SessionExtensions on Session {
 
   String get internalDomain {
     try {
-      return getOwnEmailAddress().split('@').last;
+      return getOwnEmailAddressOrEmpty().split('@').last;
     } catch (e) {
       logError('SessionExtensions::internalDomain: Exception: $e');
       return '';

diff --git a/lib/features/identity_creator/presentation/identity_creator_controller.dart b/lib/features/identity_creator/presentation/identity_creator_controller.dart
@@ -358,9 +358,12 @@ class IdentityCreatorController extends BaseController with DragDropFileMixin im
           .toSet()
           .toList();
 
-      if(session?.getOwnEmailAddress() != null
-      && !listEmailAddressDefault.any((emailAddress) => emailAddress.email == session?.getOwnEmailAddress())) {
-        listEmailAddressDefault.add(EmailAddress(null, session?.getOwnEmailAddress()));
+      if(session?.getOwnEmailAddressOrEmpty().isNotEmpty == true
+      && !listEmailAddressDefault.any((emailAddress) => emailAddress.email == session?.getOwnEmailAddressOrEmpty())) {
+        listEmailAddressDefault.add(EmailAddress(
+          null,
+          session?.getOwnEmailAddressOrEmpty(),
+        ));
       }
       listEmailAddressOfReplyTo.add(noneEmailAddress);
       listEmailAddressOfReplyTo.addAll(listEmailAddressDefault);
@@ -381,8 +384,11 @@ class IdentityCreatorController extends BaseController with DragDropFileMixin im
   void _setDefaultEmailAddressList() {
     listEmailAddressOfReplyTo.add(noneEmailAddress);
 
-    if (session?.getOwnEmailAddress() != null) {
-      final userEmailAddress = EmailAddress(null, session?.getOwnEmailAddress());
+    if (session?.getOwnEmailAddressOrEmpty().isNotEmpty == true) {
+      final userEmailAddress = EmailAddress(
+        null,
+        session?.getOwnEmailAddressOrEmpty(),
+      );
       listEmailAddressDefault.add(userEmailAddress);
       listEmailAddressOfReplyTo.addAll(listEmailAddressDefault);
     }

diff --git a/lib/features/login/domain/model/base_url_oidc_response.dart b/lib/features/login/domain/model/base_url_oidc_response.dart
@@ -0,0 +1,14 @@
+
+import 'package:model/oidc/response/oidc_link_dto.dart';
+import 'package:model/oidc/response/oidc_response.dart';
+
+class BaseUrlOidcResponse extends OIDCResponse {
+
+  BaseUrlOidcResponse(Uri baseUri) : super(
+    '',
+    [
+      OIDCLinkDto(baseUri, baseUri)
+    ],
+  );
+}
+
diff --git a/lib/features/login/domain/state/get_oidc_configuration_state.dart b/lib/features/login/domain/state/get_oidc_configuration_state.dart
@@ -17,4 +17,9 @@ class GetOIDCConfigurationSuccess extends UIState {
 class GetOIDCConfigurationFailure extends FeatureFailure {
 
   GetOIDCConfigurationFailure(dynamic exception) : super(exception: exception);
+}
+
+class GetOIDCConfigurationFromBaseUrlFailure extends FeatureFailure {
+
+  GetOIDCConfigurationFromBaseUrlFailure(dynamic exception) : super(exception: exception);
 }
diff --git a/lib/features/login/domain/state/get_oidc_is_available_state.dart b/lib/features/login/domain/state/get_oidc_is_available_state.dart
diff --git a/lib/features/login/domain/usecases/get_oidc_configuration_interactor.dart b/lib/features/login/domain/usecases/get_oidc_configuration_interactor.dart
@@ -3,6 +3,7 @@ import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:dartz/dartz.dart';
 import 'package:model/oidc/response/oidc_response.dart';
+import 'package:tmail_ui_user/features/login/domain/model/base_url_oidc_response.dart';
 import 'package:tmail_ui_user/features/login/domain/repository/authentication_oidc_repository.dart';
 import 'package:tmail_ui_user/features/login/domain/state/get_oidc_configuration_state.dart';
 
@@ -18,8 +19,12 @@ class GetOIDCConfigurationInteractor {
       await _oidcRepository.persistOidcConfiguration(oidcConfiguration);
       yield Right<Failure, Success>(GetOIDCConfigurationSuccess(oidcConfiguration));
     } catch (e) {
-      log('GetOIDCConfigurationInteractor::execute(): ERROR: $e');
-      yield Left<Failure, Success>(GetOIDCConfigurationFailure(e));
+      logError('$runtimeType::execute():oidcResponse = ${oidcResponse.runtimeType} | Exception = $e');
+      if (oidcResponse is BaseUrlOidcResponse) {
+        yield Left<Failure, Success>(GetOIDCConfigurationFromBaseUrlFailure(e));
+      } else {
+        yield Left<Failure, Success>(GetOIDCConfigurationFailure(e));
+      }
     }
   }
 }
diff --git a/lib/features/login/domain/usecases/get_oidc_is_available_interactor.dart b/lib/features/login/domain/usecases/get_oidc_is_available_interactor.dart
diff --git a/lib/features/login/presentation/extensions/handle_openid_configuration.dart b/lib/features/login/presentation/extensions/handle_openid_configuration.dart
@@ -0,0 +1,14 @@
+
+import 'package:tmail_ui_user/features/login/domain/model/base_url_oidc_response.dart';
+import 'package:tmail_ui_user/features/login/presentation/login_controller.dart';
+
+extension HandleOpenidConfiguration on LoginController {
+
+  void tryGetOIDCConfigurationFromBaseUrl(Uri baseUri) {
+    getOIDCConfiguration(BaseUrlOidcResponse(baseUri));
+  }
+
+  void handleGetOIDCConfigurationFromBaseUrlFailure() {
+    handleOIDCIsNotAvailable(featureFailure);
+  }
+}
diff --git a/lib/features/login/presentation/login_bindings.dart b/lib/features/login/presentation/login_bindings.dart
@@ -21,7 +21,6 @@ import 'package:tmail_ui_user/features/login/domain/usecases/get_all_recent_logi
 import 'package:tmail_ui_user/features/login/domain/usecases/get_all_recent_login_username_on_mobile_interactor.dart';
 import 'package:tmail_ui_user/features/login/domain/usecases/get_authentication_info_interactor.dart';
 import 'package:tmail_ui_user/features/login/domain/usecases/get_oidc_configuration_interactor.dart';
-import 'package:tmail_ui_user/features/login/domain/usecases/get_oidc_is_available_interactor.dart';
 import 'package:tmail_ui_user/features/login/domain/usecases/get_stored_oidc_configuration_interactor.dart';
 import 'package:tmail_ui_user/features/login/domain/usecases/get_token_oidc_interactor.dart';
 import 'package:tmail_ui_user/features/login/domain/usecases/save_login_url_on_mobile_interactor.dart';
@@ -42,7 +41,6 @@ class LoginBindings extends BaseBindings {
     Get.create(() => LoginController(
       Get.find<AuthenticationInteractor>(),
       Get.find<CheckOIDCIsAvailableInteractor>(),
-      Get.find<GetOIDCIsAvailableInteractor>(),
       Get.find<GetOIDCConfigurationInteractor>(),
       Get.find<GetTokenOIDCInteractor>(),
       Get.find<AuthenticateOidcOnBrowserInteractor>(),
@@ -86,9 +84,6 @@ class LoginBindings extends BaseBindings {
     Get.lazyPut(() => CheckOIDCIsAvailableInteractor(
         Get.find<AuthenticationOIDCRepository>(),
     ));
-    Get.lazyPut(() => GetOIDCIsAvailableInteractor(
-        Get.find<AuthenticationOIDCRepository>(),
-    ));
     Get.lazyPut(() => GetOIDCConfigurationInteractor(
         Get.find<AuthenticationOIDCRepository>(),
     ));