TF-4268 Fix guard against invalid paywall property types

dab246 · dab246 · commit 8b5fbbfd1a03 · 2026-01-23T13:13:37.000+07:00
diff --git a/lib/features/mailbox_dashboard/data/network/linagora_ecosystem_api.dart b/lib/features/mailbox_dashboard/data/network/linagora_ecosystem_api.dart
@@ -34,14 +34,12 @@ class LinagoraEcosystemApi {
     final linagoraEcosystem = await getLinagoraEcosystem(baseUrl);
 
     final paywallProperty =
-        linagoraEcosystem.properties?[LinagoraEcosystemIdentifier.paywallURL]
-            as ApiUrlLinagoraEcosystem?;
+        linagoraEcosystem.properties?[LinagoraEcosystemIdentifier.paywallURL];
     log('LinagoraEcosystemApi::getPaywallUrl: paywallProperty = $paywallProperty');
 
-    if (paywallProperty == null) {
-      throw NotFoundPaywallUrl();
-    } else {
+    if (paywallProperty is ApiUrlLinagoraEcosystem) {
       return PaywallUrlPattern(paywallProperty.value);
     }
+    throw NotFoundPaywallUrl();
   }
 }
diff --git a/lib/features/mailbox_dashboard/domain/state/get_linagora_ecosystem_state.dart b/lib/features/mailbox_dashboard/domain/state/get_linagora_ecosystem_state.dart
@@ -2,17 +2,17 @@ import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/linagora_ecosystem/linagora_ecosystem.dart';
 
-class GettingLinagraEcosystem extends LoadingState {}
+class GettingLinagoraEcosystem extends LoadingState {}
 
-class GetLinagraEcosystemSuccess extends UIState {
+class GetLinagoraEcosystemSuccess extends UIState {
   final LinagoraEcosystem linagoraEcosystem;
 
-  GetLinagraEcosystemSuccess(this.linagoraEcosystem);
+  GetLinagoraEcosystemSuccess(this.linagoraEcosystem);
 
   @override
   List<Object> get props => [linagoraEcosystem];
 }
 
-class GetLinagraEcosystemFailure extends FeatureFailure {
-  GetLinagraEcosystemFailure(dynamic exception) : super(exception: exception);
+class GetLinagoraEcosystemFailure extends FeatureFailure {
+  GetLinagoraEcosystemFailure(dynamic exception) : super(exception: exception);
 }
diff --git a/lib/features/mailbox_dashboard/domain/usecases/get_linagora_ecosystem_interactor.dart b/lib/features/mailbox_dashboard/domain/usecases/get_linagora_ecosystem_interactor.dart
@@ -11,12 +11,12 @@ class GetLinagoraEcosystemInteractor {
 
   Stream<Either<Failure, Success>> execute(String baseUrl) async* {
     try {
-      yield Right(GettingLinagraEcosystem());
+      yield Right(GettingLinagoraEcosystem());
       final linagoraEcosystem =
           await _ecosystemRepository.getLinagoraEcosystem(baseUrl);
-      yield Right(GetLinagraEcosystemSuccess(linagoraEcosystem));
+      yield Right(GetLinagoraEcosystemSuccess(linagoraEcosystem));
     } catch (e) {
-      yield Left(GetLinagraEcosystemFailure(e));
+      yield Left(GetLinagoraEcosystemFailure(e));
     }
   }
 }
diff --git a/lib/features/mailbox_dashboard/presentation/controller/linagora_ecosystem_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/linagora_ecosystem_controller.dart
@@ -51,7 +51,7 @@ class LinagoraEcosystemController with SentryEcosystemMixin {
   }
 
   Future<void> handleGetLinagoraEcosystemSuccess(
-    GetLinagraEcosystemSuccess success,
+    GetLinagoraEcosystemSuccess success,
   ) async {
     if (!PlatformInfo.isAndroid) return;
 
@@ -67,7 +67,7 @@ class LinagoraEcosystemController with SentryEcosystemMixin {
   }
 
   Future<void> handleGetLinagoraEcosystemFailure(
-    GetLinagraEcosystemFailure failure,
+    GetLinagoraEcosystemFailure failure,
   ) async {
     logWarning('LinagoraEcosystemController:handleGetLinagoraEcosystemFailure: $failure');
   }
diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -545,7 +545,7 @@ class MailboxDashBoardController extends ReloadableController
       updateTextFormattingMenuState(success.isDisplayed);
     } else if (success is GetAIScribeConfigSuccess) {
       handleLoadAIScribeConfigSuccess(success.aiScribeConfig);
-    } else if (success is GetLinagraEcosystemSuccess) {
+    } else if (success is GetLinagoraEcosystemSuccess) {
       _ecosystemController?.handleGetLinagoraEcosystemSuccess(success);
     } else {
       super.handleSuccessViewState(success);
@@ -597,7 +597,7 @@ class MailboxDashBoardController extends ReloadableController
       updateTextFormattingMenuState(false);
     } else if (failure is GetAIScribeConfigFailure) {
       handleLoadAIScribeConfigFailure();
-    } else if (failure is GetLinagraEcosystemFailure) {
+    } else if (failure is GetLinagoraEcosystemFailure) {
       _ecosystemController?.handleGetLinagoraEcosystemFailure(failure);
     } else {
       super.handleFailureViewState(failure);
diff --git a/lib/features/mailbox_dashboard/presentation/mixin/sentry_ecosystem_mixin.dart b/lib/features/mailbox_dashboard/presentation/mixin/sentry_ecosystem_mixin.dart
@@ -15,7 +15,7 @@ mixin SentryEcosystemMixin {
     SentryConfigLinagoraEcosystem ecosystemConfig,
   ) async {
     if (ecosystemConfig.enabled != true) {
-      logWarning('SentryEcosystemMixin::_setUpSentry: Sentry is disabled');
+      logWarning('SentryEcosystemMixin::setUpSentry: Sentry is disabled');
       return;
     }
 
@@ -24,13 +24,13 @@ mixin SentryEcosystemMixin {
 
     if (dsn == null || dsn.isEmpty) {
       logWarning(
-          'SentryEcosystemMixin::_setUpSentry: Sentry DSN is invalid (null or empty)');
+          'SentryEcosystemMixin::setUpSentry: Sentry DSN is invalid (null or empty)');
       return;
     }
 
     if (env == null || env.isEmpty) {
       logWarning(
-          'SentryEcosystemMixin::_setUpSentry: Sentry Environment is invalid (null or empty)');
+          'SentryEcosystemMixin::setUpSentry: Sentry Environment is invalid (null or empty)');
       return;
     }
 
diff --git a/lib/features/push_notification/presentation/listener/email_change_listener.dart b/lib/features/push_notification/presentation/listener/email_change_listener.dart
@@ -151,7 +151,9 @@ class EmailChangeListener extends ChangeListener {
       consumeState(_getStoredEmailStateInteractor!.execute(_session!, _accountId!));
     } else {
       logError(
-        'GetStoredEmailStateInteractor is null',
+        'GetStoredEmailStateInteractor/session/accountId missing '
+        '(interactorNull=${_getStoredEmailStateInteractor == null}, '
+        'sessionNull=${_session == null}, accountIdNull=${_accountId == null})',
       );
     }
   }
diff --git a/lib/main/runner/app_error_handlers.dart b/lib/main/runner/app_error_handlers.dart
@@ -1,6 +1,7 @@
 import 'dart:ui';
 
 import 'package:core/utils/app_logger.dart';
+import 'package:core/utils/build_utils.dart';
 import 'package:flutter/material.dart';
 
 /// Configures global error handlers for both Flutter framework and Platform dispatcher.
@@ -23,7 +24,7 @@ void setupErrorHooks() {
       exception: error,
       stackTrace: stack,
     );
-    // Return true to prevent the app from crashing.
-    return true;
+    // Return true in release to prevent crashes; false in debug to surface errors.
+    return BuildUtils.isReleaseMode;
   };
 }
diff --git a/test/features/linagora_ecosystem/deserialize_linagora_ecosystem_test.dart b/test/features/linagora_ecosystem/deserialize_linagora_ecosystem_test.dart
@@ -356,7 +356,7 @@ void main() {
       );
     });
 
-    test('Should treat unknown object as DefaultLinagoraEcosystem', () {
+    test('Should treat unknown object with app-like properties as AppLinagoraEcosystem', () {
       const jsonString = '''
       {
         "unknownConfig": {
diff --git a/test/features/linagora_ecosystem/get_linagora_ecosystem_interactor_test.dart b/test/features/linagora_ecosystem/get_linagora_ecosystem_interactor_test.dart
@@ -41,14 +41,14 @@ void main() {
             predicate<Either>(
               (either) => either.fold(
                 (_) => false,
-                (success) => success is GettingLinagraEcosystem,
+                (success) => success is GettingLinagoraEcosystem,
               ),
             ),
             predicate<Either>(
               (either) => either.fold(
                 (_) => false,
                 (success) =>
-                    success is GetLinagraEcosystemSuccess &&
+                    success is GetLinagoraEcosystemSuccess &&
                     success.linagoraEcosystem == ecosystem,
               ),
             ),
@@ -79,13 +79,13 @@ void main() {
             predicate<Either>(
               (either) => either.fold(
                 (_) => false,
-                (success) => success is GettingLinagraEcosystem,
+                (success) => success is GettingLinagoraEcosystem,
               ),
             ),
             predicate<Either>(
               (either) => either.fold(
                 (failure) =>
-                    failure is GetLinagraEcosystemFailure &&
+                    failure is GetLinagoraEcosystemFailure &&
                     failure.exception == tException,
                 (_) => false,
               ),
diff --git a/test/features/linagora_ecosystem/linagora_ecosystem_api_test.dart b/test/features/linagora_ecosystem/linagora_ecosystem_api_test.dart
@@ -66,8 +66,8 @@ void main() {
         when(mockDioClient.get(any)).thenAnswer((_) async => []);
 
         // Act & Assert
-        expect(
-          () => api.getLinagoraEcosystem(baseUrl),
+        await expectLater(
+          api.getLinagoraEcosystem(baseUrl),
           throwsA(isA<NotFoundLinagoraEcosystem>()),
         );
       });
@@ -98,8 +98,8 @@ void main() {
         when(mockDioClient.get(any)).thenAnswer((_) async => emptyPropsMap);
 
         // Act & Assert
-        expect(
-          () => api.getPaywallUrl(baseUrl),
+        await expectLater(
+          api.getPaywallUrl(baseUrl),
           throwsA(isA<NotFoundPaywallUrl>()),
         );
       });
diff --git a/test/features/linagora_ecosystem/linagora_ecosystem_repository_impl_test.dart b/test/features/linagora_ecosystem/linagora_ecosystem_repository_impl_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/linagora_ecosystem_datasource.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/repository/linagora_ecosystem_repository_impl.dart'; // Adjust path if needed
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/repository/linagora_ecosystem_repository_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/linagora_ecosystem/linagora_ecosystem.dart';
 
 import 'linagora_ecosystem_repository_impl_test.mocks.dart';
@@ -45,13 +45,14 @@ void main() {
         // Arrange
         final exception = Exception('Something went wrong');
 
-        when(mockDatasource.getLinagoraEcosystem(any)).thenThrow(exception);
+        when(mockDatasource.getLinagoraEcosystem(any))
+            .thenAnswer((_) async => throw exception);
 
         // Act
         final call = repository.getLinagoraEcosystem;
 
         // Assert
-        expect(() => call(baseUrl), throwsA(equals(exception)));
+        await expectLater(call(baseUrl), throwsA(equals(exception)));
         verify(mockDatasource.getLinagoraEcosystem(baseUrl)).called(1);
         verifyNoMoreInteractions(mockDatasource);
       },

Original file line number	Diff line number	Diff line change
`@@ -34,14 +34,12 @@ class LinagoraEcosystemApi {`
`34`	`34`	`final linagoraEcosystem = await getLinagoraEcosystem(baseUrl);`
`35`	`35`
`36`	`36`	`final paywallProperty =`
`37`		`- linagoraEcosystem.properties?[LinagoraEcosystemIdentifier.paywallURL]`
`38`		`- as ApiUrlLinagoraEcosystem?;`
	`37`	`+ linagoraEcosystem.properties?[LinagoraEcosystemIdentifier.paywallURL];`
`39`	`38`	`log('LinagoraEcosystemApi::getPaywallUrl: paywallProperty = $paywallProperty');`
`40`	`39`
`41`		`- if (paywallProperty == null) {`
`42`		`- throw NotFoundPaywallUrl();`
`43`		`- } else {`
	`40`	`+ if (paywallProperty is ApiUrlLinagoraEcosystem) {`
`44`	`41`	`return PaywallUrlPattern(paywallProperty.value);`
`45`	`42`	`}`
	`43`	`+ throw NotFoundPaywallUrl();`
`46`	`44`	`}`
`47`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@ class GetLinagoraEcosystemInteractor {`
`11`	`11`
`12`	`12`	`Stream<Either<Failure, Success>> execute(String baseUrl) async* {`
`13`	`13`	`try {`
`14`		`- yield Right(GettingLinagraEcosystem());`
	`14`	`+ yield Right(GettingLinagoraEcosystem());`
`15`	`15`	`final linagoraEcosystem =`
`16`	`16`	`await _ecosystemRepository.getLinagoraEcosystem(baseUrl);`
`17`		`- yield Right(GetLinagraEcosystemSuccess(linagoraEcosystem));`
	`17`	`+ yield Right(GetLinagoraEcosystemSuccess(linagoraEcosystem));`
`18`	`18`	`} catch (e) {`
`19`		`- yield Left(GetLinagraEcosystemFailure(e));`
	`19`	`+ yield Left(GetLinagoraEcosystemFailure(e));`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class LinagoraEcosystemController with SentryEcosystemMixin {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`Future<void> handleGetLinagoraEcosystemSuccess(`
`54`		`- GetLinagraEcosystemSuccess success,`
	`54`	`+ GetLinagoraEcosystemSuccess success,`
`55`	`55`	`) async {`
`56`	`56`	`if (!PlatformInfo.isAndroid) return;`
`57`	`57`
`@@ -67,7 +67,7 @@ class LinagoraEcosystemController with SentryEcosystemMixin {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`Future<void> handleGetLinagoraEcosystemFailure(`
`70`		`- GetLinagraEcosystemFailure failure,`
	`70`	`+ GetLinagoraEcosystemFailure failure,`
`71`	`71`	`) async {`
`72`	`72`	`logWarning('LinagoraEcosystemController:handleGetLinagoraEcosystemFailure: $failure');`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,9 @@ class EmailChangeListener extends ChangeListener {`
`151`	`151`	`consumeState(_getStoredEmailStateInteractor!.execute(_session!, _accountId!));`
`152`	`152`	`} else {`
`153`	`153`	`logError(`
`154`		`- 'GetStoredEmailStateInteractor is null',`
	`154`	`+ 'GetStoredEmailStateInteractor/session/accountId missing '`
	`155`	`+ '(interactorNull=${_getStoredEmailStateInteractor == null}, '`
	`156`	`+ 'sessionNull=${_session == null}, accountIdNull=${_accountId == null})',`
`155`	`157`	`);`
`156`	`158`	`}`
`157`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ void main() {`
`356`	`356`	`);`
`357`	`357`	`});`
`358`	`358`
`359`		`- test('Should treat unknown object as DefaultLinagoraEcosystem', () {`
	`359`	`+ test('Should treat unknown object with app-like properties as AppLinagoraEcosystem', () {`
`360`	`360`	`const jsonString = '''`
`361`	`361`	`{`
`362`	`362`	`"unknownConfig": {`