Workshop - Fixed email not being detected as verified

Settings - Fixed new releases not loading when there are more than 20
This commit is contained in:
Robert committed 2023-09-20 22:55:37 +02:00
1 parent 3394786d31
commit fbf908c032
8 files changed
+24 -23

No files matched your search

@@ -33,8 +33,7 @@ public class LoginStepViewModel : SubmissionViewModel
if (result != ContentDialogResult.Primary)
return;
Claim? emailVerified = _authenticationService.Claims.FirstOrDefault(c => c.Type == JwtClaimTypes.EmailVerified);
if (emailVerified?.Value == "true")
if (_authenticationService.GetIsEmailVerified())
State.ChangeScreen<EntryTypeStepViewModel>();
else
State.ChangeScreen<ValidateEmailStepViewModel>();
@@ -1,4 +1,5 @@
using System;
using System.Linq;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Threading;
@@ -138,7 +139,7 @@ public class UploadStepViewModel : SubmissionViewModel
long? entryId = result.Data?.AddEntry?.Id;
if (result.IsErrorResult() || entryId == null)
{
await _windowService.ShowConfirmContentDialog("Failed to create workshop entry", result.Errors.ToString() ?? "Not even an error message", "Close", null);
await _windowService.ShowConfirmContentDialog("Failed to create workshop entry", string.Join("\r\n", result.Errors.Select(e => e.Message)), "Close", null);
State.ChangeScreen<SubmitStepViewModel>();
return null;
}
@@ -54,9 +54,7 @@ public class ValidateEmailStepViewModel : SubmissionViewModel
{
// Use the refresh token to login again, updating claims
await _authenticationService.AutoLogin(true);
Claim? emailVerified = _authenticationService.Claims.FirstOrDefault(c => c.Type == JwtClaimTypes.EmailVerified);
if (emailVerified?.Value == "true")
if (_authenticationService.GetIsEmailVerified())
ExecuteContinue();
}
catch (Exception)
@@ -29,7 +29,7 @@ public class WelcomeStepViewModel : SubmissionViewModel
}
else
{
if (_authenticationService.Claims.Any(c => c.Type == JwtClaimTypes.EmailVerified && c.Value == "true"))
if (_authenticationService.GetIsEmailVerified())
State.ChangeScreen<EntryTypeStepViewModel>();
else
State.ChangeScreen<ValidateEmailStepViewModel>();