Stack Optimization and Null Check Error Fix (#203)

Co-authored-by: Fred Falcon <7475382+fredfalcon@users.noreply.github.com>
OWASP-BLT · Mar 5, 2023 · 5f5bf75 · 5f5bf75
1 parent 05fcba0
commit 5f5bf75
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/lib/src/pages/home/home.dart b/lib/src/pages/home/home.dart
@@ -12,6 +12,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 import '../../components/appbar.dart';
+import '../../pages/welcome.dart';
+
 
 /// Navigator and drawer provider for the main pages:
 /// Issues, Report Bug, Leaderboards and Feed.
@@ -61,11 +63,8 @@ class _HomeState extends ConsumerState<Home> {
 
     if (loginState == LoginType.guest) {
       await forgetUser();
-      Navigator.pushReplacementNamed(
-        context,
-        RouteManager.welcomePage,
-        arguments: "You need to login in order to start bug hunt."
-      );
+              Navigator.of(context).pushAndRemoveUntil(MaterialPageRoute(
+              builder: (context) => WelcomePage(snackBarMessage:"Only Logged in users can start a Bug Hunt")), (Route route) => false);
       await logout();
     } else {
         _reportBugState="Start Bug Hunt";
@@ -169,10 +168,8 @@ class _HomeState extends ConsumerState<Home> {
                   // ...
                   // Then close the drawer
                   await forgetUser();
-                  Navigator.pushReplacementNamed(
-                    context,
-                    RouteManager.welcomePage,
-                  );
+              Navigator.of(context).pushAndRemoveUntil(MaterialPageRoute(
+              builder: (context) => WelcomePage()), (Route route) => false);
                   await logout();
                 },
               ),

diff --git a/lib/src/pages/home/profile.dart b/lib/src/pages/home/profile.dart
@@ -13,6 +13,8 @@ import '../../components/issuechip.dart';
 import '../../providers/authstate_provider.dart';
 import '../../models/issuedata_model.dart';
 import '../../util/endpoints/issue_endpoints.dart';
+import '../../pages/welcome.dart';
+
 
 /// Page that displays the stats of a user registered on BugHeist,
 /// shows dummy data for Guest login.
@@ -248,11 +250,9 @@ class _UserProfileState extends ConsumerState<UserProfile> {
           ),
           IconButton(
             onPressed: () {
+              Navigator.of(context).pushAndRemoveUntil(MaterialPageRoute(
+              builder: (context) => WelcomePage()), (Route route) => false);
               forgetUser();
-              Navigator.pushReplacementNamed(
-                context,
-                RouteManager.welcomePage,
-              );
               logout();
             },
             icon: Icon(Icons.power_settings_new_rounded),

diff --git a/lib/src/pages/welcome.dart b/lib/src/pages/welcome.dart
@@ -139,10 +139,10 @@ class _WelcomePageState extends State<WelcomePage> {
                           builder: (BuildContext context, ref, Widget? child) {
                             return TextButton(
                               onPressed: () {
-                                Navigator.of(context).pushNamed(
+                                ref.read(authStateNotifier.notifier).guestLogin();
+                                 Navigator.of(context).pushNamed(
                                   RouteManager.homePage,
                                 );
-                                ref.read(authStateNotifier.notifier).guestLogin();
                               },
                               child: Text(
                                 "Explore Anonymously",

diff --git a/lib/src/providers/authstate_provider.dart b/lib/src/providers/authstate_provider.dart
@@ -28,7 +28,7 @@ class AuthNotifier extends StateNotifier<AsyncValue<AuthState>> {
         );
 
   /// Do a guest type authentication.
-  void guestLogin() async {
+  Future<void> guestLogin() async {
     await storage.write(
       key: "remember",
       value: "guest",