wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 23:42:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #192 from kovdan01/kovdan01/fix_suburl_handling

Browse Source 
Fix sub-url handling
This commit is contained in:
Roland Geider
2022-07-18 15:17:20 +02:00
committed by GitHub
parent 5037b6b0ec d5ae4b4ef3
commit bfe0b45aed
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/providers/helpers.dart
View File

@@ -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());
}

35
test/other/base_provider_test.dart
View File

@@ -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'}),
);
});
});
}