From ad810026e84ac58e98061d280088b4414a9bb302 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <daniil@kovalev.website>
Date: Sat, 25 Jun 2022 15:52:43 +0300
Subject: [PATCH 1/2] Fix sub-url handling

Previously the app was unable to work with instances installed on sub-urls
because sub-url path was removed (say, server.name/api/v2/login instead of
server.name/wger/api/v2/login).
---
 lib/providers/helpers.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/providers/helpers.dart b/lib/providers/helpers.dart
index 458c6d97..aa22d97f 100644
--- a/lib/providers/helpers.dart
+++ b/lib/providers/helpers.dart
@@ -26,7 +26,7 @@ Uri makeUri(
 ]) {
   final Uri uriServer = Uri.parse(serverUrl);
 
-  final pathList = ['api', 'v2', path];
+  final pathList = [uriServer.path, 'api', 'v2', path];
   if (id != null) {
     pathList.add(id.toString());
   }

From d5ae4b4ef33ae3690669daafa41f643b785e6602 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Mon, 18 Jul 2022 15:09:05 +0200
Subject: [PATCH 2/2] Add tests for sub URL handling

---
 test/other/base_provider_test.dart | 35 ++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/test/other/base_provider_test.dart b/test/other/base_provider_test.dart
index 2f6cbdf1..bd3c4715 100644
--- a/test/other/base_provider_test.dart
+++ b/test/other/base_provider_test.dart
@@ -58,5 +58,40 @@ void main() {
         provider.makeUrl('endpoint', id: 42, objectMethod: 'log_data', query: {'a': '2', 'b': 'c'}),
       );
     });
+
+    test('Test the makeUrl helper with sub url', () async {
+      // Trailing slash is removed when saving the server URL
+      testAuthProvider.serverUrl = 'https://example.com/wger-url';
+      final WgerBaseProvider provider = WgerBaseProvider(testAuthProvider);
+
+      expect(
+        Uri.https('example.com', '/wger-url/api/v2/endpoint/'),
+        provider.makeUrl('endpoint'),
+      );
+      expect(
+        Uri.https('example.com', '/wger-url/api/v2/endpoint/5/'),
+        provider.makeUrl('endpoint', id: 5),
+      );
+      expect(
+        Uri.https('example.com', '/wger-url/api/v2/endpoint/5/log_data/'),
+        provider.makeUrl('endpoint', id: 5, objectMethod: 'log_data'),
+      );
+      expect(
+        Uri.https('example.com', '/wger-url/api/v2/endpoint/', {'a': '2', 'b': 'c'}),
+        provider.makeUrl('endpoint', query: {'a': '2', 'b': 'c'}),
+      );
+      expect(
+        Uri.https('example.com', '/wger-url/api/v2/endpoint/log_data/', {'a': '2', 'b': 'c'}),
+        provider.makeUrl('endpoint', objectMethod: 'log_data', query: {'a': '2', 'b': 'c'}),
+      );
+      expect(
+        Uri.https('example.com', '/wger-url/api/v2/endpoint/42/', {'a': '2', 'b': 'c'}),
+        provider.makeUrl('endpoint', id: 42, query: {'a': '2', 'b': 'c'}),
+      );
+      expect(
+        Uri.https('example.com', '/wger-url/api/v2/endpoint/42/log_data/', {'a': '2', 'b': 'c'}),
+        provider.makeUrl('endpoint', id: 42, objectMethod: 'log_data', query: {'a': '2', 'b': 'c'}),
+      );
+    });
   });
 }