fix: crash on startup

Fixing crash on startup from failure to refresh access token.

Author: ProgrammingByPermutation

src/TwitchStreamingTools/Services/AccountManager.cs

@@ -6,6 +6,7 @@
 using Nullinside.Api.Common.Twitch;
 
 using TwitchStreamingTools.Models;
+using TwitchStreamingTools.Utilities;
 
 namespace TwitchStreamingTools.Services;
 
@@ -18,11 +19,6 @@ public class AccountManager : IAccountManager {
   /// </summary>
   private readonly DispatcherTimer _timer;
 
-  /// <summary>
-  ///   The twitch chat api.
-  /// </summary>
-  private readonly ITwitchApiProxy _twitchApi;
-
   /// <summary>
   ///   The twitch chat client.
   /// </summary>
@@ -32,10 +28,8 @@ public class AccountManager : IAccountManager {
   ///   Initializes a new instance of the <see cref="AccountManager" /> class.
   /// </summary>
   /// <param name="twitchClient">The twitch chat client.</param>
-  /// <param name="twitchApi">The twitch chat api.</param>
-  public AccountManager(ITwitchClientProxy twitchClient, ITwitchApiProxy twitchApi) {
+  public AccountManager(ITwitchClientProxy twitchClient) {
     _twitchClient = twitchClient;
-    _twitchApi = twitchApi;
     _timer = new DispatcherTimer {
       Interval = TimeSpan.FromSeconds(5)
     };
@@ -58,15 +52,17 @@ public AccountManager(ITwitchClientProxy twitchClient, ITwitchApiProxy twitchApi
 
   /// <inheritdoc />
   public async Task UpdateCredentials(string bearer, string refresh, DateTime expires) {
-    _twitchApi.OAuth = new TwitchAccessToken {
-      AccessToken = bearer,
-      RefreshToken = refresh,
-      ExpiresUtc = expires
+    var twitchApi = new TwitchApiWrapper {
+      OAuth = new TwitchAccessToken {
+        AccessToken = bearer,
+        RefreshToken = refresh,
+        ExpiresUtc = expires
+      }
     };
 
     (string? id, string? username)? user = null;
     try {
-      user = await _twitchApi.GetUser();
+      user = await twitchApi.GetUser();
     }
     catch {
       // Do nothing
@@ -89,7 +85,6 @@ public async Task UpdateCredentials(string bearer, string refresh, DateTime expi
 
   /// <inheritdoc />
   public void DeleteCredentials() {
-    _twitchApi.OAuth = null;
     Configuration.Instance.OAuth = null;
     Configuration.Instance.TwitchUsername = null;
     _twitchClient.TwitchOAuthToken = null;
@@ -109,7 +104,11 @@ private async Task OnCheckCredentials() {
     _timer.Stop();
     try {
       bool previousValue = CredentialsAreValid;
-      string? username = (await _twitchApi.GetUser()).username;
+
+      await DoTokenRefreshIfNearExpiration();
+
+      var twitchApi = new TwitchApiWrapper();
+      string? username = (await twitchApi.GetUser()).username;
       CredentialsAreValid = !string.IsNullOrWhiteSpace(username);
       TwitchUsername = username;
 
@@ -124,4 +123,30 @@ private async Task OnCheckCredentials() {
       _timer.Start();
     }
   }
+
+  /// <summary>
+  ///   Checks the expiration of the OAuth token and refreshes if it's within 1 hour of the time.
+  /// </summary>
+  private async Task DoTokenRefreshIfNearExpiration() {
+    var twitchApi = new TwitchApiWrapper();
+    DateTime expiration = twitchApi.OAuth?.ExpiresUtc ?? DateTime.MaxValue;
+    TimeSpan timeUntil = expiration - (DateTime.UtcNow + TimeSpan.FromHours(1));
+    if (timeUntil.Ticks >= 0) {
+      return;
+    }
+
+    if (null == twitchApi.OAuth || string.IsNullOrWhiteSpace(twitchApi.OAuth.AccessToken) ||
+        string.IsNullOrWhiteSpace(twitchApi.OAuth.RefreshToken)) {
+      return;
+    }
+
+    await twitchApi.RefreshAccessToken();
+
+    Configuration.Instance.OAuth = new OAuthResponse {
+      Bearer = twitchApi.OAuth.AccessToken,
+      Refresh = twitchApi.OAuth.RefreshToken,
+      ExpiresUtc = twitchApi.OAuth.ExpiresUtc ?? DateTime.MinValue
+    };
+    Configuration.Instance.WriteConfiguration();
+  }
 }

src/TwitchStreamingTools/Services/ServiceCollectionExtensions.cs

@@ -1,11 +1,7 @@
-using System;
-using System.Threading.Tasks;
-
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 using Nullinside.Api.Common.Twitch;
 
-using TwitchStreamingTools.Utilities;
 using TwitchStreamingTools.ViewModels;
 using TwitchStreamingTools.ViewModels.Pages;
 
@@ -20,26 +16,12 @@ public static class ServiceCollectionExtensions {
   /// </summary>
   /// <param name="collection">The services collection to initialize.</param>
   public static void AddCommonServices(this IServiceCollection collection) {
-    // collection.AddSingleton<IRepository, Repository>();
-    // collection.AddTransient<BusinessService>();
     collection.AddSingleton<IAccountManager, AccountManager>();
     collection.AddSingleton<ITwitchClientProxy, TwitchClientProxy>(_ => TwitchClientProxy.Instance);
 
     collection.AddTransient<MainWindowViewModel>();
     collection.AddTransient<AccountViewModel>();
     collection.AddTransient<ChatViewModel>();
     collection.AddTransient<NewVersionWindowViewModel>();
-    collection.AddTransient<ITwitchApiProxy, TwitchApiWrapper>(TwitchApiWrapperFactory);
-  }
-
-  /// <summary>
-  ///   A factory for generating twitch apis.
-  /// </summary>
-  /// <param name="_">not used.</param>
-  /// <returns>A new instance of the <see cref="TwitchApiWrapper" /> class.</returns>
-  private static TwitchApiWrapper TwitchApiWrapperFactory(IServiceProvider _) {
-    Task<TwitchApiWrapper> task = TwitchApiWrapper.CreateApi();
-    Task.WaitAll(task);
-    return task.Result;
   }
 }

src/TwitchStreamingTools/TwitchStreamingTools.csproj

@@ -31,7 +31,7 @@
         <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0"/>
         <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.0"/>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.8"/>
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.0"/>
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.0"/>
         <PackageReference Include="Material.Avalonia" Version="3.11.0"/>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4"/>

src/TwitchStreamingTools/Utilities/TwitchApiWrapper.cs

@@ -1,13 +1,14 @@
 using System;
+using System.Collections.Generic;
 using System.Net.Http;
-using System.Net.Http.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
+using log4net;
+
 using Newtonsoft.Json;
 
 using Nullinside.Api.Common.Twitch;
-using Nullinside.Api.Common.Twitch.Json;
 
 using TwitchStreamingTools.Models;
 
@@ -18,14 +19,14 @@ namespace TwitchStreamingTools.Utilities;
 /// </summary>
 public class TwitchApiWrapper : TwitchApiProxy {
   /// <summary>
-  ///   Lock to prevent the creation of more than one API at a time.
+  ///   The logger.
   /// </summary>
-  private static readonly SemaphoreSlim _lock = new(1);
+  private static readonly ILog Log = LogManager.GetLogger(typeof(TwitchApiWrapper));
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="TwitchApiWrapper" /> class.
   /// </summary>
-  protected TwitchApiWrapper() : base(
+  public TwitchApiWrapper() : base(
     Configuration.Instance.OAuth?.Bearer ?? "",
     Configuration.Instance.OAuth?.Refresh ?? "",
     Configuration.Instance.OAuth?.ExpiresUtc ?? DateTime.MinValue,
@@ -35,55 +36,38 @@ protected TwitchApiWrapper() : base(
   }
 
   /// <summary>
-  ///   Creates a new instance of the API.
+  ///   Handles refreshing the twitch oauth token either through a local application or through the website.
   /// </summary>
-  /// <returns>A new API instance.</returns>
-  public static async Task<TwitchApiWrapper> CreateApi() {
-    await _lock.WaitAsync();
+  /// <param name="token">The refresh token.</param>
+  /// <returns>The new OAuth token information if successful, null otherwise.</returns>
+  public override async Task<TwitchAccessToken?> RefreshAccessToken(CancellationToken token = new()) {
     try {
-      var api = new TwitchApiWrapper();
-      DateTime expiration = api.OAuth?.ExpiresUtc ?? DateTime.MaxValue;
-      TimeSpan timeUntil = expiration - (DateTime.UtcNow + TimeSpan.FromHours(1));
-      if (timeUntil.Ticks < 0) {
-        if (null != api.OAuth && !string.IsNullOrWhiteSpace(api.OAuth.AccessToken) &&
-            !string.IsNullOrWhiteSpace(api.OAuth.RefreshToken)) {
-          await api.RefreshAccessToken();
-          (string? id, string? username) userInfo = await api.GetUser();
-          Configuration.Instance.OAuth = new OAuthResponse {
-            Bearer = api.OAuth.AccessToken,
-            Refresh = api.OAuth.RefreshToken,
-            ExpiresUtc = api.OAuth.ExpiresUtc ?? DateTime.MinValue
-          };
-        }
+      // If the secret is specified, then this isn't using our API to authenticate, it's using the twitch api directly.
+      if (!string.IsNullOrWhiteSpace(TwitchAppConfig?.ClientSecret)) {
+        await base.RefreshAccessToken(token);
       }
 
-      return api;
-    }
-    finally {
-      _lock.Release();
-    }
-  }
+      using var client = new HttpClient();
+      string url = $"{Constants.API_SITE_DOMAIN}/api/v1/user/twitch-login/twitch-streaming-tools";
+      var request = new HttpRequestMessage(HttpMethod.Post, url);
+      var values = new Dictionary<string, string> { { "refreshToken", OAuth?.RefreshToken ?? string.Empty } };
+      var content = new FormUrlEncodedContent(values);
+      using HttpResponseMessage response = await client.PostAsync(request.RequestUri, content, token);
+      response.EnsureSuccessStatusCode();
+      string responseBody = await response.Content.ReadAsStringAsync(token);
+      var oauthResp = JsonConvert.DeserializeObject<OAuthResponse>(responseBody);
+      if (null == oauthResp) {
+        return null;
+      }
 
-  /// <summary>
-  ///   Handles refreshing the twitch oauth token eithe through a local application or through the website.
-  /// </summary>
-  /// <param name="token">The refresh token.</param>
-  /// <returns>The new OAuth token information if successful, null otherwise.</returns>
-  public override async Task<TwitchAccessToken?> RefreshAccessToken(CancellationToken token = new()) {
-    if (!string.IsNullOrWhiteSpace(TwitchAppConfig?.ClientSecret)) {
-      await base.RefreshAccessToken(token);
+      return new TwitchAccessToken {
+        AccessToken = oauthResp.Bearer,
+        ExpiresUtc = oauthResp.ExpiresUtc,
+        RefreshToken = oauthResp.Refresh
+      };
     }
-
-    using var client = new HttpClient();
-    string url = $"{Constants.API_SITE_DOMAIN}/api/v1/user/twitch-login/twitch-streaming-tools";
-    var request = new HttpRequestMessage(HttpMethod.Post, url);
-    using HttpResponseMessage response =
-      await client.PostAsJsonAsync(request.RequestUri, $"{{\"refreshToken\":\"{OAuth?.RefreshToken}\"}}");
-    response.EnsureSuccessStatusCode();
-    string responseBody = await response.Content.ReadAsStringAsync();
-    var moderatedChannels = JsonConvert.DeserializeObject<TwitchModeratedChannelsResponse>(responseBody);
-    if (null == moderatedChannels) {
-      return null;
+    catch (Exception e) {
+      Log.Error("Failed to refresh access token", e);
     }
 
     return null;

src/TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Reactive;
-using System.Threading.Tasks;
 
 using Nullinside.Api.Common.Twitch;
 
 using ReactiveUI;
 
 using TwitchLib.Client.Events;
-using TwitchLib.Client.Interfaces;
 
 using TwitchStreamingTools.Models;
 
@@ -19,14 +17,14 @@ namespace TwitchStreamingTools.ViewModels.Pages;
 /// </summary>
 public class ChatViewModel : PageViewModelBase, IDisposable {
   /// <summary>
-  ///   The list of chat names selected in the list.
+  ///   The twitch chat client.
   /// </summary>
-  private ObservableCollection<string> _selectedTwitchChatNames = [];
-  
+  private readonly ITwitchClientProxy _twitchClient;
+
   /// <summary>
-  /// The twitch chat client.
+  ///   The list of chat names selected in the list.
   /// </summary>
-  private ITwitchClientProxy _twitchClient;
+  private ObservableCollection<string> _selectedTwitchChatNames = [];
 
   /// <summary>
   ///   The current position of the cursor for the text box showing our chat logs, increment to move down.

src/TwitchStreamingTools/Views/MainWindow.axaml.cs

@@ -2,15 +2,15 @@
 using System.Reflection;
 using System.Threading.Tasks;
 
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Threading;
-
-using Microsoft.Extensions.DependencyInjection;
 
 using Nullinside.Api.Common.Desktop;
 #if !DEBUG
+using Avalonia.Threading;
+using Microsoft.Extensions.DependencyInjection;
 using TwitchStreamingTools.ViewModels;
+#else
+using Avalonia;
 #endif
 
 namespace TwitchStreamingTools.Views;
@@ -19,11 +19,6 @@ namespace TwitchStreamingTools.Views;
 ///   The main application window.
 /// </summary>
 public partial class MainWindow : Window {
-  /// <summary>
-  /// The service provider for DI.
-  /// </summary>
-  public IServiceProvider? ServiceProvider { get; set; }
-  
   /// <summary>
   ///   Initializes a new instance of the <see cref="MainWindow" /> class.
   /// </summary>
@@ -35,6 +30,11 @@ public MainWindow() {
 #endif
   }
 
+  /// <summary>
+  ///   The service provider for DI.
+  /// </summary>
+  public IServiceProvider? ServiceProvider { get; set; }
+
   /// <summary>
   ///   Checks for a new version number of the application.
   /// </summary>
@@ -64,7 +64,7 @@ protected override void OnInitialized() {
       if (null == vm) {
         return;
       }
-      
+
       vm.LocalVersion = localVersion;
       Dispatcher.UIThread.Post(async () => {
         var versionWindow = new NewVersionWindow {