Merge pull request #182 from flutter-news-app-full-source-code/fix/auth-bugs-in-dev-and-prod-env

Fix/auth bugs in dev and prod env

Author: fulleni

.vscode/launch.json

@@ -1,25 +1,34 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "flutter-news-app-mobile-client-full-source-code",
+            "name": "Demo - Flutter News App",
             "request": "launch",
-            "type": "dart"
+            "type": "dart",
+            "program": "lib/main.dart",
+            "args": [
+                "--dart-define=APP_ENVIRONMENT=demo"
+            ]
         },
         {
-            "name": "flutter-news-app-mobile-client-full-source-code (profile mode)",
+            "name": "Development - Flutter News App",
             "request": "launch",
             "type": "dart",
-            "flutterMode": "profile"
+            "program": "lib/main.dart",
+            "args": [
+                "--dart-define=APP_ENVIRONMENT=development",
+                "--dart-define=BASE_URL=http://localhost:8080"
+            ]
         },
         {
-            "name": "flutter-news-app-mobile-client-full-source-code (release mode)",
+            "name": "Production - Flutter News App",
             "request": "launch",
             "type": "dart",
-            "flutterMode": "release"
+            "program": "lib/main.dart",
+            "args": [
+                "--dart-define=APP_ENVIRONMENT=production",
+                "--dart-define=BASE_URL=https://api.your-production-domain.com"
+            ]
         }
     ]
 }

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Upcoming Release
+
+ - **refactor!**: Overhauled the application startup and authentication lifecycle to be robust and free of race conditions. This was a major architectural change that introduced a new `AppInitializationPage` and `AppInitializationBloc` to act as a "gatekeeper," ensuring all critical data is fetched *before* the main UI is built. This fixes a class of bugs related to indefinite loading screens, data migration on account linking, and inconsistent state during startup.
+
 ## 1.4.0 - 2025-10-17
 
 - **feat**: overhauled search and account features with a new sliver-based feed UI, integrated search bar, and modal account sheet.

README.md

@@ -109,20 +109,16 @@ Gain complete command over your application's operational state and user experie
 <details>
 <summary><strong>🏗️ Architecture & Technical Excellence</strong></summary>
 
-### 📱 Adaptive UI for All Screens
-- Built with `flutter_adaptive_scaffold`, the app offers responsive navigation and layouts that look great on both phones and tablets.
-> **↔️ Your Advantage:** Deliver a consistent and optimized UX across a wide range of devices effortlessly.
-
----
-
 ### 🏗️ Clean & Modern Architecture
 - Developed with best practices for a maintainable and scalable codebase:
-    - **Flutter & Dart:** Cutting-edge mobile development.
-    - **BLoC Pattern:** Predictable and robust state management, enhanced with `bloc_concurrency` transformers (droppable, restartable, sequential) for advanced event handling.
-    - **GoRouter:** Well-structured and powerful navigation.
-    - **KV Storage Service:** Utilizes `KVStorageService` for secure and efficient local key-value storage.
+    - **Multi-Layered Architecture:** A clear separation of concerns into a Data Layer (handling raw data retrieval), Repository Layer (abstracting data sources), and Business Logic Layer (managing state with BLoC) ensures the codebase is decoupled, testable, and easy to reason about.
+    - **Robust Startup & Lifecycle Management:** The app features a rock-solid, "gatekeeper" startup architecture. An `AppInitializationPage` and dedicated `AppInitializationBloc` orchestrate a sequential, race-condition-free startup process using an `AppInitializer` service. This guarantees all critical dependencies (Remote Config, User Settings) are loaded and validated *before* the main application UI is ever built, eliminating an entire class of complex lifecycle bugs.
+    - **Advanced State Management:** The app leverages the **BLoC pattern** for predictable state management, enhanced with `bloc_concurrency` transformers (droppable, restartable) for sophisticated UI event handling.
+    - **Dependency Injection:** Dependencies are provided throughout the app using `RepositoryProvider` and `BlocProvider`, making components highly testable and reusable.
+    - **Type-Safe, Declarative Routing:** Navigation is managed by **GoRouter**, using named routes for a well-structured and maintainable navigation system.
 > **📈 Your Advantage:** The app is built on a clean, modern architecture that's easy to understand and maintain. It's solid and built to last.
 
+
 ---
 
 ### 🛠️ Flexible Environment Configuration

android/.gitignore

@@ -12,3 +12,6 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+
+# VS Code
+.vscode/

lib/account/view/account_page.dart

@@ -2,9 +2,10 @@ import 'package:core/core.dart' hide AppStatus;
 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/authentication/bloc/authentication_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/models/app_life_cycle_status.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';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/widgets/user_avatar.dart';
 import 'package:go_router/go_router.dart';
 import 'package:ui_kit/ui_kit.dart';
 
@@ -39,6 +40,21 @@ class AccountPage extends StatelessWidget {
             icon: const Icon(Icons.settings_outlined),
             onPressed: () => context.pushNamed(Routes.settingsName),
           ),
+          // Conditionally add a sign-in or sign-out button to the AppBar.
+          // This declutters the main content card and follows common UI patterns.
+          if (isAnonymous)
+            IconButton(
+              icon: const Icon(Icons.login),
+              tooltip: l10n.anonymousLimitButton,
+              onPressed: () => context.goNamed(Routes.accountLinkingName),
+            )
+          else
+            IconButton(
+              icon: const Icon(Icons.logout),
+              tooltip: l10n.accountSignOutTile,
+              onPressed: () =>
+                  context.read<AppBloc>().add(const AppLogoutRequested()),
+            ),
         ],
       ),
       body: SingleChildScrollView(
@@ -66,12 +82,10 @@ class AccountPage extends StatelessWidget {
 
     final String statusText;
     final String accountTypeText;
-    final Widget actionButton;
 
     if (isAnonymous) {
-      statusText = l10n.accountAnonymousUser;
-      accountTypeText = l10n.accountGuestAccount;
-      actionButton = _buildSignInButton(context);
+      statusText = l10n.accountGuestUserHeadline;
+      accountTypeText = l10n.accountGuestUserSubheadline;
     } else {
       statusText = user?.email ?? l10n.accountNoNameUser;
 
@@ -87,7 +101,6 @@ class AccountPage extends StatelessWidget {
           roleDisplayName = '';
       }
       accountTypeText = roleDisplayName;
-      actionButton = _buildSignOutButton(context);
     }
 
     return Card(
@@ -96,18 +109,11 @@ class AccountPage extends StatelessWidget {
         child: Row(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
+            // Use the standard UserAvatar widget, clipped to be square.
+            // This ensures visual consistency with other avatars in the app.
             ClipRRect(
               borderRadius: BorderRadius.circular(AppSpacing.sm),
-              child: Container(
-                width: AppSpacing.xxl + AppSpacing.sm,
-                height: AppSpacing.xxl + AppSpacing.sm,
-                color: colorScheme.primaryContainer,
-                child: Icon(
-                  Icons.person_outline,
-                  size: AppSpacing.xl,
-                  color: colorScheme.onPrimaryContainer,
-                ),
-              ),
+              child: UserAvatar(user: user, radius: AppSpacing.lg),
             ),
             const SizedBox(width: AppSpacing.md),
             Expanded(
@@ -123,45 +129,37 @@ class AccountPage extends StatelessWidget {
                     overflow: TextOverflow.ellipsis,
                   ),
                   const SizedBox(height: AppSpacing.xs),
+                  // Display the user role inside a styled "capsule" for a
+                  // more refined and less intrusive look.
                   if (accountTypeText.isNotEmpty)
-                    Text(
-                      accountTypeText,
-                      style: theme.textTheme.bodySmall?.copyWith(
-                        color: colorScheme.onSurfaceVariant,
+                    DecoratedBox(
+                      decoration: BoxDecoration(
+                        color: colorScheme.secondaryContainer,
+                        borderRadius: BorderRadius.circular(AppSpacing.sm),
+                      ),
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(
+                          horizontal: AppSpacing.sm,
+                          vertical: 2,
+                        ),
+                        child: Text(
+                          accountTypeText,
+                          style: theme.textTheme.bodySmall?.copyWith(
+                            color: colorScheme.onSecondaryContainer,
+                          ),
+                        ),
                       ),
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
                     ),
                 ],
               ),
             ),
-            const SizedBox(width: AppSpacing.md),
-            actionButton,
           ],
         ),
       ),
     );
   }
 
   /// Builds the sign-in button for anonymous users.
-  Widget _buildSignInButton(BuildContext context) {
-    final l10n = AppLocalizationsX(context).l10n;
-    return ElevatedButton(
-      onPressed: () => context.goNamed(Routes.accountLinkingName),
-      child: Text(l10n.accountSignInPromptButton),
-    );
-  }
-
-  /// Builds the sign-out button for authenticated users.
-  Widget _buildSignOutButton(BuildContext context) {
-    final l10n = AppLocalizationsX(context).l10n;
-    return OutlinedButton(
-      onPressed: () => context.read<AuthenticationBloc>().add(
-        const AuthenticationSignOutRequested(),
-      ),
-      child: Text(l10n.accountSignOutTile),
-    );
-  }
 
   /// Builds the list of navigation tiles for accessing different
   /// account-related sections.

lib/account/view/followed_contents/countries/followed_countries_list_page.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/interstitial_ad_manager.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/models/app_life_cycle_status.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';
 import 'package:go_router/go_router.dart';
@@ -34,7 +35,6 @@ class FollowedCountriesListPage extends StatelessWidget {
       ),
       body: BlocBuilder<AppBloc, AppState>(
         builder: (context, appState) {
-          final user = appState.user;
           final userContentPreferences = appState.userContentPreferences;
 
           if (appState.status == AppLifeCycleStatus.loadingUserData ||
@@ -46,11 +46,13 @@ class FollowedCountriesListPage extends StatelessWidget {
             );
           }
 
-          if (appState.initialUserPreferencesError != null) {
+          if (appState.error != null) {
             return FailureStateWidget(
-              exception: appState.initialUserPreferencesError!,
+              exception: appState.error!,
               onRetry: () {
-                context.read<AppBloc>().add(AppStarted(initialUser: user));
+                context.read<AppBloc>().add(
+                  const AppUserContentPreferencesRefreshed(),
+                );
               },
             );
           }

lib/account/view/followed_contents/sources/followed_sources_list_page.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/interstitial_ad_manager.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/models/app_life_cycle_status.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';
 import 'package:go_router/go_router.dart';
@@ -34,7 +35,6 @@ class FollowedSourcesListPage extends StatelessWidget {
       ),
       body: BlocBuilder<AppBloc, AppState>(
         builder: (context, appState) {
-          final user = appState.user;
           final userContentPreferences = appState.userContentPreferences;
 
           if (appState.status == AppLifeCycleStatus.loadingUserData ||
@@ -46,11 +46,13 @@ class FollowedSourcesListPage extends StatelessWidget {
             );
           }
 
-          if (appState.initialUserPreferencesError != null) {
+          if (appState.error != null) {
             return FailureStateWidget(
-              exception: appState.initialUserPreferencesError!,
+              exception: appState.error!,
               onRetry: () {
-                context.read<AppBloc>().add(AppStarted(initialUser: user));
+                context.read<AppBloc>().add(
+                  const AppUserContentPreferencesRefreshed(),
+                );
               },
             );
           }

lib/account/view/followed_contents/topics/followed_topics_list_page.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/interstitial_ad_manager.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/models/app_life_cycle_status.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';
 import 'package:go_router/go_router.dart';
@@ -34,7 +35,6 @@ class FollowedTopicsListPage extends StatelessWidget {
       ),
       body: BlocBuilder<AppBloc, AppState>(
         builder: (context, appState) {
-          final user = appState.user;
           final userContentPreferences = appState.userContentPreferences;
 
           if (appState.status == AppLifeCycleStatus.loadingUserData ||
@@ -46,11 +46,13 @@ class FollowedTopicsListPage extends StatelessWidget {
             );
           }
 
-          if (appState.initialUserPreferencesError != null) {
+          if (appState.error != null) {
             return FailureStateWidget(
-              exception: appState.initialUserPreferencesError!,
+              exception: appState.error!,
               onRetry: () {
-                context.read<AppBloc>().add(AppStarted(initialUser: user));
+                context.read<AppBloc>().add(
+                  const AppUserContentPreferencesRefreshed(),
+                );
               },
             );
           }

lib/account/view/saved_filters_page.dart

@@ -4,6 +4,7 @@ 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/headlines-feed/widgets/save_filter_dialog.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/widgets/confirmation_dialog.dart';
 import 'package:go_router/go_router.dart';
 import 'package:ui_kit/ui_kit.dart';
 
@@ -66,7 +67,7 @@ class SavedFiltersPage extends StatelessWidget {
                 ),
                 title: Text(filter.name),
                 trailing: PopupMenuButton<String>(
-                  onSelected: (value) {
+                  onSelected: (value) async {
                     switch (value) {
                       case 'rename':
                         showDialog<void>(
@@ -84,9 +85,26 @@ class SavedFiltersPage extends StatelessWidget {
                           ),
                         );
                       case 'delete':
-                        context.read<AppBloc>().add(
-                          SavedFilterDeleted(filterId: filter.id),
+                        // Awaiting the dialog result ensures the popup menu
+                        // has time to close before the list rebuilds,
+                        // preventing the red screen flicker.
+                        final confirmed = await showDialog<bool>(
+                          context: context,
+                          builder: (context) => ConfirmationDialog(
+                            title: l10n.deleteConfirmationDialogTitle,
+                            content: l10n.deleteConfirmationDialogContent,
+                            confirmButtonText:
+                                l10n.deleteConfirmationDialogConfirmButton,
+                          ),
                         );
+
+                        // Only proceed with deletion if the user confirmed
+                        // and the widget is still mounted.
+                        if (confirmed == true && context.mounted) {
+                          context.read<AppBloc>().add(
+                            SavedFilterDeleted(filterId: filter.id),
+                          );
+                        }
                     }
                   },
                   itemBuilder: (BuildContext context) =>