feat: bring the project up to speed

Author: eugeneotakoyi

lib/bootstrap.dart

@@ -2,10 +2,12 @@ import 'package:example/config/providers.dart' as providers;
 import 'package:example/flavors.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_web_plugins/url_strategy.dart';
 
 /// Initializes services and controllers before the start of the application
 Future<ProviderContainer> bootstrap() async {
   WidgetsFlutterBinding.ensureInitialized();
+  usePathUrlStrategy();
 
   final container = ProviderContainer(
     overrides: [], //supabaseProvider.overrideWithValue(Supabase.instance)

lib/config/providers.dart

@@ -1,12 +1,11 @@
 import 'dart:convert';
 
-import 'package:example/features/auth/auth_provider.dart';
+import 'package:example/features/auth/application/auth_controller.dart';
 import 'package:example/features/common/infrastructure/entities/environment.dart';
 import 'package:example/flavors.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:supabase_flutter/supabase_flutter.dart' as supabase;
 
@@ -47,8 +46,6 @@ final supabaseClientProvider = Provider<supabase.SupabaseClient>(
 
 /// Triggered from bootstrap() to complete futures
 Future<void> initializeProviders(ProviderContainer container) async {
-  GoRouter.setUrlPathStrategy(UrlPathStrategy.path);
-
   /// Core
   await container.read(sharedPreferencesProvider.future);
   await container.read(supabaseProvider.future);

lib/config/router.dart

@@ -87,7 +87,7 @@ final router = GoRouter(
   observers: [
     routeObserver,
   ],
-  redirect: (state) {
+  redirect: (context, state) {
     final loggedIn = authStateListenable.value;
     final goingToLogin = state.subloc.contains('/${AuthScreen.route}');
 

lib/features/auth/application/auth_controller.dart

@@ -1,39 +1,34 @@
 import 'package:example/features/auth/auth_provider.dart';
 import 'package:example/features/auth/domain/entities/user_entity.dart';
-import 'package:example/features/auth/infrastructure/repositories/auth_repository.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:uni_links/uni_links.dart';
 
-/// State controller for authentication
-class AuthController extends StateNotifier<UserEntity?> {
-  ///
-  AuthController(this._read) : super(null) {
-    _initialize();
-  }
-  final Reader _read;
-  AuthRepository get _repository => _read(authRepositoryProvider);
+part 'auth_controller.g.dart';
 
-  ///
-  Future<void> _initialize() async {
-    /// try to restore saved session
-    final res = await _repository.restoreSession();
-    state = res.fold((l) => null, (r) => r);
+/// State controller for authentication
+@riverpod
+class AuthController extends _$AuthController {
+  @override
+  Future<UserEntity?> build() async {
+    final repository = ref.watch(authRepositoryProvider);
+    final res = await repository.restoreSession();
+    state = res.fold((l) => AsyncError(l.error, l.stackTrace), AsyncData.new);
     _updateAuthState();
-    if (state == null) {
+    if (state.valueOrNull == null) {
       /// try to create session from deep link
       await _handleInitialDeepLink();
     }
 
     /// listen to auth changes
-    _repository.authStateChange((user) {
-      state = user;
+    repository.authStateChange((user) {
+      state = AsyncData(user);
       _updateAuthState();
     });
-    // TODO(vh): how to cancel subscription override dispose
+    return null;
   }
 
   void _updateAuthState() {
-    authStateListenable.value = state != null;
+    authStateListenable.value = state.valueOrNull != null;
   }
 
   ///
@@ -51,13 +46,13 @@ class AuthController extends StateNotifier<UserEntity?> {
         ?.substring(refreshTokenQueryParam.indexOf('=') + 1);
     if (refreshToken == null) return;
 
-    final res = await _repository.setSession(refreshToken);
-    state = res.fold((l) => null, (r) => r);
+    final res = await ref.read(authRepositoryProvider).setSession(refreshToken);
+    state = res.fold((l) => AsyncError(l.error, l.stackTrace), AsyncData.new);
     _updateAuthState();
   }
 
   /// Signs out user
   Future<void> signOut() async {
-    await _repository.signOut();
+    await ref.read(authRepositoryProvider).signOut();
   }
 }

lib/features/auth/application/sign_in_with_google_controller.dart

@@ -1,17 +1,10 @@
-import 'dart:developer';
-
 import 'package:example/features/auth/auth_provider.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-///s
-class SignInWithGoogleController extends StateNotifier<bool> {
-  ///
-  SignInWithGoogleController(this._read) : super(false);
-  final Reader _read;
+part 'sign_in_with_google_controller.g.dart';
 
-  /// Signs in using Supabase auth
-  Future<void> signInWithGoogle() async {
-    log('here');
-    await _read(authRepositoryProvider).signInWithGoogle();
-  }
+///
+@riverpod
+FutureOr<void> signInWithGoogle(SignInWithGoogleRef ref) async {
+  await ref.watch(authRepositoryProvider).signInWithGoogle();
 }

lib/features/auth/auth_provider.dart

@@ -1,26 +1,24 @@
 import 'package:example/config/providers.dart';
-import 'package:example/features/auth/application/auth_controller.dart';
-import 'package:example/features/auth/application/sign_in_with_google_controller.dart';
-import 'package:example/features/auth/domain/entities/user_entity.dart';
 import 'package:example/features/auth/infrastructure/datasources/local/auth_token_local_data_source.dart';
 import 'package:example/features/auth/infrastructure/repositories/auth_repository.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'auth_provider.g.dart';
 
 ///
 /// Infrastructure dependencies
 ///
 
-final authRepositoryProvider = Provider<AuthRepository>((ref) {
+@riverpod
+AuthRepository authRepository(AuthRepositoryRef ref) {
   final authClient = ref.watch(supabaseClientProvider).auth;
-  final prefs = ref.read(sharedPreferencesProvider).asData!.value;
+  final prefs = ref.read(sharedPreferencesProvider).valueOrNull!;
   return AuthRepository(
-    AuthTokenLocalDataSource(
-      prefs,
-    ),
+    AuthTokenLocalDataSource(prefs),
     authClient,
   );
-});
+}
 
 ///
 /// Application dependencies
@@ -29,17 +27,6 @@ final authRepositoryProvider = Provider<AuthRepository>((ref) {
 /// Provides a [ValueNotifier] to the app router to redirect on auth state change
 final authStateListenable = ValueNotifier<bool>(false);
 
-///
-final authControllerProvider =
-    StateNotifierProvider<AuthController, UserEntity?>((ref) {
-  return AuthController(ref.read);
-});
-
-///
-final signInWithGoogleProvider =
-    StateNotifierProvider<SignInWithGoogleController, bool>((ref) {
-  return SignInWithGoogleController(ref.read);
-});
 
 ///
 /// Presentation dependencies

lib/features/auth/infrastructure/datasources/local/auth_token_local_data_source.dart

@@ -15,7 +15,7 @@ class AuthTokenLocalDataSource {
   Either<Failure, String> get() {
     final v = _prefs.getString(_key);
     if (v == null) {
-      return left(const Failure.empty());
+      return left(Failure.empty(StackTrace.current));
     }
 
     return right(v);

lib/features/auth/infrastructure/repositories/auth_repository.dart

@@ -28,11 +28,11 @@ class AuthRepository implements AuthRepositoryInterface {
   void authStateChange(
     void Function(UserEntity? userEntity) callback,
   ) {
-    authClient.onAuthStateChange((event, session) {
-      switch (event) {
+    authClient.onAuthStateChange.listen((data) {
+      switch (data.event) {
         case supabase.AuthChangeEvent.signedIn:
           callback(
-            UserEntity.fromJson(session!.user!.toJson()),
+            UserEntity.fromJson(data.session!.user.toJson()),
           );
 
           break;
@@ -41,12 +41,13 @@ class AuthRepository implements AuthRepositoryInterface {
           break;
         case supabase.AuthChangeEvent.userUpdated:
           callback(
-            UserEntity.fromJson(session!.user!.toJson()),
+            UserEntity.fromJson(data.session!.user.toJson()),
           );
           break;
         case supabase.AuthChangeEvent.passwordRecovery:
         case supabase.AuthChangeEvent.tokenRefreshed:
-          break;
+        case supabase.AuthChangeEvent.userDeleted:
+        case supabase.AuthChangeEvent.mfaChallengeVerified:
       }
     });
   }
@@ -56,49 +57,49 @@ class AuthRepository implements AuthRepositoryInterface {
   Future<Either<Failure, UserEntity>> setSession(String token) async {
     final response = await authClient.setSession(token);
     await authTokenLocalDataSource
-        .store(response.data?.persistSessionString ?? '');
+        .store(response.session?.persistSessionString ?? '');
 
-    final data = response.data;
+    final data = response.session;
 
-    if (response.error != null || response.data == null) {
+    if (data == null) {
       await authTokenLocalDataSource.remove();
-      return left(const Failure.unauthorized());
+      return left(Failure.unauthorized(StackTrace.current));
     }
 
-    return right(UserEntity.fromJson(data!.user!.toJson()));
+    return right(UserEntity.fromJson(data.user.toJson()));
   }
 
   /// Recovers session from local storage and refreshes tokens
   @override
   Future<Either<Failure, UserEntity>> restoreSession() async {
     final res = authTokenLocalDataSource.get();
     if (res.isLeft()) {
-      return left(const Failure.empty());
+      return left(Failure.empty(StackTrace.current));
     }
 
     final response = await authClient.recoverSession(res.getOrElse((_) => ''));
-    final data = response.data;
+    final data = response.session;
 
-    if (response.error != null || response.data == null) {
+    if (response.session == null) {
       await authTokenLocalDataSource.remove();
-      return left(const Failure.unauthorized());
+      return left(Failure.unauthorized(StackTrace.current));
     }
 
     await authTokenLocalDataSource
-        .store(response.data?.persistSessionString ?? '');
+        .store(response.session?.persistSessionString ?? '');
 
-    return right(UserEntity.fromJson(data!.user!.toJson()));
+    return right(UserEntity.fromJson(data!.user.toJson()));
   }
 
   /// Signs in user to the application
   @override
   Future<Either<Failure, bool>> signInWithGoogle() async {
     log('here2');
-    final res = await authClient.signInWithProvider(
+    final res = await authClient.signInWithOAuth(
       supabase.Provider.google,
     );
     if (!res) {
-      return left(const Failure.badRequest());
+      return left(Failure.badRequest(StackTrace.current));
     }
     return right(true);
   }
@@ -107,11 +108,11 @@ class AuthRepository implements AuthRepositoryInterface {
   @override
   Future<Either<Failure, bool>> signOut() async {
     await authTokenLocalDataSource.remove();
-
-    final res = await authClient.signOut();
-    if (res.error != null) {
-      return left(const Failure.badRequest());
+    try {
+      await authClient.signOut();
+      return right(true);
+    } catch (e) {
+      return left(Failure.badRequest(StackTrace.current));
     }
-    return right(true);
   }
 }

lib/features/auth/presentation/widgets/sign_in_with_google_button.dart

@@ -1,6 +1,6 @@
 import 'dart:developer';
 
-import 'package:example/features/auth/auth_provider.dart';
+import 'package:example/features/auth/application/sign_in_with_google_controller.dart';
 import 'package:example/features/common/presentation/utils/extensions/ui_extension.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -15,7 +15,7 @@ class SignInWithGoogleButton extends ConsumerWidget {
     return ElevatedButton(
       onPressed: () {
         try {
-          ref.read(signInWithGoogleProvider.notifier).signInWithGoogle();
+          ref.read(signInWithGoogleProvider.future);
         } catch (e) {
           log(e.toString());
         }

lib/features/common/domain/failures/failure.dart

@@ -5,22 +5,32 @@ part 'failure.freezed.dart';
 @freezed
 
 /// Represents all app failures
-class Failure implements Exception {
-
+class Failure with _$Failure implements Exception {
   const Failure._();
 
   /// Expected value is null or empty
-  const factory Failure.empty() = _EmptyFailure;
+  const factory Failure.empty(
+    StackTrace stackTrace, [
+    String? message,
+  ]) = _EmptyFailure;
 
   ///  Expected value has invalid format
-  const factory Failure.unprocessableEntity({required String message}) =
-      _UnprocessableEntityFailure;
+  const factory Failure.unprocessableEntity(
+    StackTrace stackTrace, {
+    required String message,
+  }) = _UnprocessableEntityFailure;
 
   /// Represent 401 error
-  const factory Failure.unauthorized() = _UnauthorizedFailure;
+  const factory Failure.unauthorized(
+    StackTrace stackTrace, [
+    String? message,
+  ]) = _UnauthorizedFailure;
 
   /// Represents 400 error
-  const factory Failure.badRequest() = _BadRequestFailure;
+  const factory Failure.badRequest(
+    StackTrace stackTrace, [
+    String? message,
+  ]) = _BadRequestFailure;
 
   /// Get the error message for specified failure
   String get error => this is _UnprocessableEntityFailure