fix(templates): resolve validatorRef null check issue on singin page …

…of Boilerplate #9664 (#9665)
bitfoundation · Jan 13, 2025 · 416d853 · 416d853
1 parent 8d6a51c
commit 416d853
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...e/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs b/...e/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs
@@ -36,7 +36,7 @@ public partial class SignInPage : IDisposable
     private bool requiresTwoFactor;
     private SignInPanelTab currentSignInPanelTab;
     private readonly SignInRequestDto model = new();
-    private AppDataAnnotationsValidator validatorRef = default!;
+    private AppDataAnnotationsValidator? validatorRef;
     private Action unsubscribeIdentityHeaderBackLinkClicked = default!;
 
 
@@ -122,7 +122,7 @@ private async Task DoSignIn()
 
             CleanModel();
 
-            if (validatorRef.EditContext.Validate() is false) return;
+            if (validatorRef?.EditContext.Validate() is false) return;
 
             model.DeviceInfo = telemetryContext.Platform;
 
@@ -212,12 +212,15 @@ private void CleanModel()
         if (currentSignInPanelTab is SignInPanelTab.Email)
         {
             model.PhoneNumber = null;
+            if (validatorRef is null) return;
+
             validatorRef.EditContext.NotifyFieldChanged(validatorRef.EditContext.Field(nameof(SignInRequestDto.PhoneNumber)));
         }
-
-        if (currentSignInPanelTab is SignInPanelTab.Phone)
+        else
         {
             model.Email = null;
+            if (validatorRef is null) return;
+
             validatorRef.EditContext.NotifyFieldChanged(validatorRef.EditContext.Field(nameof(SignInRequestDto.Email)));
         }
     }