mirror of
https://github.com/Artemis-RGB/Artemis
synced 2025-12-13 05:48:35 +00:00
Workshop - Disable continue button in email validation step
This commit is contained in:
parent
fbf908c032
commit
68eae085e4
@ -1,8 +1,8 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
|
||||||
using System.Reactive;
|
using System.Reactive;
|
||||||
using System.Reactive.Disposables;
|
using System.Reactive.Disposables;
|
||||||
|
using System.Reactive.Linq;
|
||||||
using System.Security.Claims;
|
using System.Security.Claims;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@ -24,7 +24,7 @@ public class ValidateEmailStepViewModel : SubmissionViewModel
|
|||||||
{
|
{
|
||||||
_authenticationService = authenticationService;
|
_authenticationService = authenticationService;
|
||||||
|
|
||||||
Continue = ReactiveCommand.Create(ExecuteContinue);
|
Continue = ReactiveCommand.Create(() =>{}, Observable.Never<bool>());
|
||||||
Refresh = ReactiveCommand.CreateFromTask(ExecuteRefresh);
|
Refresh = ReactiveCommand.CreateFromTask(ExecuteRefresh);
|
||||||
Resend = ReactiveCommand.Create(() => Utilities.OpenUrl(WorkshopConstants.AUTHORITY_URL + "/account/confirm/resend"));
|
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
|
// Use the refresh token to login again, updating claims
|
||||||
await _authenticationService.AutoLogin(true);
|
await _authenticationService.AutoLogin(true);
|
||||||
if (_authenticationService.GetIsEmailVerified())
|
if (_authenticationService.GetIsEmailVerified())
|
||||||
ExecuteContinue();
|
State.ChangeScreen<EntryTypeStepViewModel>();
|
||||||
}
|
}
|
||||||
catch (Exception)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
@ -63,11 +63,6 @@ public class ValidateEmailStepViewModel : SubmissionViewModel
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ExecuteContinue()
|
|
||||||
{
|
|
||||||
State.ChangeScreen<EntryTypeStepViewModel>();
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task ExecuteRefresh(CancellationToken ct)
|
private async Task ExecuteRefresh(CancellationToken ct)
|
||||||
{
|
{
|
||||||
await Update();
|
await Update();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user