updateOccasionFromLink

vkh-cr · Aug 26, 2024 · a4fc349 · a4fc349
1 parent 0990336
commit a4fc349
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/lib/RouterService.dart b/lib/RouterService.dart
@@ -148,7 +148,7 @@ class RouterService{
             var newLink = state.pathParameters[LINK]??"";
             if (currentOccasionLink != newLink) {
               currentOccasionLink = newLink;
-              checkOccasionLinkAndRedirect(context, currentOccasionLink);
+              updateOccasionFromLink(context, currentOccasionLink);
             }
             return const HomePage(title: HomePage.HOME_PAGE,);
           },
@@ -224,7 +224,7 @@ class RouterService{
     ],
   );
 
-  static Future<bool> checkOccasionLinkAndRedirect(BuildContext context, String newLink) async {
+  static Future<bool> updateOccasionFromLink(BuildContext context, String newLink) async {
     bool canContinue = true;
     var checkedObject = await SynchroService.checkOccasionLink(newLink);
     RightsService.currentUserOccasion = checkedObject.user;
@@ -233,7 +233,6 @@ class RouterService{
 
     if(checkedObject.link!=RouterService.currentOccasionLink && checkedObject.isAvailable())
     {
-      RouterService.pushReplacementFull(context, checkedObject.link!);
       canContinue = false;
     }
     else if(checkedObject.isAccessDenied())

diff --git a/lib/dataServices/RightsService.dart b/lib/dataServices/RightsService.dart
@@ -13,7 +13,7 @@ class RightsService{
 
   static Future<bool> ensureAccessProcedure(BuildContext context) async {
     if(currentOccasion==null || RouterService.currentOccasionLink != currentLink) {
-      if(!await RouterService.checkOccasionLinkAndRedirect(context, RouterService.currentOccasionLink)){
+      if(!await RouterService.updateOccasionFromLink(context, RouterService.currentOccasionLink)){
         throw Exception("Cannot continue.");
       }
       var globalSettings = await SynchroService.loadOrInitGlobalSettings();

diff --git a/lib/pages/LoginPage.dart b/lib/pages/LoginPage.dart
@@ -138,7 +138,7 @@ class _LoginPageState extends State<LoginPage> {
   Future<void> _refreshSignedInStatus(value) async {
     var loggedIn = await AuthService.tryAuthUser();
     if (loggedIn) {
-      RouterService.checkOccasionLinkAndRedirect(context, RouterService.currentOccasionLink);
+      RouterService.updateOccasionFromLink(context, RouterService.currentOccasionLink);
       RouterService.goBackOrHome(context);
     }
   }