forgot password screns logic fixed

This commit is contained in:
amirrezaghabeli
2025-09-22 14:25:59 +03:30
parent a9450a60d7
commit e85ac8d649
13 changed files with 209 additions and 133 deletions
+61 -19
View File
@@ -1,5 +1,3 @@
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:tm_app/data/services/model/customer/customer.dart';
import 'package:tm_app/data/services/model/forgot_password_response/forgot_password_response_model.dart';
@@ -49,13 +47,16 @@ class AuthViewModel with ChangeNotifier {
bool _isResetPasswordLoading = false;
String? _errorMessage;
String? _resetPasswordErrorMessage;
bool _resetPasswordSuccess = false;
Customer? _loggedInUser;
String? successMessage;
String? _successMessageOtp;
String? _forgotPasswordMessage;
bool _isLoadingForgot = false;
bool _isLoadingOtp = false;
String? _errorMessageForget;
String? _errorMessageOtp;
bool _verifyOtpSuccess = false;
bool get isLoading => _isLoading;
bool get isLoadingForgot => _isLoadingForgot;
@@ -65,10 +66,12 @@ class AuthViewModel with ChangeNotifier {
String? get errorMessageForget => _errorMessageForget;
String? get resetPasswordErrorMessage => _resetPasswordErrorMessage;
String? get errorMessageOtp => _errorMessageOtp;
String? get successMessageOtp => _successMessageOtp;
bool get verifyOtpSuccess => _verifyOtpSuccess;
Customer? get loggedInUser => _loggedInUser;
String? get forgotPasswordMessage => _forgotPasswordMessage;
String? resetToken;
bool get resetPasswordSuccess => _resetPasswordSuccess;
void togglePasswordVisibility() {
_obscurePassword = !_obscurePassword;
@@ -88,7 +91,7 @@ class AuthViewModel with ChangeNotifier {
bool get isOtpValid {
final otp = otpController.text.trim();
return otp.length == 5;
return otp.length == 6;
}
bool get canSubmitOtpPage {
@@ -182,8 +185,8 @@ class AuthViewModel with ChangeNotifier {
case Ok<ForgotPasswordResponseModel>():
_isLoadingForgot = false;
successMessage = result.value.message;
notifyListeners();
log('$successMessage');
break;
@@ -208,6 +211,7 @@ class AuthViewModel with ChangeNotifier {
Future<void> verifyOtp(BuildContext context) async {
_isLoadingOtp = true;
_errorMessageOtp = null;
_verifyOtpSuccess = false;
notifyListeners();
final result = await _authRepository.verifyOtp(
@@ -219,39 +223,77 @@ class AuthViewModel with ChangeNotifier {
case Ok<VerifyOtpResponseModel>():
_isLoadingOtp = false;
resetToken = result.value.data.token;
_successMessageOtp = result.value.message;
_verifyOtpSuccess = true;
notifyListeners();
break;
case Error<VerifyOtpResponseModel>():
_isLoadingOtp = false;
_errorMessageOtp = result.error.toString();
_verifyOtpSuccess = false;
notifyListeners();
break;
}
notifyListeners();
_errorMessageOtp = null;
_successMessageOtp = null;
notifyListeners();
}
void clearOtpFlow() {
_errorMessageOtp = null;
_successMessageOtp = null;
_isLoadingOtp = false;
_verifyOtpSuccess = false;
// Intentionally do not clear resetToken
otpController.clear();
notifyListeners();
}
Future<void> resetPassword() async {
_isResetPasswordLoading = true;
_resetPasswordErrorMessage = null;
_resetPasswordSuccess = false;
notifyListeners();
final result = await _authRepository.resetPassword(
newPassword: newPasswordController.text.trim(),
token: '',
);
switch (result) {
case Ok<ResetPasswordResponse>():
break;
case Error<ResetPasswordResponse>():
_resetPasswordErrorMessage = result.error.toString();
break;
if (resetToken != null) {
final result = await _authRepository.resetPassword(
newPassword: newPasswordController.text.trim(),
token: resetToken!,
);
switch (result) {
case Ok<ResetPasswordResponse>():
_resetPasswordSuccess = true;
break;
case Error<ResetPasswordResponse>():
_resetPasswordErrorMessage = result.error.toString();
_resetPasswordSuccess = false;
break;
}
_isResetPasswordLoading = false;
notifyListeners();
_resetPasswordErrorMessage = null;
notifyListeners();
} else {
_resetPasswordErrorMessage = 'Reset token is required';
_isResetPasswordLoading = false;
notifyListeners();
}
_isResetPasswordLoading = false;
}
void clearResetPasswordSuccess() {
_resetPasswordSuccess = false;
notifyListeners();
}
void clearResetFlow() {
_resetPasswordErrorMessage = null;
_resetPasswordSuccess = false;
_isResetPasswordLoading = false;
// Intentionally do not clear resetToken
newPasswordController.clear();
notifyListeners();
}