fix: network config url generation

Signed-off-by: Isaac Obella <wizlif@users.noreply.github.com>
CollActionteam · Jul 4, 2023 · 4258152 · 4258152
1 parent 8829e1e
commit 4258152
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/lib/core/config/network_config.dart b/lib/core/config/network_config.dart
@@ -2,10 +2,11 @@ part of '../core.dart';
 
 /// Manage all url creation and building
 // base static url
-final baseStaticUrl = '${dotenv.get('BASE_STATIC_ENDPOINT_URL')}/\$web';
+final baseStaticUrl =
+    Uri.parse(dotenv.get('BASE_STATIC_ENDPOINT_URL')).resolve('\$web');
 
-final nullStaticUrl = '$baseStaticUrl/${null}';
+final nullStaticUrl = baseStaticUrl.resolve('null').toString();
 
 extension ImageExtension on String {
-  String get imageUrl => '$baseStaticUrl/$this';
+  String get imageUrl => baseStaticUrl.resolve(this).toString();
 }
diff --git a/test/core/config/network.config_test.dart b/test/core/config/network.config_test.dart
@@ -25,13 +25,18 @@ void main() {
         'when the user profile is not null', () async {
       // arrange
       final userProfile = testUserProfile;
+
       // act
       final userAvatarUrl = userProfile.avatarUrl;
 
       // assert
       expect(
         userAvatarUrl,
-        equals('$baseStaticUrl/${userProfile.profile.avatar}'),
+        equals(
+          Uri.parse(baseStaticUrl)
+              .resolve(userProfile.profile.avatar)
+              .toString(),
+        ),
       );
     });
 
@@ -65,7 +70,11 @@ void main() {
       // assert
       expect(
         crowdActionBannerUrl,
-        equals('$baseStaticUrl/${crowdAction.images.banner}'),
+        equals(
+          Uri.parse(baseStaticUrl)
+              .resolve(crowdAction.images.banner)
+              .toString(),
+        ),
       );
     });
 
@@ -99,7 +108,9 @@ void main() {
       // assert
       expect(
         crowdActionCardUrl,
-        equals('$baseStaticUrl/${crowdAction.images.card}'),
+        equals(
+          Uri.parse(baseStaticUrl).resolve(crowdAction.images.card).toString(),
+        ),
       );
     });
 
@@ -133,7 +144,9 @@ void main() {
       // assert
       expect(
         participationAvatarUrl,
-        equals('$baseStaticUrl/${participation.avatar}'),
+        equals(
+          Uri.parse(baseStaticUrl).resolve(participation.avatar).toString(),
+        ),
       );
     });
 

diff --git a/test/presentation/auth/profile_photo_test.dart b/test/presentation/auth/profile_photo_test.dart
@@ -44,7 +44,7 @@ void main() {
     GetIt.I.registerSingleton<AvatarBloc>(avatarBloc);
 
     // Auth Bloc
-    authBloc =  MockAuthBloc();
+    authBloc = MockAuthBloc();
     when(() => authBloc.state).thenAnswer(
       (_) => AuthState.initial(),
     );