Merge pull request #37 from NODO-UH/develop

Release v1.2.0
NODO-UH · Apr 27, 2021 · 302f41b · 302f41b
2 parents 70571ba + bd9c605
commit 302f41b
Show file tree

Hide file tree

Showing 13 changed files with 476 additions and 158 deletions.
diff --git a/lib/src/data/api/api.dart b/lib/src/data/api/api.dart
@@ -119,16 +119,17 @@ class GestionApi {
     );
   }
 
-  Future<SecurityQuestions> getUserSecurityQuestions(String ci) async {
+  Future<SecurityQuestions> getUserSecurityQuestions(
+      String ci, String email) async {
     if (Constants.testMode) {
       return SecurityQuestions(
         questions: SampleData.userSecurityQuestions,
       );
     }
 
-    final UserCi user = UserCi(ci: ci);
+    final UserCi user = UserCi(ci: ci, email: email);
 
-    final params = {'ci': user.ci};
+    final params = user.toJson();
 
     return apiRequest<SecurityQuestions, UserCi>(
       Constants.userSecurityQuestionsUrl,

diff --git a/lib/src/data/models/password_reset_data.dart b/lib/src/data/models/password_reset_data.dart
@@ -1,6 +1,5 @@
-import 'package:json_annotation/json_annotation.dart';
-
 import 'package:gestionuh/src/data/models/base_model.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'password_reset_data.g.dart';
 
@@ -10,8 +9,15 @@ class PasswordResetData extends BaseModel {
   String? ci;
   String? newPassword;
   List<String>? questions;
+  String? email;
 
-  PasswordResetData({this.answers, this.ci, this.newPassword, this.questions});
+  PasswordResetData({
+    this.answers,
+    this.ci,
+    this.newPassword,
+    this.questions,
+    this.email,
+  });
 
   static PasswordResetData fromJson(Map<String, dynamic> json) =>
       _$PasswordResetDataFromJson(json);

diff --git a/lib/src/data/models/password_reset_data.g.dart b/lib/src/data/models/password_reset_data.g.dart
diff --git a/lib/src/data/models/user_ci.dart b/lib/src/data/models/user_ci.dart
@@ -1,14 +1,14 @@
-import 'package:json_annotation/json_annotation.dart';
-
 import 'package:gestionuh/src/data/models/base_model.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'user_ci.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class UserCi extends BaseModel {
   String? ci;
+  String? email;
 
-  UserCi({this.ci});
+  UserCi({this.ci, this.email});
 
   static UserCi fromJson(Map<String, dynamic> json) => _$UserCiFromJson(json);
 

diff --git a/lib/src/data/models/user_ci.g.dart b/lib/src/data/models/user_ci.g.dart
diff --git a/lib/src/data/repositories/recover_password_repository.dart b/lib/src/data/repositories/recover_password_repository.dart
@@ -8,9 +8,10 @@ class RecoverPasswordRepository {
 
   RecoverPasswordRepository({required this.api});
 
-  Future<SecurityQuestions?> getUserSecurityQuestions(String ci) async {
+  Future<SecurityQuestions?> getUserSecurityQuestions(
+      String ci, String email) async {
     try {
-      final result = await api.getUserSecurityQuestions(ci);
+      final result = await api.getUserSecurityQuestions(ci, email);
       if (result.error != null) {
         log(result.error!);
       }

diff --git a/lib/src/presentation/blocs/recover_password_bloc/recover_password_bloc.dart b/lib/src/presentation/blocs/recover_password_bloc/recover_password_bloc.dart
@@ -16,7 +16,10 @@ class RecoverPasswordBloc
   final RecoverPasswordRepository recoverPasswordRepository;
 
   RecoverPasswordBloc({required this.recoverPasswordRepository})
-      : super(RecoverPasswordState.initial(TextEditingController()));
+      : super(RecoverPasswordState.initial(
+          TextEditingController(),
+          TextEditingController(),
+        ));
 
   @override
   Stream<RecoverPasswordState> mapEventToState(
@@ -28,20 +31,25 @@ class RecoverPasswordBloc
     );
   }
 
-  Stream<RecoverPasswordState> handleCISubmit(TextEditingController ci) async* {
-    yield RecoverPasswordState.ciLoading(ci);
+  Stream<RecoverPasswordState> handleCISubmit(
+    TextEditingController ci,
+    TextEditingController email,
+  ) async* {
+    yield RecoverPasswordState.ciLoading(ci, email);
     final result = await recoverPasswordRepository.getUserSecurityQuestions(
       ci.text.trim(),
+      email.text.trim(),
     );
     if (result == null) {
-      yield RecoverPasswordState.ciError(ci, Errors.DefaultError);
+      yield RecoverPasswordState.ciError(ci, email, Errors.DefaultError);
     } else if (result.error != null) {
-      yield RecoverPasswordState.ciError(ci, result.error!);
+      yield RecoverPasswordState.ciError(ci, email, result.error!);
     } else if (result.questions == null) {
-      yield RecoverPasswordState.ciError(ci, Errors.DefaultError);
+      yield RecoverPasswordState.ciError(ci, email, Errors.DefaultError);
     } else {
       yield RecoverPasswordState.questions(
         ci.text.trim(),
+        email.text.trim(),
         result.questions!,
         result.questions!.map((_) => TextEditingController()).toList(),
         TextEditingController(),
@@ -51,12 +59,14 @@ class RecoverPasswordBloc
 
   Stream<RecoverPasswordState> handleFinalSubmit(
     String ci,
+    String email,
     List<String> questions,
     List<TextEditingController> answers,
     TextEditingController password,
   ) async* {
     yield RecoverPasswordState.questionsLoading(
       ci,
+      email,
       questions,
       answers,
       password,
@@ -67,11 +77,13 @@ class RecoverPasswordBloc
         questions: questions,
         answers: answers.map((e) => e.text.trim()).toList(),
         newPassword: password.text.trim(),
+        email: email,
       ),
     );
     if (result == null) {
       yield RecoverPasswordState.questionsError(
         ci,
+        email,
         questions,
         answers,
         password,
@@ -80,6 +92,7 @@ class RecoverPasswordBloc
     } else if (result.error != null) {
       yield RecoverPasswordState.questionsError(
         ci,
+        email,
         questions,
         answers,
         password,
@@ -88,6 +101,7 @@ class RecoverPasswordBloc
     } else if (result.userId == null) {
       yield RecoverPasswordState.questionsError(
         ci,
+        email,
         questions,
         answers,
         password,