DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-12 13:28:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Robert 2023-09-20 22:58:15 +02:00
commit 94a1939c69
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepViewModel.cs
View File

@ -1,8 +1,8 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Reactive;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
@ -24,7 +24,7 @@ public class ValidateEmailStepViewModel : SubmissionViewModel
{
_authenticationService = authenticationService;
Continue = ReactiveCommand.Create(ExecuteContinue);
Continue = ReactiveCommand.Create(() =>{}, Observable.Never<bool>());
Refresh = ReactiveCommand.CreateFromTask(ExecuteRefresh);
Resend = ReactiveCommand.Create(() => Utilities.OpenUrl(WorkshopConstants.AUTHORITY_URL + "/account/confirm/resend"));
@ -55,7 +55,7 @@ public class ValidateEmailStepViewModel : SubmissionViewModel
// Use the refresh token to login again, updating claims
await _authenticationService.AutoLogin(true);
if (_authenticationService.GetIsEmailVerified())
ExecuteContinue();
State.ChangeScreen<EntryTypeStepViewModel>();
}
catch (Exception)
{
@ -63,11 +63,6 @@ public class ValidateEmailStepViewModel : SubmissionViewModel
}
}
private void ExecuteContinue()
{
State.ChangeScreen<EntryTypeStepViewModel>();
}
private async Task ExecuteRefresh(CancellationToken ct)
{
await Update();