Merge pull request #409 from wizlif/fix/auth-routing

Fix/auth-routing
CollActionteam · Jul 4, 2023 · b2206de · b2206de
2 parents 72deaa7 + e06c70d
commit b2206de
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 33 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/lib/main.dart b/lib/main.dart
@@ -5,9 +5,11 @@ import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 
+import 'application/auth/auth_bloc.dart';
 import 'domain/core/i_settings_repository.dart';
 import 'infrastructure/core/injection.dart';
 import 'presentation/core/app_widget.dart';
+import 'presentation/routes/app_routes.dart';
 
 Future<void> main() async {
   runZonedGuarded(
@@ -20,7 +22,12 @@ Future<void> main() async {
       await Firebase.initializeApp();
       await dotenv.load();
 
-      runApp(AppWidget());
+      final appRouter = AppRouter(
+        authBloc: getIt<AuthBloc>(),
+        settingsRepo: getIt<ISettingsRepository>(),
+      );
+
+      runApp(AppWidget(appRouter: appRouter));
     },
     (error, stack) => FirebaseCrashlytics.instance.recordError(error, stack),
   );

diff --git a/lib/presentation/auth/unauthenticated_screen.dart b/lib/presentation/auth/unauthenticated_screen.dart
@@ -1,19 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
-import '../../domain/core/i_settings_repository.dart';
-import '../../infrastructure/core/injection.dart';
 import '../routes/app_routes.dart';
 import '../shared_widgets/pill_button.dart';
 import '../themes/constants.dart';
 
 class UnauthenticatedPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      checkAndMaybeShowOnboarding(context);
-    });
-
     return Scaffold(
       backgroundColor: kAccentColor,
       body: Container(
@@ -61,12 +55,4 @@ class UnauthenticatedPage extends StatelessWidget {
       ),
     );
   }
-
-  Future<void> checkAndMaybeShowOnboarding(BuildContext context) async {
-    // Push onboarding screen if first time launching application
-    final settingsRepository = getIt<ISettingsRepository>();
-    if (!(await settingsRepository.getWasUserOnboarded())) {
-      context.push(AppPage.onBoarding.path);
-    }
-  }
 }
diff --git a/lib/presentation/core/app_widget.dart b/lib/presentation/core/app_widget.dart
@@ -10,14 +10,17 @@ import '../routes/app_routes.dart';
 import '../themes/themes.dart';
 
 class AppWidget extends StatelessWidget {
-  final _appRouter = AppRouter();
+  final AppRouter appRouter;
+
+  const AppWidget({super.key, required this.appRouter});
 
   @override
   Widget build(BuildContext context) {
     return MultiBlocProvider(
       providers: [
         BlocProvider<AuthBloc>(
-          create: (_) => getIt<AuthBloc>()..add(AuthEvent.authCheckRequested()),
+          create: (_) =>
+              appRouter.authBloc..add(AuthEvent.authCheckRequested()),
         ),
         BlocProvider<ProfileBloc>(create: (_) => getIt<ProfileBloc>()),
         BlocProvider<ProfileTabBloc>(create: (_) => getIt<ProfileTabBloc>())
@@ -35,17 +38,14 @@ class AppWidget extends StatelessWidget {
               BlocProvider.of<ProfileTabBloc>(context)
                   .add(FetchProfileTabInfo());
             },
-            unauthenticated: () {
-              _appRouter.router.go(AppPage.unauthenticated.path);
-            },
             orElse: () {},
           );
         },
         child: MaterialApp.router(
           color: Colors.white,
           title: 'CollAction',
           theme: lightTheme(),
-          routerConfig: _appRouter.router,
+          routerConfig: appRouter.router,
         ),
       ),
     );

diff --git a/lib/presentation/routes/app_routes.dart b/lib/presentation/routes/app_routes.dart
@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../../presentation/profile/profile_screen.dart';
+import '../../application/auth/auth_bloc.dart';
+import '../../domain/core/i_settings_repository.dart';
 import '../auth/auth_screen.dart';
 import '../auth/unauthenticated_screen.dart';
 import '../auth/widgets/verified.dart';
@@ -19,13 +21,24 @@ import '../onboarding/onboarding_screen.dart';
 import '../settings/settings_layout.dart';
 import '../settings/settings_screen.dart';
 import '../shared_widgets/web_view_page.dart';
+import 'refresh_stream.dart';
 
 part 'app_pages.dart';
 
 class AppRouter {
+  final AuthBloc authBloc;
+  final ISettingsRepository settingsRepo;
+
   final GlobalKey<NavigatorState> _rootNavigatorKey =
       GlobalKey<NavigatorState>(debugLabel: 'root');
 
+  final _unauthenticatedPaths = [
+    AppPage.onBoarding.path,
+    AppPage.unauthenticated.path,
+    AppPage.auth.path,
+    AppPage.verified.path,
+  ];
+
   GoRouter get router => GoRouter(
         navigatorKey: _rootNavigatorKey,
         routes: [
@@ -145,7 +158,29 @@ class AppRouter {
         ],
         debugLogDiagnostics: true,
         initialLocation: AppPage.home.path,
+        refreshListenable: GoRouterAuthRefreshStream(authBloc.stream),
+        redirect: (context, state) async {
+          if (_unauthenticatedPaths.contains(state.location)) {
+            return null;
+          }
+
+          final path = await authBloc.state.mapOrNull(
+            unauthenticated: (_) async {
+              final isOnboarded = await settingsRepo.getWasUserOnboarded();
+              if (!isOnboarded) {
+                return AppPage.onBoarding.path;
+              }
+
+              return AppPage.unauthenticated.path;
+            },
+          );
+
+          return path;
+        },
       );
 
-  AppRouter();
+  AppRouter({
+    required this.authBloc,
+    required this.settingsRepo,
+  });
 }
diff --git a/lib/presentation/routes/refresh_stream.dart b/lib/presentation/routes/refresh_stream.dart
@@ -0,0 +1,27 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+import '../../application/auth/auth_bloc.dart';
+
+class GoRouterAuthRefreshStream extends ChangeNotifier {
+  late final StreamSubscription<AuthState> _subscription;
+
+  GoRouterAuthRefreshStream(Stream<AuthState> stream) {
+    notifyListeners();
+    _subscription = stream.asBroadcastStream().listen((state) {
+      // Only notify router to rebuild on following conditions
+      state.maybeWhen(
+          authenticated: (_) => notifyListeners(),
+          loggedIn: (_) => notifyListeners(),
+          unauthenticated: () => notifyListeners(),
+          orElse: () {});
+    });
+  }
+
+  @override
+  void dispose() {
+    _subscription.cancel();
+    super.dispose();
+  }
+}
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/main.dart b/test/main.dart
@@ -1,11 +1,27 @@
+import 'package:collaction_app/application/auth/auth_bloc.dart';
+import 'package:collaction_app/domain/core/i_settings_repository.dart';
 import 'package:collaction_app/presentation/core/app_widget.dart';
+import 'package:collaction_app/presentation/routes/app_routes.dart';
 import 'package:flutter_test/flutter_test.dart';
 
+import 'application/auth/auth_bloc.mocks.dart';
+import 'test_utilities.dart';
+
 void main() {
-  setUpAll(() {});
+  late AppRouter appRouter;
+  late AuthBloc authBloc;
+  late ISettingsRepository settingsRepo;
+
+  setUpAll(() {
+    authBloc = MockAuthBloc();
+    settingsRepo = MockSettingsRepository();
+    appRouter = AppRouter(authBloc: authBloc, settingsRepo: settingsRepo);
+  });
 
   testWidgets('Can render AppWidget', (WidgetTester tester) async {
-    await tester.pumpWidget(AppWidget());
+    await tester.pumpWidget(AppWidget(
+      appRouter: appRouter,
+    ));
 
     expect(find.byType(AppWidget), findsOneWidget);
   });

diff --git a/test/presentation/home/home_screen_test.dart b/test/presentation/home/home_screen_test.dart
@@ -1,3 +1,4 @@
+import 'package:collaction_app/application/auth/auth_bloc.dart';
 import 'package:collaction_app/application/crowdaction/spotlight/spotlight_bloc.dart';
 import 'package:collaction_app/domain/core/i_settings_repository.dart';
 import 'package:collaction_app/domain/crowdaction/crowdaction_failures.dart';
@@ -9,6 +10,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:get_it/get_it.dart';
 import 'package:mocktail/mocktail.dart';
 
+import '../../application/auth/auth_bloc.mocks.dart';
 import '../../test_helper.dart';
 import '../../test_utilities.dart';
 
@@ -17,12 +19,16 @@ void main() {
   late final MockSettingsRepository settingsRepository;
   late final MockCrowdActionRepository crowdActionRepository;
   late SpotlightBloc spotlightBloc;
+  late AuthBloc authBloc;
 
   setUpAll(() {
-    appRouter = AppRouter();
     settingsRepository = MockSettingsRepository();
     crowdActionRepository = MockCrowdActionRepository();
     spotlightBloc = SpotlightBloc(crowdActionRepository);
+    authBloc = MockAuthBloc();
+    when(() => authBloc.state).thenAnswer((_) => AuthState.initial());
+
+    appRouter = AppRouter(authBloc: authBloc, settingsRepo: settingsRepository);
 
     GetIt.I.registerSingleton<SpotlightBloc>(spotlightBloc);
     GetIt.I.registerSingleton<ISettingsRepository>(settingsRepository);

diff --git a/test/presentation/profile/profile_screen_test.dart b/test/presentation/profile/profile_screen_test.dart
@@ -21,6 +21,7 @@ import 'package:mocktail/mocktail.dart';
 import '../../application/auth/auth_bloc.mocks.dart';
 import '../../test_helper.dart';
 import '../../test_utilities.dart';
+import '../../utils/user.fixtures.dart';
 
 void main() {
   late final AppRouter appRouter;
@@ -34,12 +35,12 @@ void main() {
   late MockAuthBloc authBloc;
 
   setUpAll(() {
-    appRouter = AppRouter();
     settingsRepository = MockSettingsRepository();
     crowdActionRepository = MockCrowdActionRepository();
     profileRepository = MockProfileRepository();
     avatarRepository = MockAvatarRepository();
     authBloc = MockAuthBloc();
+    appRouter = AppRouter(authBloc: authBloc, settingsRepo: settingsRepository);
     spotlightBloc = SpotlightBloc(crowdActionRepository);
     profileBloc = ProfileBloc(profileRepository, avatarRepository);
     profileTabBloc = ProfileTabBloc(crowdActionRepository);
@@ -82,6 +83,8 @@ void main() {
   testWidgets('navigate to profile screen', (tester) async {
     when(() => settingsRepository.getWasUserOnboarded())
         .thenAnswer((_) => Future.value(true));
+    when(() => authBloc.state)
+        .thenAnswer((_) => AuthState.authenticated(testUser));
 
     await buildAndPump(
       tester: tester,