wip nnbd

Author: hoc081098

lib/data/exception/local_data_source_exception.dart

@@ -1,8 +1,9 @@
 class LocalDataSourceException implements Exception {
   final String message;
   final Object error;
+  final StackTrace stackTrace;
 
-  const LocalDataSourceException(this.message, this.error);
+  const LocalDataSourceException(this.message, this.error, this.stackTrace);
 
   @override
   String toString() =>

lib/data/local/shared_pref_util.dart

@@ -15,27 +15,27 @@ class SharedPrefUtil implements LocalDataSource {
   @override
   Future<void> removeUserAndToken() =>
       _rxPrefs.remove(_kUserTokenKey).onError<Object>((e, s) =>
-          throw LocalDataSourceException('Cannot delete user and token', e));
+          throw LocalDataSourceException('Cannot delete user and token', e, s));
 
   @override
   Future<void> saveUserAndToken(UserAndTokenEntity userAndToken) {
     return _rxPrefs
         .write<UserAndTokenEntity>(_kUserTokenKey, userAndToken, _toString)
         .onError<Object>((e, s) =>
-            throw LocalDataSourceException('Cannot save user and token', e));
+            throw LocalDataSourceException('Cannot save user and token', e, s));
   }
 
   @override
   Future<UserAndTokenEntity?> get userAndToken => _rxPrefs
       .read<UserAndTokenEntity>(_kUserTokenKey, _toEntity)
       .onError<Object>((e, s) =>
-          throw LocalDataSourceException('Cannot read user and token', e));
+          throw LocalDataSourceException('Cannot read user and token', e, s));
 
   @override
   Stream<UserAndTokenEntity?> get userAndToken$ => _rxPrefs
       .observe<UserAndTokenEntity>(_kUserTokenKey, _toEntity)
-      .onErrorReturnWith((e) =>
-          throw LocalDataSourceException('Cannot read user and token', e));
+      .onErrorReturnWith((e, s) =>
+          throw LocalDataSourceException('Cannot read user and token', e, s));
 
   static UserAndTokenEntity? _toEntity(dynamic jsonString) => jsonString == null
       ? null

lib/data/remote/response/token_response.dart

@@ -20,5 +20,6 @@ abstract class TokenResponse
   factory TokenResponse.fromJson(Map<String, dynamic> json) =>
       serializers.deserializeWith<TokenResponse>(serializer, json)!;
 
-  Map<String, dynamic> toJson() => serializers.serializeWith(serializer, this) as Map<String, dynamic>;
+  Map<String, dynamic> toJson() =>
+      serializers.serializeWith(serializer, this) as Map<String, dynamic>;
 }

lib/data/user_repository_imp.dart

@@ -194,7 +194,7 @@ class UserRepositoryImpl implements UserRepository {
   ///
   /// Convert error to [Failure]
   ///
-  static Failure<T> _errorToResult<T extends Object>(Object e) {
+  static Failure<T> _errorToResult<T extends Object>(Object e, StackTrace s) {
     if (e is RemoteDataSourceException) {
       return Failure.of(message: e.message, error: e);
     }

lib/domain/repositories/user_repository.dart

@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:meta/meta.dart';
 import 'package:node_auth/domain/models/auth_state.dart';
 import 'package:node_auth/utils/result.dart';
 

lib/domain/usecases/change_password_use_case.dart

@@ -1,6 +1,5 @@
 import 'package:node_auth/domain/repositories/user_repository.dart';
 import 'package:node_auth/utils/result.dart';
-import 'package:meta/meta.dart';
 
 class ChangePasswordUseCase {
   final UserRepository _userRepository;

lib/domain/usecases/login_use_case.dart

@@ -1,4 +1,3 @@
-import 'package:meta/meta.dart';
 import 'package:node_auth/domain/repositories/user_repository.dart';
 import 'package:node_auth/utils/result.dart';
 

lib/domain/usecases/register_use_case.dart

@@ -1,4 +1,3 @@
-import 'package:meta/meta.dart';
 import 'package:node_auth/domain/repositories/user_repository.dart';
 import 'package:node_auth/utils/result.dart';
 

lib/domain/usecases/reset_password_use_case.dart

@@ -1,6 +1,5 @@
 import 'package:node_auth/domain/repositories/user_repository.dart';
 import 'package:node_auth/utils/result.dart';
-import 'package:meta/meta.dart';
 
 class ResetPasswordUseCase {
   final UserRepository _userRepository;

lib/pages/home/change_password/change_password_bloc.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import 'package:disposebag/disposebag.dart';
+import 'package:distinct_value_connectable_stream/distinct_value_connectable_stream.dart';
 import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
-import 'package:meta/meta.dart';
 import 'package:node_auth/domain/usecases/change_password_use_case.dart';
 import 'package:node_auth/pages/home/change_password/change_password.dart';
 import 'package:node_auth/utils/result.dart';
@@ -25,9 +25,9 @@ class ChangePasswordBloc extends DisposeCallbackBaseBloc {
   final Function1<String, void> newPasswordChanged;
 
   /// Output stream
-  final Stream<ChangePasswordState> changePasswordState$;
-  final Stream<String> passwordError$;
-  final Stream<String> newPasswordError$;
+  final DistinctValueStream<ChangePasswordState> changePasswordState$;
+  final Stream<String?> passwordError$;
+  final Stream<String?> newPasswordError$;
 
   ChangePasswordBloc._({
     required this.changePassword,
@@ -40,8 +40,6 @@ class ChangePasswordBloc extends DisposeCallbackBaseBloc {
   }) : super(dispose);
 
   factory ChangePasswordBloc(final ChangePasswordUseCase changePassword) {
-    assert(ChangePasswordUseCase != null);
-
     /// Controllers
     final passwordS = PublishSubject<String>();
     final newPasswordS = PublishSubject<String>();
@@ -71,7 +69,7 @@ class ChangePasswordBloc extends DisposeCallbackBaseBloc {
         .where((isValid) => isValid)
         .withLatestFrom(both$, (_, Tuple2<String, String> both) => both)
         .exhaustMap((both) => _performChangePassword(changePassword, both))
-        .share();
+        .publishValueDistinct(ChangePasswordState((b) => b..isLoading = false));
 
     final passwordError$ = both$
         .map((tuple) {
@@ -134,22 +132,19 @@ class ChangePasswordBloc extends DisposeCallbackBaseBloc {
   ) {
     print('[DEBUG] change password both=$both');
 
-    ChangePasswordState resultToState(result) {
+    ChangePasswordState resultToState(Result<void> result) {
       print('[DEBUG] change password result=$result');
 
-      if (result is Success) {
-        return ChangePasswordState((b) => b
+      return result.fold(
+        (value) => ChangePasswordState((b) => b
           ..isLoading = false
           ..error = null
-          ..message = 'Change password successfully!');
-      }
-      if (result is Failure) {
-        return ChangePasswordState((b) => b
+          ..message = 'Change password successfully!'),
+        (error, message) => ChangePasswordState((b) => b
           ..isLoading = false
-          ..error = result.error
-          ..message = 'Error when change password: ${result.message}');
-      }
-      return null;
+          ..error = error
+          ..message = 'Error when change password: ${message}'),
+      );
     }
 
     return changePassword(password: both.item1, newPassword: both.item2)