Merge pull request #101 from flutter-news-app-full-source-code/fix-demo-env-login-with-email

fulleni · web-flow · commit 79bcdd5e2475 · 2025-08-24T13:16:02.000+01:00
Fix demo env login with email
diff --git a/lib/app/bloc/app_bloc.dart b/lib/app/bloc/app_bloc.dart
@@ -22,6 +22,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
     required DataRepository<User> userRepository,
     required local_config.AppEnvironment environment,
     this.demoDataMigrationService,
+    this.initialUser,
   }) : _authenticationRepository = authenticationRepository,
        _userAppSettingsRepository = userAppSettingsRepository,
        _appConfigRepository = appConfigRepository,
@@ -54,6 +55,13 @@ class AppBloc extends Bloc<AppEvent, AppState> {
            selectedBottomNavigationIndex: 0,
            remoteConfig: null,
            environment: environment,
+           // Initialize status and user based on initialUser
+           status: initialUser != null
+               ? (initialUser.appRole == AppUserRole.standardUser
+                   ? AppStatus.authenticated
+                   : AppStatus.anonymous)
+               : AppStatus.unauthenticated,
+           user: initialUser,
          ),
        ) {
     on<AppUserChanged>(_onAppUserChanged);
@@ -79,6 +87,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
   final DataRepository<User> _userRepository;
   final local_config.AppEnvironment _environment;
   final DemoDataMigrationService? demoDataMigrationService;
+  final User? initialUser;
   late final StreamSubscription<User?> _userSubscription;
 
   /// Handles user changes and loads initial settings once user is available.
diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart
@@ -33,6 +33,7 @@ class App extends StatelessWidget {
     required AppEnvironment environment,
     required AdService adService,
     this.demoDataMigrationService,
+    this.initialUser,
     super.key,
   }) : _authenticationRepository = authenticationRepository,
        _headlinesRepository = headlinesRepository,
@@ -61,6 +62,7 @@ class App extends StatelessWidget {
   final AppEnvironment _environment;
   final AdService _adService;
   final DemoDataMigrationService? demoDataMigrationService;
+  final User? initialUser;
 
   @override
   Widget build(BuildContext context) {
@@ -89,6 +91,7 @@ class App extends StatelessWidget {
               userRepository: context.read<DataRepository<User>>(),
               environment: _environment,
               demoDataMigrationService: demoDataMigrationService,
+              initialUser: initialUser,
             ),
           ),
           BlocProvider(
diff --git a/lib/authentication/view/request_code_page.dart b/lib/authentication/view/request_code_page.dart
@@ -5,6 +5,8 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/authentication/bloc/authentication_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
@@ -130,6 +132,33 @@ class _RequestCodeView extends StatelessWidget {
                         ),
                         textAlign: TextAlign.center,
                       ),
+
+                      // NOT NEEDED; any email is accepted in demo mode
+                      //
+                      //Display demo email suggestion if in demo environment
+                      // BlocSelector<AppBloc, AppState, AppEnvironment?>(
+                      //   selector: (state) => state.environment,
+                      //   builder: (context, environment) {
+                      //     if (environment == AppEnvironment.demo) {
+                      //       return Column(
+                      //         children: [
+                      //           const SizedBox(height: AppSpacing.md),
+                      //           Text(
+                      //             l10n.demoEmailSuggestionMessage(
+                      //               'admin@mail.com',
+                      //             ),
+                      //             style: textTheme.bodyMedium?.copyWith(
+                      //               color: colorScheme.secondary,
+                      //               fontWeight: FontWeight.bold,
+                      //             ),
+                      //             textAlign: TextAlign.center,
+                      //           ),
+                      //         ],
+                      //       );
+                      //     }
+                      //     return const SizedBox.shrink();
+                      //   },
+                      // ),
                       const SizedBox(height: AppSpacing.xxl),
                       _EmailLinkForm(isLoading: isLoading),
                     ],
diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart
@@ -73,6 +73,10 @@ Future<Widget> bootstrap(
     );
   }
 
+  // Fetch the initial user from the authentication repository.
+  // This ensures the AppBloc starts with an accurate authentication status.
+  final initialUser = await authenticationRepository.getCurrentUser();
+
   // Conditional data client instantiation based on environment
   DataClient<Headline> headlinesClient;
   DataClient<Topic> topicsClient;
@@ -289,5 +293,6 @@ Future<Widget> bootstrap(
     environment: environment,
     demoDataMigrationService: demoDataMigrationService,
     adService: adService,
+    initialUser: initialUser,
   );
 }
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
@@ -1550,6 +1550,12 @@ abstract class AppLocalizations {
   /// **'Demo Mode: Use code {code}'**
   String demoVerificationCodeMessage(String code);
 
+  /// Message shown in demo mode to suggest an email for sign-in
+  ///
+  /// In en, this message translates to:
+  /// **'Demo Mode: Use email {email}'**
+  String demoEmailSuggestionMessage(String email);
+
   /// Label for Headline content type
   ///
   /// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dart
@@ -804,6 +804,11 @@ class AppLocalizationsAr extends AppLocalizations {
     return 'وضع العرض التوضيحي: استخدم الرمز $code';
   }
 
+  @override
+  String demoEmailSuggestionMessage(String email) {
+    return 'وضع العرض التوضيحي: استخدم البريد الإلكتروني $email';
+  }
+
   @override
   String get contentTypeHeadline => 'العناوين الرئيسية';
 
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
@@ -807,6 +807,11 @@ class AppLocalizationsEn extends AppLocalizations {
     return 'Demo Mode: Use code $code';
   }
 
+  @override
+  String demoEmailSuggestionMessage(String email) {
+    return 'Demo Mode: Use email $email';
+  }
+
   @override
   String get contentTypeHeadline => 'Headlines';
 
diff --git a/lib/l10n/arb/app_ar.arb b/lib/l10n/arb/app_ar.arb
@@ -1046,6 +1046,16 @@
             }
         }
     },
+    "demoEmailSuggestionMessage": "وضع العرض التوضيحي: استخدم البريد الإلكتروني {email}",
+    "@demoEmailSuggestionMessage": {
+        "description": "رسالة تظهر في وضع العرض التوضيحي لاقتراح بريد إلكتروني لتسجيل الدخول",
+        "placeholders": {
+            "email": {
+                "type": "String",
+                "example": "demo@example.com"
+            }
+        }
+    },
     "contentTypeHeadline": "العناوين الرئيسية",
     "@contentTypeHeadline": {
         "description": "Label for Headline content type"
diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb
@@ -602,7 +602,6 @@
     "@headlinesFeedFilterNoSourcesMatch": {
         "description": "Message shown when no sources match the selected filters"
     },
-
     "searchModelTypeHeadline": "Headlines",
     "@searchModelTypeHeadline": {
         "description": "Dropdown display name for Headline search type"
@@ -639,7 +638,6 @@
     "@searchHintTextCountry": {
         "description": "Hint text for searching countries"
     },
-
     "searchPageInitialHeadline": "Start Your Search",
     "@searchPageInitialHeadline": {
         "description": "Generic headline for the initial state of the search page"
@@ -1038,7 +1036,7 @@
     "@followedCategoriesEmptySubheadline": {
         "description": "Subheadline for empty state on followed categories page"
     },
-     "demoVerificationCodeMessage": "Demo Mode: Use code {code}",
+    "demoVerificationCodeMessage": "Demo Mode: Use code {code}",
     "@demoVerificationCodeMessage": {
         "description": "Message shown in demo mode to provide the verification code",
         "placeholders": {
@@ -1048,6 +1046,16 @@
             }
         }
     },
+    "demoEmailSuggestionMessage": "Demo Mode: Use email {email}",
+    "@demoEmailSuggestionMessage": {
+        "description": "Message shown in demo mode to suggest an email for sign-in",
+        "placeholders": {
+            "email": {
+                "type": "String",
+                "example": "demo@example.com"
+            }
+        }
+    },
     "contentTypeHeadline": "Headlines",
     "@contentTypeHeadline": {
         "description": "Label for Headline content type"
@@ -1117,4 +1125,4 @@
     "@unfollowButtonText": {
         "description": "Text for the unfollow button on suggestion items"
     }
-}
+}
diff --git a/lib/main.dart b/lib/main.dart
@@ -6,7 +6,7 @@ import 'package:flutter_news_app_mobile_client_full_source_code/app/services/spl
 import 'package:flutter_news_app_mobile_client_full_source_code/bootstrap.dart';
 
 // Define the current application environment (production/development/demo).
-const appEnvironment = AppEnvironment.development;
+const appEnvironment = AppEnvironment.demo;
 
 void main() async {
   final appConfig = switch (appEnvironment) {
diff --git a/lib/router/router.dart b/lib/router/router.dart
@@ -107,20 +107,7 @@ GoRouter createRouter({
       const feedPath = Routes.feed;
       final isGoingToAuth = currentLocation.startsWith(authenticationPath);
 
-      // --- Workaround for Demo Environment ---
-      // In the demo environment, the initial auth state from the in-memory
-      // client might not be emitted before the first redirect check. If the app
-      // is still in the `initial` state, we explicitly redirect to the
-      // authentication page to begin the demo flow, avoiding the black screen.
-      if (appStatus == AppStatus.initial &&
-          environment == local_config.AppEnvironment.demo) {
-        print(
-          '  Redirect (Workaround): In demo mode with initial status. Forcing to authentication.',
-        );
-        return authenticationPath;
-      }
-
-      // With the new App startup architecture, the router is only active when
+      // With the current App startup architecture, the router is only active when
       // the app is in a stable, running state. The `redirect` function's
       // only responsibility is to handle auth-based route protection.
       // States like `configFetching`, `underMaintenance`, etc., are now
