Revert "u"

This reverts commit d2cd305581.
2025-09-28 10:23:13 +03:30
parent d2cd305581
commit bba9ba38e5
4 changed files with 152 additions and 269 deletions
--- a/src/FrontOffice.Main/Pages/Auth/Verify.razor.cs
+++ b/src/FrontOffice.Main/Pages/Auth/Verify.razor.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Blazored.LocalStorage;
+using Blazored.LocalStorage;
 using FrontOffice.BFF.User.Protobuf.Protos.User;
 using FrontOffice.BFF.User.Protobuf.Validator;
 using FrontOffice.Main.Utilities;
@@ -22,17 +18,17 @@ public partial class Verify : IDisposable
    private const string RedirectStorageKey = "auth:redirect";
    private const string TokenStorageKey = "auth:token";

-    private readonly VerifyOtpTokenRequestValidator _requestValidator = new();
-    private readonly VerifyOtpTokenRequest _request = new();
-
+    private VerifyOtpTokenRequestValidator _requestValidator = new();
+    private VerifyOtpTokenRequest _request = new();
    private MudForm? _form;
+
    private bool _isBusy;
    private string? _phoneNumber;
    private string? _redirect;
    private string? _errorMessage;
    private string? _infoMessage;
    private Timer? _resendTimer;
-    private int _resendSeconds;
+    private int _resendRemaining;
    private int _attemptsLeft = MaxVerificationAttempts;
    private CancellationTokenSource? _operationCts;

@@ -79,7 +75,7 @@ public partial class Verify : IDisposable
            }
        }

-        ResetResendCountdown();
+        StartResendCountdown();
    }

    private async Task VerifyOtpAsync()
@@ -88,19 +84,15 @@ public partial class Verify : IDisposable
        _infoMessage = null;

        if (_form is null)
-        {
-            return;
-        }
+            return;        

        await _form.Validate();
        if (!_form.IsValid)
-        {
            return;
-        }

        if (IsVerificationLocked)
        {
-            _errorMessage = "تعداد تلاش‌های مجاز شما به پایان رسیده است. لطفاً رمز جدید دریافت کنید.";
+            _errorMessage = "تعداد تلاش‌های مجاز به پایان رسیده است. لطفاً رمز جدید دریافت کنید.";
            return;
        }

@@ -125,9 +117,15 @@ public partial class Verify : IDisposable
            }

            var metadata = await BuildAuthMetadataAsync();
-            var response = metadata is not null
-                ? await UserClient.VerifyOtpTokenAsync(_request, metadata, cancellationToken: cancellationToken)
-                : await UserClient.VerifyOtpTokenAsync(_request, cancellationToken: cancellationToken);
+            VerifyOtpTokenResponse response;
+            if (metadata is not null)
+            {
+                response = await UserClient.VerifyOtpTokenAsync(_request, metadata, cancellationToken: cancellationToken);
+            }
+            else
+            {
+                response = await UserClient.VerifyOtpTokenAsync(_request, cancellationToken: cancellationToken);
+            }

            if (response is null)
            {
@@ -135,21 +133,36 @@ public partial class Verify : IDisposable
                return;
            }

-            ApplyVerificationState(response);
-
            if (response.Success)
            {
-                await PersistTokenAsync(response.Token);
+                if (!string.IsNullOrWhiteSpace(response.Token))
+                {
+                    await LocalStorage.SetItemAsync(TokenStorageKey, response.Token);
+                }
+                else
+                {
+                    await LocalStorage.RemoveItemAsync(TokenStorageKey);
+                }
+
                await LocalStorage.RemoveItemAsync(PhoneStorageKey);
                await LocalStorage.RemoveItemAsync(RedirectStorageKey);

+                _attemptsLeft = MaxVerificationAttempts;
+                _request.Code = string.Empty;
+
                var target = !string.IsNullOrWhiteSpace(_redirect) ? _redirect : RouteConstants.Main.MainPage;
-                Navigation.NavigateTo(target ?? RouteConstants.Main.MainPage, forceLoad: true);
+                if (!string.IsNullOrWhiteSpace(target))
+                {
+                    Navigation.NavigateTo(target, forceLoad: true);
+                }
+                return;
            }
+
+            RegisterFailedAttempt(string.IsNullOrWhiteSpace(response.Message) ? "کد نادرست است." : response.Message);
        }
        catch (RpcException rpcEx)
        {
-            await HandleVerifyRpcFailureAsync(rpcEx);
+            await HandleVerificationFailureAsync(rpcEx);
        }
        catch (OperationCanceledException)
        {
@@ -166,58 +179,19 @@ public partial class Verify : IDisposable
        }
    }

-    private void ApplyVerificationState(VerifyOtpTokenResponse response)
-    {
-        if (response.RemainingSeconds > 0)
-        {
-            StartResendCountdown(response.RemainingSeconds);
-        }
-        else
-        {
-            ResetResendCountdown();
-        }
-
-        if (response.RemainingAttempts >= 0)
-        {
-            _attemptsLeft = response.RemainingAttempts;
-        }
-
-        if (response.Success)
-        {
-            _infoMessage = string.IsNullOrWhiteSpace(response.Message)
-                ? "ورود با موفقیت انجام شد."
-                : response.Message;
-        }
-        else
-        {
-            var baseMessage = string.IsNullOrWhiteSpace(response.Message)
-                ? "کد وارد شده صحیح نیست."
-                : response.Message;
-
-            _errorMessage = _attemptsLeft > 0
-                ? $"{baseMessage} {_attemptsLeft} تلاش باقی‌مانده است."
-                : $"{baseMessage} تعداد تلاش‌های مجاز شما پایان یافته است. لطفاً رمز جدید دریافت کنید.";
-        }
-    }
-
-    private async Task HandleVerifyRpcFailureAsync(RpcException rpcEx)
+    private async Task HandleVerificationFailureAsync(RpcException rpcEx)
    {
        switch (rpcEx.Status.StatusCode)
        {
            case StatusCode.PermissionDenied:
            case StatusCode.InvalidArgument:
-                ApplyVerificationState(new VerifyOtpTokenResponse
-                {
-                    Success = false,
-                    Message = string.IsNullOrWhiteSpace(rpcEx.Status.Detail) ? "کد وارد شده صحیح نیست." : rpcEx.Status.Detail,
-                    RemainingAttempts = _attemptsLeft - 1
-                });
+                RegisterFailedAttempt(!string.IsNullOrWhiteSpace(rpcEx.Status.Detail)
+                    ? rpcEx.Status.Detail
+                    : "کد نادرست است.");
                break;
            case StatusCode.Unauthenticated:
                await ResetAuthenticationAsync();
-                _errorMessage = string.IsNullOrWhiteSpace(rpcEx.Status.Detail)
-                    ? "نشست کاربری منقضی شده است. لطفاً دوباره وارد شوید."
-                    : rpcEx.Status.Detail;
+                _errorMessage = "نشست کاربری منقضی شده است. لطفاً دوباره وارد شوید.";
                Navigation.NavigateTo(RouteConstants.Auth.Phone, forceLoad: true);
                break;
            case StatusCode.DeadlineExceeded:
@@ -232,9 +206,23 @@ public partial class Verify : IDisposable
        }
    }

+    private void RegisterFailedAttempt(string baseMessage)
+    {
+        _attemptsLeft = Math.Max(0, _attemptsLeft - 1);
+
+        if (_attemptsLeft > 0)
+        {
+            _errorMessage = $"{baseMessage} {_attemptsLeft} تلاش باقی مانده است.";
+        }
+        else
+        {
+            _errorMessage = $"{baseMessage} تلاش‌های مجاز شما به پایان رسیده است. لطفاً رمز جدید دریافت کنید.";
+        }
+    }
+
    private async Task ResendOtpAsync()
    {
-        if (_resendSeconds > 0 || _isBusy || string.IsNullOrWhiteSpace(_phoneNumber))
+        if (_resendRemaining > 0 || _isBusy || string.IsNullOrWhiteSpace(_phoneNumber))
        {
            return;
        }
@@ -253,28 +241,35 @@ public partial class Verify : IDisposable
            };

            var metadata = await BuildAuthMetadataAsync();
-            var response = metadata is not null
-                ? await UserClient.CreateNewOtpTokenAsync(request, metadata, cancellationToken: cancellationToken)
-                : await UserClient.CreateNewOtpTokenAsync(request, cancellationToken: cancellationToken);
-
-            if (response?.Success != true)
+            CreateNewOtpTokenResponse response;
+            if (metadata is not null)
            {
-                _errorMessage = !string.IsNullOrWhiteSpace(response?.Message)
-                    ? response!.Message
-                    : "ارسال مجدد رمز با خطا مواجه شد.";
+                response = await UserClient.CreateNewOtpTokenAsync(request, metadata, cancellationToken: cancellationToken);
            }
            else
            {
-                _infoMessage = string.IsNullOrWhiteSpace(response.Message)
-                    ? "رمز جدید ارسال شد."
-                    : response.Message;
+                response = await UserClient.CreateNewOtpTokenAsync(request, cancellationToken: cancellationToken);
            }

-            ApplyResendState(response);
+            if (response?.Success != true)
+            {
+                _errorMessage = string.IsNullOrWhiteSpace(response?.Message)
+                    ? "ارسال مجدد رمز پویا با خطا مواجه شد."
+                    : response!.Message;
+                return;
+            }
+
+            _infoMessage = string.IsNullOrWhiteSpace(response.Message)
+                ? "کد جدید ارسال شد."
+                : response.Message;
+
+            _attemptsLeft = MaxVerificationAttempts;
+            _request.Code = string.Empty;
+            StartResendCountdown();
        }
        catch (RpcException rpcEx)
        {
-            await HandleResendRpcFailureAsync(rpcEx);
+            await HandleResendFailureAsync(rpcEx);
        }
        catch (OperationCanceledException)
        {
@@ -291,52 +286,50 @@ public partial class Verify : IDisposable
        }
    }

-    private async Task HandleResendRpcFailureAsync(RpcException rpcEx)
+    private async Task HandleResendFailureAsync(RpcException rpcEx)
    {
        switch (rpcEx.Status.StatusCode)
        {
            case StatusCode.Unauthenticated:
                await ResetAuthenticationAsync();
-                _errorMessage = string.IsNullOrWhiteSpace(rpcEx.Status.Detail)
-                    ? "نشست کاربری منقضی شده است. لطفاً دوباره وارد شوید."
-                    : rpcEx.Status.Detail;
+                _errorMessage = "نشست کاربری منقضی شده است. لطفاً دوباره وارد شوید.";
                Navigation.NavigateTo(RouteConstants.Auth.Phone, forceLoad: true);
                break;
            default:
                _errorMessage = !string.IsNullOrWhiteSpace(rpcEx.Status.Detail)
                    ? rpcEx.Status.Detail
-                    : "ارسال مجدد رمز با خطا مواجه شد.";
+                    : "ارسال مجدد رمز پویا با خطا مواجه شد.";
                break;
        }
    }

-    private void ApplyResendState(CreateNewOtpTokenResponse? response)
+    private async Task ChangePhoneAsync()
    {
-        if (response?.RemainingAttempts >= 0)
-        {
-            _attemptsLeft = response.RemainingAttempts;
-        }
-
-        if (response?.RemainingSeconds > 0)
-        {
-            StartResendCountdown(response.RemainingSeconds);
-        }
-        else
-        {
-            StartResendCountdown(DefaultResendCooldown);
-        }
+        await LocalStorage.RemoveItemAsync(PhoneStorageKey);
+        NavigateBackToPhone();
    }

-    private void StartResendCountdown(int seconds)
+    private void NavigateBackToPhone()
    {
-        _resendSeconds = seconds;
+        var target = RouteConstants.Auth.Phone;
+        if (!string.IsNullOrWhiteSpace(_redirect))
+        {
+            target += "?redirect=" + Uri.EscapeDataString(_redirect);
+        }
+
+        Navigation.NavigateTo(target, forceLoad: false);
+    }
+
+    private void StartResendCountdown(int seconds = DefaultResendCooldown)
+    {
+        _resendRemaining = seconds;
        _resendTimer?.Dispose();
        _resendTimer = new Timer(_ =>
        {
-            var remaining = Interlocked.Decrement(ref _resendSeconds);
+            var remaining = Interlocked.Add(ref _resendRemaining, -1);
            if (remaining <= 0)
            {
-                Interlocked.Exchange(ref _resendSeconds, 0);
+                Interlocked.Exchange(ref _resendRemaining, 0);
                _resendTimer?.Dispose();
                _resendTimer = null;
            }
@@ -345,13 +338,6 @@ public partial class Verify : IDisposable
        }, null, 1000, 1000);
    }

-    private void ResetResendCountdown()
-    {
-        _resendTimer?.Dispose();
-        _resendTimer = null;
-        _resendSeconds = 0;
-    }
-
    private async Task<Metadata?> BuildAuthMetadataAsync()
    {
        var token = await LocalStorage.GetItemAsync<string>(TokenStorageKey);
@@ -366,24 +352,6 @@ public partial class Verify : IDisposable
        };
    }

-    private async Task PersistTokenAsync(string? token)
-    {
-        if (!string.IsNullOrWhiteSpace(token))
-        {
-            await LocalStorage.SetItemAsync(TokenStorageKey, token);
-        }
-        else
-        {
-            await LocalStorage.RemoveItemAsync(TokenStorageKey);
-        }
-    }
-
-    private async Task ChangePhoneAsync()
-    {
-        await LocalStorage.RemoveItemAsync(PhoneStorageKey);
-        NavigateBackToPhone();
-    }
-
    private async Task ResetAuthenticationAsync()
    {
        await LocalStorage.RemoveItemAsync(TokenStorageKey);
@@ -391,17 +359,6 @@ public partial class Verify : IDisposable
        await LocalStorage.RemoveItemAsync(RedirectStorageKey);
    }

-    private void NavigateBackToPhone()
-    {
-        var target = RouteConstants.Auth.Phone;
-        if (!string.IsNullOrWhiteSpace(_redirect))
-        {
-            target += "?redirect=" + Uri.EscapeDataString(_redirect);
-        }
-
-        Navigation.NavigateTo(target, forceLoad: false);
-    }
-
    private CancellationToken PrepareOperationToken()
    {
        _operationCts?.Cancel();
@@ -420,6 +377,9 @@ public partial class Verify : IDisposable
    {
        _operationCts?.Cancel();
        _operationCts?.Dispose();
+        _operationCts = null;
+
        _resendTimer?.Dispose();
+        _resendTimer = null;
    }
 }