GoRouter doesn't like subroutes for external links (#5706)

openfoodfacts · Oct 18, 2024 · 4025f30 · 4025f30
1 parent b14389c
commit 4025f30
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/packages/smooth_app/lib/pages/navigator/app_navigator.dart b/packages/smooth_app/lib/pages/navigator/app_navigator.dart
@@ -228,18 +228,18 @@ class _SmoothGoRouter {
                 }
               },
             ),
-            GoRoute(
-              path: _InternalAppRoutes.EXTERNAL_PAGE,
-              builder: (BuildContext context, GoRouterState state) {
-                return ExternalPage(path: state.uri.queryParameters['path']!);
-              },
-            ),
             GoRoute(
               path: _InternalAppRoutes.SIGNUP_PAGE,
               builder: (_, __) => const SignUpPage(),
             )
           ],
         ),
+        GoRoute(
+          path: '/${_InternalAppRoutes.EXTERNAL_PAGE}/:page',
+          builder: (BuildContext context, GoRouterState state) {
+            return ExternalPage(path: state.pathParameters['page']!);
+          },
+        ),
       ],
       redirect: (BuildContext context, GoRouterState state) {
         final String path = state.matchedLocation;
@@ -460,5 +460,5 @@ class AppRoutes {
 
   // Open an external link (where path is relative to the OFF website)
   static String EXTERNAL(String path) =>
-      '/${_InternalAppRoutes.EXTERNAL_PAGE}/?path=$path';
+      '/${_InternalAppRoutes.EXTERNAL_PAGE}/$path';
 }