From 6d1e731619e90389a031a7f1722d0a24394d1897 Mon Sep 17 00:00:00 2001 From: ibrahim Date: Mon, 10 Jun 2024 23:58:54 +0200 Subject: [PATCH] refactor: migrated auth_form_controller.dart to riverpod v2 --- .../features/auth/auth_form_controller.dart | 88 ++++----- .../features/auth/auth_form_controller.g.dart | 176 ++++++++++++++++++ melos.yaml | 4 +- 3 files changed, 225 insertions(+), 43 deletions(-) create mode 100644 designer_v2/lib/features/auth/auth_form_controller.g.dart diff --git a/designer_v2/lib/features/auth/auth_form_controller.dart b/designer_v2/lib/features/auth/auth_form_controller.dart index 034feb869..834c36eb4 100644 --- a/designer_v2/lib/features/auth/auth_form_controller.dart +++ b/designer_v2/lib/features/auth/auth_form_controller.dart @@ -1,7 +1,10 @@ +import 'dart:async'; + import 'package:flutter/foundation.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:reactive_forms/reactive_forms.dart'; +import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:studyu_designer_v2/features/forms/form_view_model.dart'; import 'package:studyu_designer_v2/localization/app_translation.dart'; import 'package:studyu_designer_v2/repositories/auth_repository.dart'; @@ -11,6 +14,8 @@ import 'package:studyu_designer_v2/services/notification_service.dart'; import 'package:studyu_designer_v2/services/notifications.dart'; import 'package:supabase/supabase.dart'; +part 'auth_form_controller.g.dart'; + enum AuthFormKey { login, signup, @@ -48,19 +53,49 @@ enum AuthFormKey { } } -class AuthFormController extends StateNotifier> implements IFormGroupController { - AuthFormController({ - required this.authRepository, - required this.notificationService, - required this.router, - }) : super(const AsyncValue.data(null)) { +@riverpod +class AuthFormController extends _$AuthFormController implements IFormGroupController { + + @override + AsyncValue build(AuthFormKey formKey) { + authRepository = ref.watch(authRepositoryProvider); + notificationService = ref.watch(notificationServiceProvider); + router = ref.watch(routerProvider); + + formKey = formKey; + resetControlsFor(formKey); + + ref.listenSelf((previous, next) { + print("authFormController.state updated"); + if (state.hasError) { + final AuthException error = state.error as AuthException; + switch (error.message) { + case "Invalid login credentials": + notificationService.show(Notifications.credentialsInvalid); + break; + case "User already registered": + notificationService.show(Notifications.userAlreadyRegistered); + break; + default: + notificationService.showMessage(error.message); + } + } + }); + + ref.onDispose(() { + print("authFormControllerProvider.DISPOSE"); + }); + _readDebugUser(); _onChangeFormKey(formKey); + + return AsyncValue.data(null); } - final IAuthRepository authRepository; - final INotificationService notificationService; - final GoRouter router; + + late final IAuthRepository authRepository; + late final INotificationService notificationService; + late final GoRouter router; // - Form controls @@ -198,6 +233,7 @@ class AuthFormController extends StateNotifier> implements IFor } try { state = const AsyncValue.loading(); + print("authRepository.signUp"); return await authRepository.signUp(email: email, password: password); } catch (e) { state = AsyncValue.error(e, StackTrace.current); @@ -223,7 +259,7 @@ class AuthFormController extends StateNotifier> implements IFor } catch (e) { state = AsyncValue.error(e, StackTrace.current); } finally { - state = const AsyncValue.data(null); + state = const AsyncValue.data(null); } return Future.value(AuthResponse()); } @@ -291,35 +327,3 @@ class AuthFormController extends StateNotifier> implements IFor } } } - -final authFormControllerProvider = - StateNotifierProvider.autoDispose.family, AuthFormKey>((ref, formKey) { - final authFormController = AuthFormController( - authRepository: ref.watch(authRepositoryProvider), - notificationService: ref.watch(notificationServiceProvider), - router: ref.watch(routerProvider), - ); - authFormController.formKey = formKey; - authFormController.resetControlsFor(formKey); - authFormController.addListener((state) { - print("authFormController.state updated"); - if (state.hasError) { - final AuthException error = state.error as AuthException; - switch (error.message) { - case "Invalid login credentials": - authFormController.notificationService.show(Notifications.credentialsInvalid); - break; - case "User already registered": - authFormController.notificationService.show(Notifications.userAlreadyRegistered); - break; - default: - authFormController.notificationService.showMessage(error.message); - } - } - }); - ref.onDispose(() { - print("authFormControllerProvider.DISPOSE"); - }); - print("authFormControllerProvider"); - return authFormController; -}); diff --git a/designer_v2/lib/features/auth/auth_form_controller.g.dart b/designer_v2/lib/features/auth/auth_form_controller.g.dart new file mode 100644 index 000000000..9fc00fa8b --- /dev/null +++ b/designer_v2/lib/features/auth/auth_form_controller.g.dart @@ -0,0 +1,176 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'auth_form_controller.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +String _$authFormControllerHash() => + r'536f61faf22e316334e07415d09389bff1c76b45'; + +/// Copied from Dart SDK +class _SystemHash { + _SystemHash._(); + + static int combine(int hash, int value) { + // ignore: parameter_assignments + hash = 0x1fffffff & (hash + value); + // ignore: parameter_assignments + hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10)); + return hash ^ (hash >> 6); + } + + static int finish(int hash) { + // ignore: parameter_assignments + hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3)); + // ignore: parameter_assignments + hash = hash ^ (hash >> 11); + return 0x1fffffff & (hash + ((0x00003fff & hash) << 15)); + } +} + +abstract class _$AuthFormController + extends BuildlessAutoDisposeNotifier> { + late final AuthFormKey formKey; + + AsyncValue build( + AuthFormKey formKey, + ); +} + +/// See also [AuthFormController]. +@ProviderFor(AuthFormController) +const authFormControllerProvider = AuthFormControllerFamily(); + +/// See also [AuthFormController]. +class AuthFormControllerFamily extends Family> { + /// See also [AuthFormController]. + const AuthFormControllerFamily(); + + /// See also [AuthFormController]. + AuthFormControllerProvider call( + AuthFormKey formKey, + ) { + return AuthFormControllerProvider( + formKey, + ); + } + + @override + AuthFormControllerProvider getProviderOverride( + covariant AuthFormControllerProvider provider, + ) { + return call( + provider.formKey, + ); + } + + static const Iterable? _dependencies = null; + + @override + Iterable? get dependencies => _dependencies; + + static const Iterable? _allTransitiveDependencies = null; + + @override + Iterable? get allTransitiveDependencies => + _allTransitiveDependencies; + + @override + String? get name => r'authFormControllerProvider'; +} + +/// See also [AuthFormController]. +class AuthFormControllerProvider extends AutoDisposeNotifierProviderImpl< + AuthFormController, AsyncValue> { + /// See also [AuthFormController]. + AuthFormControllerProvider( + AuthFormKey formKey, + ) : this._internal( + () => AuthFormController()..formKey = formKey, + from: authFormControllerProvider, + name: r'authFormControllerProvider', + debugGetCreateSourceHash: + const bool.fromEnvironment('dart.vm.product') + ? null + : _$authFormControllerHash, + dependencies: AuthFormControllerFamily._dependencies, + allTransitiveDependencies: + AuthFormControllerFamily._allTransitiveDependencies, + formKey: formKey, + ); + + AuthFormControllerProvider._internal( + super._createNotifier, { + required super.name, + required super.dependencies, + required super.allTransitiveDependencies, + required super.debugGetCreateSourceHash, + required super.from, + required this.formKey, + }) : super.internal(); + + final AuthFormKey formKey; + + @override + AsyncValue runNotifierBuild( + covariant AuthFormController notifier, + ) { + return notifier.build( + formKey, + ); + } + + @override + Override overrideWith(AuthFormController Function() create) { + return ProviderOverride( + origin: this, + override: AuthFormControllerProvider._internal( + () => create()..formKey = formKey, + from: from, + name: null, + dependencies: null, + allTransitiveDependencies: null, + debugGetCreateSourceHash: null, + formKey: formKey, + ), + ); + } + + @override + AutoDisposeNotifierProviderElement> + createElement() { + return _AuthFormControllerProviderElement(this); + } + + @override + bool operator ==(Object other) { + return other is AuthFormControllerProvider && other.formKey == formKey; + } + + @override + int get hashCode { + var hash = _SystemHash.combine(0, runtimeType.hashCode); + hash = _SystemHash.combine(hash, formKey.hashCode); + + return _SystemHash.finish(hash); + } +} + +mixin AuthFormControllerRef + on AutoDisposeNotifierProviderRef> { + /// The parameter `formKey` of this provider. + AuthFormKey get formKey; +} + +class _AuthFormControllerProviderElement + extends AutoDisposeNotifierProviderElement> with AuthFormControllerRef { + _AuthFormControllerProviderElement(super.provider); + + @override + AuthFormKey get formKey => (origin as AuthFormControllerProvider).formKey; +} +// ignore_for_file: type=lint +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member diff --git a/melos.yaml b/melos.yaml index 395ae5c53..4b26d44a7 100644 --- a/melos.yaml +++ b/melos.yaml @@ -64,7 +64,9 @@ scripts: "dart run build_runner build --delete-conflicting-outputs" description: Generate files with build_runner packageFilters: - scope: studyu_core + scope: + - 'studyu_core' + - 'studyu_designer_v2' reset: run: |