Merge branch 'main' into prod/festapp

vkh-cr · Dec 12, 2024 · e95cdba · e95cdba
2 parents 0eff0f6 + 1e78a03
commit e95cdba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/lib/dataServices/RightsService.dart b/lib/dataServices/RightsService.dart
@@ -20,6 +20,7 @@ class RightsService{
       var occasionLink = link ?? RouterService.currentOccasionLink;
       if (occasionLink.isEmpty) {
         model = LinkModel.extractOccasionLink(Uri.base.toString());
+        print(Uri.base.toString());
       }
 
       if(AppConfig.forceOccasionLink != null) {

diff --git a/lib/dataServices/SynchroService.dart b/lib/dataServices/SynchroService.dart
@@ -66,13 +66,18 @@ class SynchroService {
   }
 
   static Future<OccasionLinkModel> getAppConfig({String? occasionLink, String? formLink}) async {
+    print(occasionLink);
+    print(formLink);
+
     var data = await _supabase.rpc("get_app_config",
         params: {"data_in": {
           "link": occasionLink,
           "form_link": formLink,
           "organization": AppConfig.organization,
           "platform": await PlatformHelper.getPlatform()
         }});
+    print(data);
+
     return OccasionLinkModel.fromJson(data);
   }
 

diff --git a/lib/services/LinkModel.dart b/lib/services/LinkModel.dart
@@ -19,7 +19,6 @@ class LinkModel {
     if (match != null) {
       // Extract named groups
       firstPart = match.namedGroup('firstPart');
-      secondPart = match.namedGroup('secondPart');
 
       if (firstPart == FormPage.ROUTE) {
         secondPart = match.namedGroup('secondPart');