Remove either

app/lib/app/cubit/auth_cubit.dart

@@ -17,31 +17,44 @@ class AuthCubit extends Cubit<AuthState> {
     try {
       await authRepository.loginWithEmail(email);
     } on Exception catch (e) {
-      emit(state.copyWith(exception: Exception(e)));
+      emit(state.copyWith(exception: e));
     }
   }
 
   Future<AuthState> verifyOtp(String otp, String email) async {
-    final user = await authRepository.verifyOtp(
-      email: email,
-      otp: otp,
-      languageCode: state.currentLocale.languageCode,
-      gender: state.gender,
-    );
-    user.fold((l) => emit(state.copyWith(exception: l)), (r) => emit(state.copyWith(user: r)));
-    return state;
+    try {
+      final user = await authRepository.verifyOtp(
+        email: email,
+        otp: otp,
+        languageCode: state.currentLocale.languageCode,
+        gender: state.gender,
+      );
+      emit(state.copyWith(user: user));
+      return state;
+    } on Exception catch (e) {
+      emit(state.copyWith(exception: e));
+      return state;
+    }
   }
 
   Future<AuthState> signInWithGoogle() async {
-    final user = await authRepository.signWithGoogle(state.currentLocale.languageCode, state.gender);
-    user.fold((l) => emit(state.copyWith(exception: l)), (r) => emit(state.copyWith(user: r)));
-    return state;
+    try {
+      final user = await authRepository.signWithGoogle(state.currentLocale.languageCode, state.gender);
+      emit(state.copyWith(user: user));
+      return state;
+    } on Exception catch (e) {
+      emit(state.copyWith(exception: e));
+      return state;
+    }
   }
 
   Future<AuthState> signInWithApple() async {
-    final user = await authRepository.signWithApple(state.currentLocale.languageCode, state.gender);
-
-    user.fold((l) => emit(state.copyWith(exception: l)), (r) => emit(state.copyWith(user: r)));
+    try {
+      final user = await authRepository.signWithApple(state.currentLocale.languageCode, state.gender);
+      emit(state.copyWith(user: user));
+    } on Exception catch (e) {
+      emit(state.copyWith(exception: e));
+    }
 
     return state;
   }
@@ -52,25 +65,29 @@ class AuthCubit extends Cubit<AuthState> {
 
   Future<void> saveLocale(String localeCode) async {
     if (state.isAuthedticated) {
-      final res = await authRepository.patchLocaleCode(userId: state.user!.accessToken, localeCode: localeCode);
-
-      res.fold((l) => emit(state.copyWith(exception: l)), (r) {
-        final newUser = state.user!.copyWith(localeCode: r.localeValue);
+      try {
+        final res = await authRepository.patchLocaleCode(userId: state.user!.accessToken, localeCode: localeCode);
+        final newUser = state.user!.copyWith(localeCode: res.localeValue);
         emit(state.copyWith(user: newUser));
-      });
+      } on Exception catch (e) {
+        emit(state.copyWith(exception: e));
+        return;
+      }
     } else {
       emit(state.copyWith(localeForNow: localeCode));
     }
   }
 
   Future<void> saveGender(Gender gender) async {
     if (state.isAuthedticated) {
-      final res = await authRepository.patchGender(userId: state.user!.accessToken, gender: gender);
-
-      res.fold((l) => emit(state.copyWith(exception: l)), (r) {
-        final newUser = state.user!.copyWith(gender: r.genderValue);
+      try {
+        final res = await authRepository.patchGender(userId: state.user!.accessToken, gender: gender);
+        final newUser = state.user!.copyWith(gender: res.genderValue);
         emit(state.copyWith(user: newUser));
-      });
+      } on Exception catch (e) {
+        emit(state.copyWith(exception: e));
+        return;
+      }
     } else {
       emit(state.copyWith(genderForNow: gender));
     }
@@ -81,7 +98,7 @@ class AuthCubit extends Cubit<AuthState> {
       await authRepository.deleteAccount();
       emit(const AuthState());
     } on Exception catch (e) {
-      emit(state.copyWith(exception: Exception(e)));
+      emit(state.copyWith(exception: e));
     }
   }
 
@@ -90,7 +107,7 @@ class AuthCubit extends Cubit<AuthState> {
       await authRepository.logout();
       emit(const AuthState());
     } on Exception catch (e) {
-      emit(state.copyWith(exception: Exception(e)));
+      emit(state.copyWith(exception: e));
     }
   }
 

app/lib/app/cubit/auth_state.dart

@@ -4,14 +4,14 @@ class AuthState extends Equatable {
   const AuthState({this.user, this.exception, this.localeForNow, this.genderForNow});
 
   final UserEntity? user;
-  final Exception? exception;
+  final Object? exception;
   final String? localeForNow;
   final Gender? genderForNow;
 
   @override
   List<Object?> get props => [user, exception, localeForNow, genderForNow];
 
-  AuthState copyWith({UserEntity? user, Exception? exception, String? localeForNow, Gender? genderForNow}) {
+  AuthState copyWith({UserEntity? user, Object? exception, String? localeForNow, Gender? genderForNow}) {
     return AuthState(
       user: user ?? this.user,
       exception: exception ?? this.exception,

app/pubspec.lock

@@ -842,13 +842,6 @@ packages:
       relative: true
     source: path
     version: "0.1.0+1"
-  mq_either:
-    dependency: "direct main"
-    description:
-      path: "../packages/mq_either"
-      relative: true
-    source: path
-    version: "0.1.0+1"
   mq_hatim_repository:
     dependency: "direct main"
     description:

app/pubspec.yaml

@@ -46,8 +46,6 @@ dependencies:
   # Packages
   mq_ci_keys:
     path: ../packages/mq_ci_keys
-  mq_either:
-    path: ../packages/mq_either
   mq_remote_client:
     path: ../packages/mq_remote_client
   mq_storage:

app/pubspec_overrides.yaml

@@ -1,4 +1,4 @@
-# melos_managed_dependency_overrides: mq_analytics,mq_app_ui,mq_auth_repository,mq_ci_keys,mq_crashlytics,mq_either,mq_hatim_repository,mq_home_repository,mq_prayer_time,mq_quran_repository,mq_remote_config,mq_storage
+# melos_managed_dependency_overrides: mq_analytics,mq_app_ui,mq_auth_repository,mq_ci_keys,mq_crashlytics,mq_hatim_repository,mq_home_repository,mq_prayer_time,mq_quran_repository,mq_remote_config,mq_storage
 dependency_overrides:
   mq_remote_client:
     path: ../packages/mq_remote_client
@@ -12,8 +12,6 @@ dependency_overrides:
     path: ../packages/mq_ci_keys
   mq_crashlytics:
     path: ../packages/mq_crashlytics
-  mq_either:
-    path: ../packages/mq_either
   mq_hatim_repository:
     path: ../packages/mq_hatim_repository
   mq_home_repository:
@@ -26,4 +24,3 @@ dependency_overrides:
     path: ../packages/mq_remote_config
   mq_storage:
     path: ../packages/mq_storage
-

packages/mq_app_ui/gallery/pubspec_overrides.yaml

@@ -1,9 +1,7 @@
-# melos_managed_dependency_overrides: mq_app_ui,mq_either,mq_prayer_time,mq_remote_client,mq_storage
+# melos_managed_dependency_overrides: mq_app_ui,mq_prayer_time,mq_remote_client,mq_storage
 dependency_overrides:
   mq_app_ui:
     path: ..
-  mq_either:
-    path: ../../mq_either
   mq_prayer_time:
     path: ../../mq_prayer_time
   mq_remote_client:

packages/mq_app_ui/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
   pinput: ^5.0.1
   mockingjay: ^0.6.0
   flutter_svg: ^2.0.17
-  animated_analog_clock: ^0.2.1 
+  animated_analog_clock: ^0.2.1
   syncfusion_flutter_charts: ^28.2.5+1
   flutter_instagram_storyboard: ^1.0.1
   cached_network_image: ^3.4.1

packages/mq_app_ui/pubspec_overrides.yaml

@@ -1,7 +1,5 @@
-# melos_managed_dependency_overrides: mq_either,mq_prayer_time,mq_remote_client,mq_storage
+# melos_managed_dependency_overrides: mq_prayer_time,mq_remote_client,mq_storage
 dependency_overrides:
-  mq_either:
-    path: ../mq_either
   mq_prayer_time:
     path: ../mq_prayer_time
   mq_remote_client:

packages/mq_auth_repository/lib/src/repositories/auth_repository.dart

@@ -1,26 +1,25 @@
 import 'package:mq_auth_repository/mq_auth_repository.dart';
-import 'package:mq_either/mq_either.dart';
 
 abstract class AuthRepository {
   UserEntity? get init;
 
   Future<void> loginWithEmail(String email);
 
-  Future<Either<UserEntity, Exception>> verifyOtp({
+  Future<UserEntity> verifyOtp({
     required String email,
     required String otp,
     required String languageCode,
     required Gender gender,
   });
-  Future<Either<UserEntity, Exception>> signWithGoogle(String languageCode, Gender gender);
+  Future<UserEntity> signWithGoogle(String languageCode, Gender gender);
 
-  Future<Either<UserEntity, Exception>> signWithApple(String languageCode, Gender gender);
+  Future<UserEntity> signWithApple(String languageCode, Gender gender);
 
   Future<void> setUserData(UserEntity userEntity);
 
-  Future<Either<UserDataEntity, Exception>> patchGender({required String userId, required Gender gender});
+  Future<UserDataEntity> patchGender({required String userId, required Gender gender});
 
-  Future<Either<UserDataEntity, Exception>> patchLocaleCode({required String userId, required String localeCode});
+  Future<UserDataEntity> patchLocaleCode({required String userId, required String localeCode});
 
   Future<void> deleteAccount();
 

packages/mq_auth_repository/lib/src/repositories/auth_repositoty_impl.dart

@@ -1,9 +1,5 @@
-import 'dart:developer';
-
 import 'package:meta/meta.dart';
 import 'package:mq_auth_repository/mq_auth_repository.dart';
-import 'package:mq_crashlytics/mq_crashlytics.dart';
-import 'package:mq_either/mq_either.dart';
 
 @immutable
 final class AuthRepositoryImpl implements AuthRepository {
@@ -17,115 +13,77 @@ final class AuthRepositoryImpl implements AuthRepository {
 
   @override
   Future<void> setUserData(UserEntity userEntity) async {
-    try {
-      await remoteDataSource.saveUserData(userEntity);
-      await localDataSource.saveUserData(userEntity);
-    } on Exception catch (e, s) {
-      MqCrashlytics.report(e, s);
-      log('setUserData error $e,\n$s');
-    }
+    await remoteDataSource.saveUserData(userEntity);
+    await localDataSource.saveUserData(userEntity);
   }
 
   @override
   Future<void> loginWithEmail(String email) async {
-    try {
-      await remoteDataSource.loginWithEmail(email);
-    } on Exception catch (e, s) {
-      MqCrashlytics.report(e, s);
-      log('signWithEmail: error: $e\n$s');
-    }
+    await remoteDataSource.loginWithEmail(email);
   }
 
   @override
-  Future<Either<UserEntity, Exception>> verifyOtp({
+  Future<UserEntity> verifyOtp({
     required String email,
     required String otp,
     required String languageCode,
     required Gender gender,
   }) async {
-    try {
-      final res = await remoteDataSource.verifyOtp(email: email, otp: otp, languageCode: languageCode, gender: gender);
-
-      return res.fold(Left.new, (r) {
-        final userEntity = UserEntity(
-          accessToken: r.accessToken,
-          username: r.username,
-          gender: r.gender,
-          localeCode: r.localeCode,
-        );
-        return Right(userEntity);
-      });
-    } on Exception catch (e, s) {
-      log('signWithemail: error: $e\n$s');
-      MqCrashlytics.report(e, s);
-      return Left(AuthenticationExc(message: e.toString()));
-    }
+    final res = await remoteDataSource.verifyOtp(email: email, otp: otp, languageCode: languageCode, gender: gender);
+    return UserEntity(
+      accessToken: res.accessToken,
+      username: res.username,
+      gender: res.gender,
+      localeCode: res.localeCode,
+    );
   }
 
   @override
-  Future<Either<UserEntity, Exception>> signWithGoogle(String languageCode, Gender gender) async {
+  Future<UserEntity> signWithGoogle(String languageCode, Gender gender) async {
     final res = await remoteDataSource.signInWithGoogle(languageCode, gender);
-    return res.fold(
-      Left.new,
-      (r) => Right(
-        UserEntity(accessToken: r.accessToken, username: r.username, gender: r.gender, localeCode: r.localeCode),
-      ),
+
+    return UserEntity(
+      accessToken: res.accessToken,
+      username: res.username,
+      gender: res.gender,
+      localeCode: res.localeCode,
     );
   }
 
   @override
-  Future<Either<UserEntity, Exception>> signWithApple(String languageCode, Gender gender) async {
+  Future<UserEntity> signWithApple(String languageCode, Gender gender) async {
     final res = await remoteDataSource.signInWithApple(languageCode, gender);
-    return res.fold(
-      Left.new,
-      (r) => Right(
-        UserEntity(accessToken: r.accessToken, username: r.username, gender: r.gender, localeCode: r.localeCode),
-      ),
+    return UserEntity(
+      accessToken: res.accessToken,
+      username: res.username,
+      gender: res.gender,
+      localeCode: res.localeCode,
     );
   }
 
   @override
-  Future<Either<UserDataEntity, Exception>> patchGender({required String userId, required Gender gender}) async {
+  Future<UserDataEntity> patchGender({required String userId, required Gender gender}) async {
     final res = await remoteDataSource.pathGender(userId: userId, gender: gender);
-    return res.fold(Left.new, (r) async {
-      final entity = UserDataEntity(gender: r.gender, language: r.language);
-      await localDataSource.saveGender(gender);
-      return Right(entity);
-    });
+    await localDataSource.saveGender(gender);
+    return UserDataEntity(gender: res.gender, language: res.language);
   }
 
   @override
-  Future<Either<UserDataEntity, Exception>> patchLocaleCode({
-    required String userId,
-    required String localeCode,
-  }) async {
+  Future<UserDataEntity> patchLocaleCode({required String userId, required String localeCode}) async {
     final res = await remoteDataSource.pathLocaleCode(userId: userId, localeCode: localeCode);
-    return res.fold(Left.new, (r) async {
-      final entity = UserDataEntity(gender: r.gender, language: r.language);
-      await localDataSource.saveLocaleCode(localeCode);
-      return Right(entity);
-    });
+    await localDataSource.saveLocaleCode(localeCode);
+    return UserDataEntity(gender: res.gender, language: res.language);
   }
 
   @override
   Future<void> deleteAccount() async {
-    try {
-      await remoteDataSource.deleteAccountRemote();
-      await localDataSource.deleteAccountLocal();
-    } on Exception catch (e, s) {
-      MqCrashlytics.report(e, s);
-      log('Delete Account error: $e\n$s');
-    }
+    await remoteDataSource.deleteAccountRemote();
+    await localDataSource.deleteAccountLocal();
   }
 
   @override
   Future<void> logout() async {
-    try {
-      await remoteDataSource.logoutRemote();
-      await localDataSource.logoutLocal();
-    } on Exception catch (e, s) {
-      MqCrashlytics.report(e, s);
-      log('logout error: $e\n$s');
-    }
+    await remoteDataSource.logoutRemote();
+    await localDataSource.logoutLocal();
   }
 }