Remove synchronous code from AuthComponentBase.

Server/Components/AlertsFrame.razor

@@ -50,13 +50,14 @@
 
     private string FrameClass => _isOpen ? "open" : null;
 
-    protected override Task OnInitializedAsync()
+    protected override async Task OnInitializedAsync()
     {
+        await base.OnInitializedAsync();
+
         if (IsAuthenticated)
         {
             GetAlerts();
         }
-        return base.OnInitializedAsync();
     }
 
     private async Task ClearAlert(Alert alert)

Server/Components/AuthComponentBase.cs

@@ -2,18 +2,26 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Identity;
 using Remotely.Server.Services;
-using Remotely.Shared.Extensions;
 using Remotely.Shared.Models;
+using System.Threading.Tasks;
 
 namespace Remotely.Server.Components
 {
     public class AuthComponentBase : ComponentBase
     {
-        public bool IsAuthenticated => AuthService?.IsAuthenticated ?? false;
+        protected override async Task OnInitializedAsync()
+        {
+            IsAuthenticated = await AuthService.IsAuthenticated();
+            User = await AuthService.GetUser();
+            Username = User?.UserName;
+            await base.OnInitializedAsync();
+        }
 
-        public RemotelyUser User => AuthService?.User;
+        public bool IsAuthenticated { get; private set; }
 
-        public string Username => AuthService?.Principal?.Identity?.Name;
+        public RemotelyUser User { get; private set; }
+
+        public string Username { get; private set; }
 
         [Inject]
         protected IAuthService AuthService { get; set; }

Server/Components/AuthorizedIndex.razor

@@ -29,12 +29,12 @@
 
     protected override async Task OnInitializedAsync()
     {
+        await base.OnInitializedAsync();
 
         if (IsAuthenticated == true && User is null)
         {
             await SignInManager.SignOutAsync();
             NavManager.NavigateTo("/");
         }
-        await base.OnInitializedAsync();
     }
 }

Server/Components/Branding.razor

@@ -8,7 +8,7 @@
 <h3 class="mb-3">Branding</h3>
 
 
-@if (User.IsAdministrator != true)
+@if (User?.IsAdministrator != true)
 {
     <h5 class="text-muted">Only organization administrators can view this page.</h5>
 }
@@ -125,6 +125,7 @@ else
 
     protected override async Task OnInitializedAsync()
     {
+        await base.OnInitializedAsync();
 
         var organization = await DataService.GetOrganizationByUserName(User.UserName);
 

Server/Components/Devices/ChatCard.razor.cs

@@ -39,11 +39,11 @@ protected override void OnAfterRender(bool firstRender)
             JsInterop.ScrollToEnd(_chatMessagesWindow);
             base.OnAfterRender(firstRender);
         }
-        protected override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
+            await base.OnInitializedAsync();
             AppState.PropertyChanged += AppState_PropertyChanged;
             CircuitConnection.MessageReceived += CircuitConnection_MessageReceived;
-            return base.OnInitializedAsync();
         }
 
         private void AppState_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)

Server/Components/Devices/ChatFrame.razor.cs

@@ -27,11 +27,11 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
-        protected override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
+            await base.OnInitializedAsync();
             AppState.PropertyChanged += AppState_PropertyChanged;
             CircuitConnection.MessageReceived += CircuitConnection_MessageReceived;
-            return base.OnInitializedAsync();
         }
 
         private void CircuitConnection_MessageReceived(object sender, Models.CircuitEvent e)

Server/Components/Devices/DeviceCard.razor

@@ -1,7 +1,7 @@
 @attribute [Authorize]
 @inherits AuthComponentBase
 
-<div @ref="_card" class="card border-secondary my-3 mr-3 device-card @Theme @GetCardStateClass(Device)"
+<div @ref="_card" class="card border-secondary my-3 mr-3 device-card @_theme @GetCardStateClass(Device)"
      @onclick="ExpandCard"
      @onclick:stopPropagation="true"
      @oncontextmenu="ContextMenuOpening"

Server/Components/Devices/DeviceCard.razor.cs

@@ -8,6 +8,7 @@
 using Remotely.Server.Hubs;
 using Remotely.Server.Models;
 using Remotely.Server.Services;
+using Remotely.Shared.Enums;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using Remotely.Shared.ViewModels;
@@ -24,6 +25,7 @@ public partial class DeviceCard : AuthComponentBase, IDisposable
     {
         private ElementReference _card;
         private ConcurrentDictionary<string, double> _fileUploadProgressLookup = new();
+        private Theme _theme;
 
         [Parameter]
         public Device Device { get; set; }
@@ -52,7 +54,6 @@ public partial class DeviceCard : AuthComponentBase, IDisposable
 
         [Inject]
         private IJsInterop JsInterop { get; set; }
-        private string Theme => AppState.EffectiveTheme.ToString().ToLower();
 
         [Inject]
         private IToastService ToastService { get; set; }
@@ -63,10 +64,11 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
-        protected override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
+            await base.OnInitializedAsync();
+            _theme = await AppState.GetEffectiveTheme();
             AppState.PropertyChanged += AppState_PropertyChanged;
-            return base.OnInitializedAsync();
         }
 
         private void AppState_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)

Server/Components/Devices/DevicesFrame.razor.cs

@@ -154,8 +154,10 @@ public void Refresh()
             InvokeAsync(StateHasChanged);
         }
 
-        protected override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
+            await base.OnInitializedAsync();
+
             CircuitConnection.MessageReceived += CircuitConnection_MessageReceived;
             AppState.PropertyChanged += AppState_PropertyChanged;
 
@@ -170,8 +172,6 @@ protected override Task OnInitializedAsync()
                 .Where(x => x.CustomAttributes.Any(x => x.AttributeType == typeof(SortableAttribute)));
 
             _sortableProperties.AddRange(sortableProperties);
-
-            return base.OnInitializedAsync();
         }
 
         protected override bool ShouldRender()

Server/Components/Devices/Terminal.razor.cs

@@ -69,11 +69,11 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
-        protected override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
+            await base.OnInitializedAsync();
             CircuitConnection.MessageReceived += CircuitConnection_MessageReceived;
             AppState.PropertyChanged += AppState_PropertyChanged;
-            return base.OnInitializedAsync();
         }
 
         protected override Task OnAfterRenderAsync(bool firstRender)

Server/Components/LoadingSignal.razor

@@ -1,11 +1,21 @@
 @inject IClientAppState AppState
 
 
-@if (AppState.EffectiveTheme == Theme.Dark)
+@if (_theme == Theme.Dark)
 {
     <div class="signal" style="border-color: whitesmoke"></div>
 }
-else if (AppState.EffectiveTheme == Theme.Light)
+else if (_theme == Theme.Light)
 {
     <div class="signal" style="border-color: #333"></div>
 }
+
+@code {
+    private Theme _theme;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await base.OnInitializedAsync();
+        _theme = await AppState.GetEffectiveTheme();
+    }
+}

Server/Components/Scripts/RunScript.razor.cs

@@ -56,16 +56,17 @@ protected override void OnAfterRender(bool firstRender)
             base.OnAfterRender(firstRender);
         }
 
-        protected override void OnInitialized()
+        protected override async Task OnInitializedAsync()
         {
+            await base.OnInitializedAsync();
+
             _deviceGroups = DataService.GetDeviceGroups(User.UserName);
             _devices = DataService
                 .GetDevicesForUser(User.UserName)
-                .OrderBy(x=>x.DeviceName)
+                .OrderBy(x => x.DeviceName)
                 .ToArray();
-
-            base.OnInitialized();
         }
+
         private void DeviceGroupSelectedChanged(ChangeEventArgs args, DeviceGroup deviceGroup)
         {
             var isSelected = (bool)args.Value;

Server/Components/Scripts/ScriptSchedules.razor.cs

@@ -53,14 +53,14 @@ public partial class ScriptSchedules : AuthComponentBase
 
         protected override async Task OnInitializedAsync()
         {
+            await base.OnInitializedAsync();
             _deviceGroups = DataService.GetDeviceGroups(User.UserName);
             _devices = DataService
                 .GetDevicesForUser(User.UserName)
                 .OrderBy(x => x.DeviceName)
                 .ToArray();
 
             await RefreshSchedules();
-            await base.OnInitializedAsync();
         }
 
         private void CreateNew()

Server/Hubs/CircuitConnection.cs

@@ -167,9 +167,9 @@ public override async Task OnCircuitClosedAsync(Circuit circuit, CancellationTok
 
         public override async Task OnCircuitOpenedAsync(Circuit circuit, CancellationToken cancellationToken)
         {
-            if (_authService.IsAuthenticated)
+            if (await _authService.IsAuthenticated())
             {
-                User = _authService.User;
+                User = await _authService.GetUser();
                 ConnectionId = Guid.NewGuid().ToString();
                 _circuitManager.TryAddConnection(ConnectionId, this);
             }

Server/Pages/ApiKeys.razor

@@ -5,7 +5,7 @@
 @inject IDataService DataService
 @inject AuthenticationStateProvider AuthProvider
 @inject IJsInterop JsInterop
-@inject IModalService ModalService 
+@inject IModalService ModalService
 
 
 <h3>API Keys</h3>
@@ -15,22 +15,22 @@
     <AlertBanner Message="@_alertMessage" />
 }
 
-@if (!string.IsNullOrWhiteSpace(_newKeySecret))
+@if (User?.IsAdministrator == true)
 {
-    <h5 class="text-warning font-weight-bold mb-2 mt-4">Warning: The key's secret will only be shown once.  Save it now.</h5>
-    <h5 class="mb-4">
-        <label class="mr-1">Key Secret:</label>
-        <input class="form-control custom-control-inline" readonly value="@_newKeySecret" style="width:400px" />
-    </h5>
-}
+    if (!string.IsNullOrWhiteSpace(_newKeySecret))
+    {
+        <h5 class="text-warning font-weight-bold mb-2 mt-4">Warning: The key's secret will only be shown once.  Save it now.</h5>
+        <h5 class="mb-4">
+            <label class="mr-1">Key Secret:</label>
+            <input class="form-control custom-control-inline" readonly value="@_newKeySecret" style="width:400px" />
+        </h5>
+    }
 
 
-@if (User.IsAdministrator)
-{
     <div class="mb-2 mt-4">
         <label class="mr-1">New Token Name:</label>
         <input @bind="_createKeyName" @bind:event="oninput"
-               class="form-control form-control-sm custom-control-inline mr-1" 
+               class="form-control form-control-sm custom-control-inline mr-1"
                style="width:200px" />
 
         <button class="btn btn-primary" type="button" @onclick="CreateNewKey">Create</button>
@@ -82,8 +82,8 @@ else
 
     protected override async Task OnInitializedAsync()
     {
-        RefreshData();
         await base.OnInitializedAsync();
+        RefreshData();
     }
 
     private async Task CreateNewKey()

Server/Pages/DeviceDetails.razor.cs

@@ -42,16 +42,16 @@ public partial class DeviceDetails : AuthComponentBase
         [Inject]
         private IToastService ToastService { get; set; }
 
-        protected override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
+            await base.OnInitializedAsync();
+
             if (!string.IsNullOrWhiteSpace(DeviceId))
             {
                 Device = DataService.GetDevice(DeviceId);
             }
 
             CircuitConnection.MessageReceived += CircuitConnection_MessageReceived;
-
-            return base.OnInitializedAsync();
         }
 
         private void CircuitConnection_MessageReceived(object sender, Models.CircuitEvent e)

Server/Pages/Downloads.razor

@@ -216,13 +216,15 @@
 
     protected override async Task OnInitializedAsync()
     {
+        await base.OnInitializedAsync();
+
         var authState = await AuthProvider.GetAuthenticationStateAsync();
         _isAuthenticated = authState.User.Identity.IsAuthenticated;
 
         if (_isAuthenticated)
         {
-            var currentUser = await UserManager.GetUserAsync(authState.User);
-            _organizationId = DataService.GetOrganizationById(currentUser.OrganizationID)?.ID;
+            var currentUser = await DataService.GetUserAsync(authState.User.Identity.Name);
+            _organizationId = currentUser.OrganizationID;
         }
         else
         {
@@ -250,6 +252,5 @@
         {
             ClickOnceMiddleware.AppFileLock.Release();
         }
-        await base.OnInitializedAsync();
     }
 }

Server/Pages/ManageOrganization.razor.cs

@@ -52,9 +52,9 @@ public partial class ManageOrganization : AuthComponentBase
 
         protected override async Task OnInitializedAsync()
         {
-            await RefreshData();
-
             await base.OnInitializedAsync();
+
+            await RefreshData();
         }
 
         private void CreateNewDeviceGroup()

Server/Pages/ScriptsPage.razor

@@ -84,8 +84,8 @@
 
     protected override async Task OnInitializedAsync()
     {
-        await RefreshScripts();
         await base.OnInitializedAsync();
+        await RefreshScripts();
     }
 
 

Server/Pages/ServerConfig.razor

@@ -4,7 +4,7 @@
 @inherits AuthComponentBase
 
 
-@if (User.IsServerAdmin)
+@if (User?.IsServerAdmin == true)
 {
     <AlertBanner Message="@_alertMessage" />