Merge pull request #268 from bounswe/app-263/connectpasstoBEapi

Password reset is connected.

Author: simarahmtkhy

Diff for: app/mobile/lib/main.dart

@@ -16,6 +16,7 @@ void main() async{
   await ApiService.init();
 
   runApp(MaterialApp(
+    debugShowCheckedModeBanner: false,
     theme: ThemeData(
       primaryColor: navy,
       scaffoldBackgroundColor: lightBlue,

Diff for: app/mobile/lib/services/passwordResetVerification.dart

@@ -4,7 +4,7 @@ import 'package:mobile_app/services/apiService.dart';
 
 class PasswordResetVerification {
 
-  Future<Response> submitPass(int OTP, String id, String password) async {
+  Future<Response> submitPass(int OTP, String email, String password) async {
     const String resetPasswordEndpoint =
         '/auth/reset-password';
 
@@ -14,7 +14,7 @@ class PasswordResetVerification {
       final Response response = await ApiService.dio.post(
         resetPasswordEndpoint,
         data: {'resetPasswordToken': OTP,
-          'id': id,
+          'email': email,
           'password': password,},
       );
 

Diff for: app/mobile/lib/view/forgetPassword/forgetPassInitScreen.dart

@@ -52,12 +52,12 @@ class _ForgetPassInitScreenState extends State<ForgetPassInitScreen> {
 
       if (response.statusCode == 201) {
         if (!context.mounted) return;
-        Navigator.pushNamed(context, '/fpassverify');
+        Navigator.pushNamed(context, '/fpassverify', arguments:email);
       }
 
       else {
         if (!context.mounted) return;
-        Navigator.pushNamed(context, '/fpassverify');
+        Navigator.pushNamed(context, '/fpassverify', arguments:"");
       }
     }
     catch (e) {

Diff for: app/mobile/lib/view/forgetPassword/forgetPassVerifyScreen.dart

@@ -17,27 +17,24 @@ class ForgetPassVerifyScreen extends StatefulWidget {
 class _ForgetPassVerifyScreenState extends State<ForgetPassVerifyScreen> {
 
   bool emptyPassword = false;
-  bool emptyUsername = false;
   bool emptyOTP = false;
 
   bool isPasswordValid = true;
   bool isOTPNumeric = true;
   bool isOTPCorrectLength = true;
   bool arePasswordsMatch = true;
-  bool isUsernameValid = true;
+  bool emptyMail = false;
 
 
   final TextEditingController passwordController = TextEditingController();
   final TextEditingController OTPController = TextEditingController();
-  final TextEditingController usernameController = TextEditingController();
   final TextEditingController confirmPasswordController = TextEditingController();
-
+  String email = "";
 
   // Add more validation logic for password as needed
   void validatePassword(String password) {
     setState(() {
       emptyPassword = false;
-      emptyUsername = false;
       emptyOTP = false;
 
       if(password.isEmpty){
@@ -77,24 +74,10 @@ class _ForgetPassVerifyScreenState extends State<ForgetPassVerifyScreen> {
     });
   }
 
-  void validateUsername(String username){
-    setState(() {
-      emptyPassword = false;
-      emptyOTP = false;
-      emptyUsername = false;
-      if (username.isEmpty) {
-        isUsernameValid = true;
-      } else {
-        isUsernameValid = username.length >=
-            6; // For example, username should be at least 6 characters
-      }
-    });
-  }
 
   void validateOTP(String OTP){
     setState(() {
       emptyPassword = false;
-      emptyUsername = false;
       emptyOTP = false;
 
       RegExp numericPattern = RegExp(r'^-?[0-9]+$'); //check if the string is numeric or not
@@ -130,7 +113,6 @@ class _ForgetPassVerifyScreenState extends State<ForgetPassVerifyScreen> {
 
   void resetPass() async {
     String password = passwordController.text;
-    String username = usernameController.text;
     String confirmPassword = confirmPasswordController.text;
     String OTP = OTPController.text;
 
@@ -139,25 +121,25 @@ class _ForgetPassVerifyScreenState extends State<ForgetPassVerifyScreen> {
         emptyPassword = true;
       });
     }
-    if (username.isEmpty) {
+    if(email.isEmpty){
       setState(() {
-        emptyUsername = true;
+        emptyMail = true;
       });
     }
     if (OTP.isEmpty) {
       setState(() {
         emptyOTP = true;
       });
     }
-    if (emptyPassword || emptyUsername || emptyOTP) {
+    if (emptyPassword || emptyMail || emptyOTP) {
       return;
     }
     // Perform code verification and navigate to the next screen if successful
     PasswordResetVerification passwordResetVerification = PasswordResetVerification();
 
     try {
 
-      Response response = await passwordResetVerification.submitPass(int.parse(OTP) , username, password);
+      Response response = await passwordResetVerification.submitPass(int.parse(OTP) , email, password);
       if(response.statusCode == 201) {
 
         if(!context.mounted) return;
@@ -193,6 +175,8 @@ class _ForgetPassVerifyScreenState extends State<ForgetPassVerifyScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final data = ModalRoute.of(context)!.settings.arguments as String;
+    email = data;
 
     return Scaffold(
       resizeToAvoidBottomInset: true,
@@ -219,13 +203,6 @@ class _ForgetPassVerifyScreenState extends State<ForgetPassVerifyScreen> {
                 errorText: errorTextOTP(),
               ),
               const SizedBox(height: 10.0),
-              CustomTextField(
-                labelText: 'Username',
-                controller: usernameController,
-                onChanged: validateUsername,
-                errorText: isUsernameValid ? "" : 'Enter a valid username!',
-              ),
-              const SizedBox(height: 10.0),
               CustomTextField(
                 labelText: 'New Password',
                 controller: passwordController,
@@ -249,12 +226,6 @@ class _ForgetPassVerifyScreenState extends State<ForgetPassVerifyScreen> {
                 padding: const EdgeInsets.all(10),
                 child: Column(
                   children: [
-                    Text(
-                      emptyUsername ? 'Username cannot be empty' : '',
-                      style: TextStyle(
-                        color: Colors.red[900],
-                      ),
-                    ),
                     Text(
                       emptyPassword ? 'Password cannot be empty' : '',
                       style: TextStyle(