fix fix

Author: hoc081098

analysis_options.yaml

@@ -1,4 +1,9 @@
 include: package:pedantic/analysis_options.1.11.0.yaml
+
+analyzer:
+  enable-experiment:
+    - nonfunction-type-aliases
+
 linter:
   rules:
     - prefer_final_locals

lib/data/user_repository_imp.dart

@@ -13,6 +13,8 @@ import 'package:node_auth/domain/models/user_and_token.dart';
 import 'package:node_auth/domain/repositories/user_repository.dart';
 import 'package:node_auth/utils/result.dart';
 import 'package:rxdart/rxdart.dart';
+import 'package:rxdart_ext/rxdart_ext.dart';
+import 'package:tuple/tuple.dart';
 
 part 'mappers.dart';
 
@@ -42,34 +44,28 @@ class UserRepositoryImpl implements UserRepository {
   }
 
   @override
-  Stream<Result<void>> login({
+  Single_Result_Unit login({
     required String email,
     required String password,
   }) {
-    return _execute(
-      () => _remoteDataSource.loginUser(
-        email,
-        password,
-      ),
-    ).flatMapResult((result) {
+    return _execute(() => _remoteDataSource.loginUser(email, password))
+        .flatMapResult((result) {
       final token = result!.token!;
-
-      return _execute(
-        () => _remoteDataSource.getUserProfile(
-          email,
-          token,
-        ),
-      ).flatMapResult(
-        (user) => _execute(
-          () => _localDataSource.saveUserAndToken(
-            _Mappers.userResponseToUserAndTokenEntity(
-              user!,
-              token,
-            ),
-          ),
-        ),
-      );
-    });
+      return _execute(() => _remoteDataSource
+          .getUserProfile(email, token)
+          .then((user) => Tuple2(user, token)));
+    }).flatMapResult(
+      (tuple) => _execute(
+        () => _localDataSource
+            .saveUserAndToken(
+              _Mappers.userResponseToUserAndTokenEntity(
+                tuple!.item1,
+                tuple.item2,
+              ),
+            )
+            .then((value) => unit),
+      ),
+    );
   }
 
   @override
@@ -173,9 +169,11 @@ class UserRepositoryImpl implements UserRepository {
   /// if future is successful, emit [Success]
   /// if future complete with error, emit [Failure]
   ///
-  Stream<Result<T>> _execute<T>(Future<T> Function() factory) =>
-      Rx.fromCallable(factory)
-          .doOnError(_handleUnauthenticatedError)
+  Single<Result<T>> _execute<T>(Future<T> Function() factory) =>
+      Single.fromCallable(factory)
+          .doOnError(
+              _handleUnauthenticatedError) // TODO(single): remove singleOrError
+          .singleOrError()
           .map<Result<T>>((value) => Success<T>.of(value: value))
           .onErrorReturnWith(_errorToResult);
 

lib/domain/repositories/user_repository.dart

@@ -2,37 +2,40 @@ import 'dart:io';
 
 import 'package:node_auth/domain/models/auth_state.dart';
 import 'package:node_auth/utils/result.dart';
+import 'package:rxdart_ext/rxdart_ext.dart';
+
+typedef Single_Result_Unit = Single<Result<Unit>>;
 
 abstract class UserRepository {
   Stream<AuthenticationState> get authenticationState$;
 
   Future<AuthenticationState> get authenticationState;
 
-  Stream<Result<void>> login({
+  Single_Result_Unit login({
     required String email,
     required String password,
   });
 
-  Stream<Result<void>> registerUser({
+  Single_Result_Unit registerUser({
     required String name,
     required String email,
     required String password,
   });
 
-  Stream<Result<void>> logout();
+  Single_Result_Unit logout();
 
-  Stream<Result<void>> uploadImage(File image);
+  Single_Result_Unit uploadImage(File image);
 
-  Stream<Result<void>> changePassword({
+  Single_Result_Unit changePassword({
     required String password,
     required String newPassword,
   });
 
-  Stream<Result<void>> resetPassword({
+  Single_Result_Unit resetPassword({
     required String email,
     required String token,
     required String newPassword,
   });
 
-  Stream<Result<void>> sendResetPasswordEmail(String email);
+  Single_Result_Unit sendResetPasswordEmail(String email);
 }

lib/utils/result.dart

@@ -1,6 +1,6 @@
 import 'package:built_value/built_value.dart';
 import 'package:meta/meta.dart';
-import 'package:rxdart/rxdart.dart';
+import 'package:rxdart_ext/rxdart_ext.dart';
 
 part 'result.g.dart';
 
@@ -51,21 +51,26 @@ abstract class Failure<T>
   factory Failure([void Function(FailureBuilder<T>) updates]) = _$Failure<T>;
 }
 
-extension FlatMapResultExtension<T> on Stream<Result<T>> {
-  Stream<Result<R>> flatMapResult<R>(
-      Stream<Result<R>> Function(T? value) mapper) {
-    return flatMap((result) {
-      if (result is Failure<T>) {
-        final failure = Failure<R>.of(
-          message: result.message,
-          error: result.error,
-        );
-        return Stream.value(failure);
-      }
-      if (result is Success<T>) {
-        return mapper(result.value);
-      }
-      return Stream.error('Cannot handle result: $result');
-    });
+extension FlatMapResultExtension<T extends Object?> on Single<Result<T>> {
+  Single<Result<R>> flatMapResult<R>(
+    Single<Result<R>> Function(T? value) mapper,
+  ) {
+    return flatMapSingle(
+      (result) => result.fold(
+        mapper,
+        (error, message) => Single.value(
+          Failure<R>.of(
+            message: message,
+            error: error,
+          ),
+        ),
+      ),
+    );
   }
 }
+
+class Unit {
+  const Unit._();
+}
+
+const unit = Unit._();

pubspec.lock

@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -236,7 +236,7 @@ packages:
       name: flutter_bloc_pattern
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   flutter_blurhash:
     dependency: transitive
     description:
@@ -316,7 +316,7 @@ packages:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.5"
+    version: "0.7.5+3"
   image_picker_for_web:
     dependency: transitive
     description:
@@ -498,21 +498,23 @@ packages:
       name: rxdart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.27.0"
+    version: "0.27.1"
   rxdart_ext:
     dependency: "direct main"
     description:
-      name: rxdart_ext
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.0"
+      path: "."
+      ref: b2c19235776bb50af60bc1f029766ee68f4f61c6
+      resolved-ref: b2c19235776bb50af60bc1f029766ee68f4f61c6
+      url: "https://github.com/hoc081098/rxdart_ext.git"
+    source: git
+    version: "0.1.1-dev.0"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -580,7 +582,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -622,7 +624,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.3.0"
   timing:
     dependency: transitive
     description:
@@ -687,5 +689,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.13.0 <3.0.0"
   flutter: ">=2.0.0"

pubspec.yaml

@@ -5,7 +5,7 @@ publish_to: 'none'
 version: 2.0.0+2
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.13.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -17,18 +17,18 @@ dependencies:
   http: ^0.13.3
   built_value: ^8.0.6
   tuple: ^2.0.0
-  rxdart: ^0.27.0
-  image_picker: ^0.7.5
-  shared_preferences: ^2.0.5
+  rxdart: ^0.27.1
+  image_picker: ^0.7.5+3
+  shared_preferences: ^2.0.6
   octo_image: ^1.0.0+1
 
   distinct_value_connectable_stream: ^1.3.0
   flutter_provider: ^2.0.0
   rx_shared_preferences: ^2.1.0
   disposebag: ^1.5.0
   flutter_disposebag: ^1.1.0
-  flutter_bloc_pattern: ^2.1.0
-  rxdart_ext: ^0.1.0
+  flutter_bloc_pattern: ^2.1.1
+  rxdart_ext: ^0.1.1-dev.0
   did_change_dependencies: ^0.0.3
   pedantic: ^1.11.0
 
@@ -39,6 +39,12 @@ dev_dependencies:
   build_runner: ^1.12.2
   built_value_generator: ^8.0.6
 
+dependency_overrides:
+  rxdart_ext:
+    git:
+      url: https://github.com/hoc081098/rxdart_ext.git
+      ref: b2c19235776bb50af60bc1f029766ee68f4f61c6
+
 flutter:
   uses-material-design: true
   assets: