DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +00:00
Code Issues Releases Wiki Activity

Workshop list progress

Browse Source
This commit is contained in:
Robert committed 2023-07-14 23:05:44 +02:00
1 parent 2a3fd30313
commit 07d4539add
18 files changed
+258 -145
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml
+3 -3
View File
@@ -9,9 +9,9 @@
x:Class="Artemis.UI.Screens.Workshop.CurrentUser.CurrentUserView"
x:DataType="currentUser:CurrentUserViewModel">
<Panel>
<Panel IsVisible="{CompiledBinding !Loading}">
<!-- Signed out -->
<Ellipse Height="28" Width="28" IsVisible="{CompiledBinding !IsLoggedIn}">
<Ellipse Height="28" Width="28" IsVisible="{CompiledBinding Name, Converter={x:Static StringConverters.IsNullOrEmpty}}">
<Ellipse.ContextFlyout>
<MenuFlyout>
<MenuItem Header="Login" Command="{CompiledBinding Login}">
@@ -27,7 +27,7 @@
</Ellipse>
<!-- Signed in -->
<Ellipse Height="28" Width="28" IsVisible="{CompiledBinding IsLoggedIn}" Name="UserMenu">
<Ellipse Height="28" Width="28" IsVisible="{CompiledBinding Name, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" Name="UserMenu">
<Ellipse.ContextFlyout>
<Flyout>
<Grid ColumnDefinitions="Auto,*" RowDefinitions="*,*,*" MinWidth="300">
src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs
+35 -20
View File
@@ -10,38 +10,33 @@ using Artemis.WebClient.Workshop.Services;
using Avalonia.Media.Imaging;
using Flurl.Http;
using ReactiveUI;
using Serilog;
namespace Artemis.UI.Screens.Workshop.CurrentUser;
public class CurrentUserViewModel : ActivatableViewModelBase
{
private readonly ILogger _logger;
private readonly IAuthenticationService _authenticationService;
private ObservableAsPropertyHelper<bool>? _isLoggedIn;
private string? _userId;
private string? _name;
private string? _email;
private bool _loading = true;
private Bitmap? _avatar;
private string? _email;
private string? _name;
private string? _userId;
public CurrentUserViewModel(IAuthenticationService authenticationService)
public CurrentUserViewModel(ILogger logger, IAuthenticationService authenticationService)
{
_logger = logger;
_authenticationService = authenticationService;
Login = ReactiveCommand.CreateFromTask(ExecuteLogin);
this.WhenActivated(d => _isLoggedIn = _authenticationService.WhenAnyValue(s => s.IsLoggedIn).ToProperty(this, vm => vm.IsLoggedIn).DisposeWith(d));
this.WhenActivated(d =>
{
Task.Run(async () =>
{
await _authenticationService.AutoLogin();
await LoadCurrentUser();
}).DisposeWith(d);
});
this.WhenActivated(d => ReactiveCommand.CreateFromTask(ExecuteAutoLogin).Execute().Subscribe().DisposeWith(d));
}
public void Logout()
public bool Loading
{
_authenticationService.Logout();
get => _loading;
set => RaiseAndSetIfChanged(ref _loading, value);
}
public string? UserId
@@ -69,18 +64,38 @@ public class CurrentUserViewModel : ActivatableViewModelBase
}
public ReactiveCommand<Unit, Unit> Login { get; }
public bool IsLoggedIn => _isLoggedIn?.Value ?? false;
public void Logout()
{
_authenticationService.Logout();
}
private async Task ExecuteLogin(CancellationToken cancellationToken)
{
await _authenticationService.Login();
await LoadCurrentUser();
Console.WriteLine(_authenticationService.Claims);
}
private async Task ExecuteAutoLogin(CancellationToken cancellationToken)
{
try
{
await _authenticationService.AutoLogin();
await LoadCurrentUser();
}
catch (Exception e)
{
_logger.Warning(e, "Failed to load the current user");
}
finally
{
Loading = false;
}
}
private async Task LoadCurrentUser()
{
if (!IsLoggedIn)
if (!_authenticationService.IsLoggedIn)
return;
UserId = _authenticationService.Claims.FirstOrDefault(c => c.Type == "sub")?.Value;