Skip to content

Fix validatorRef null check issue on singin page of Boilerplate (#9667) #9665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msynk merged 3 commits into from
Jan 13, 2025
Merged

Fix validatorRef null check issue on singin page of Boilerplate (#9667) #9665

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
300cb3a
fix validatorRef null check issue on singin page of Boilerplate #9667
msynk Jan 13, 2025
de18647
remove redundant null check
msynk Jan 13, 2025
8322266
fix other null check issues
msynk Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ...e/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!;


Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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)));
}
}
Expand Down