Update route redirects (#172)

Reworked routing redirects for login, consent, task, and invitation pages in CarpStudyApp. Now the routing considers if a user is authenticated and properly handles redirects to the consent or tasks pages. Furthermore, if a study ID is not present, redirections to the invitation page have been implemented. If a user is unauthenticated, they'll be redirected to the login page.
cph-cachet · Aug 14, 2023 · f05caa4 · f05caa4
1 parent cb9d3d4
commit f05caa4
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/carp_study_app.dart b/lib/carp_study_app.dart
@@ -36,8 +36,9 @@ class CarpStudyAppState extends State<CarpStudyApp> {
           GoRoute(
             path: '/',
             parentNavigatorKey: _shellNavigatorKey,
-            redirect: (context, state) =>
-                bloc.hasInformedConsentBeenAccepted ? '/tasks' : '/consent',
+            redirect: (context, state) => !CarpService().authenticated
+                ? '/login'
+                : (bloc.hasInformedConsentBeenAccepted ? '/tasks' : '/consent'),
           ),
           GoRoute(
             path: '/tasks',
@@ -103,8 +104,9 @@ class CarpStudyAppState extends State<CarpStudyApp> {
       GoRoute(
         path: '/consent',
         parentNavigatorKey: _rootNavigatorKey,
-        redirect: (context, state) =>
-            bloc.studyId == null ? '/invitations' : null,
+        redirect: (context, state) => bloc.hasInformedConsentBeenAccepted
+            ? '/tasks'
+            : (bloc.studyId == null ? '/invitations' : null),
         builder: (context, state) => InformedConsentPage(
           bloc.data.informedConsentViewModel,
         ),
@@ -116,6 +118,7 @@ class CarpStudyAppState extends State<CarpStudyApp> {
       GoRoute(
         path: '/login',
         parentNavigatorKey: _rootNavigatorKey,
+        redirect: (context, state) => CarpService().authenticated ? '/' : null,
         builder: (context, state) => LoginPage(
           bloc.data.loginPageViewModel,
         ),
@@ -136,7 +139,9 @@ class CarpStudyAppState extends State<CarpStudyApp> {
       GoRoute(
         path: '/invitations',
         parentNavigatorKey: _rootNavigatorKey,
-        redirect: (context, state) => bloc.user == null ? '/login' : null,
+        redirect: (context, state) => bloc.studyId != null
+            ? '/consent'
+            : (bloc.user == null ? '/login' : null),
         builder: (context, state) =>
             InvitationListPage(bloc.data.invitationsListViewModel),
       ),