Merge pull request #91 from nullinside-development-group/feat/ws

feat: switch off using the clipboard for login

Author: ProgrammingByPermutation

src/TwitchStreamingTools/App.axaml.cs

@@ -29,7 +29,7 @@ public override void Initialize() {
   ///   Launches the main application window.
   /// </summary>
   public override void OnFrameworkInitializationCompleted() {
-    TwitchClientProxy.Instance.TwitchOAuthToken = Configuration.Instance.OAuth?.Bearer;
+    TwitchClientProxy.Instance.TwitchOAuthToken = Configuration.Instance.OAuth?.AccessToken;
     TwitchClientProxy.Instance.TwitchUsername = Configuration.Instance.TwitchUsername;
 
     // Register all the services needed for the application to run

src/TwitchStreamingTools/Configuration.cs

@@ -58,7 +58,7 @@ public static Configuration Instance {
   /// <summary>
   ///   The twitch OAuth token.
   /// </summary>
-  public OAuthResponse? OAuth { get; set; }
+  public TwitchAccessToken? OAuth { get; set; }
 
   /// <summary>
   ///   The twitch application configuration for getting OAuth tokens.
@@ -96,7 +96,7 @@ public bool WriteConfiguration() {
     if (Design.IsDesignMode) {
       return false;
     }
-    
+
     try {
       Directory.CreateDirectory(Path.GetDirectoryName(CONFIG_LOCATION)!);
 

src/TwitchStreamingTools/Constants.cs

@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-using Avalonia.Input.Platform;
-
 namespace TwitchStreamingTools;
 
 /// <summary>
@@ -18,7 +16,12 @@ public static class Constants {
   /// <summary>
   ///   The domain that the api service is hosted at.
   /// </summary>
-  public const string API_SITE_DOMAIN = "http://localhost:5036";
+  public const string API_SITE_DOMAIN = $"http://{DOMAIN}";
+
+  /// <summary>
+  ///   The domain that the api service is hosted at.
+  /// </summary>
+  public const string DOMAIN = "localhost:5036";
 #else
   /// <summary>
   ///   The twitch app client id.
@@ -28,7 +31,12 @@ public static class Constants {
   /// <summary>
   ///   The domain that the api service is hosted at.
   /// </summary>
-  public const string API_SITE_DOMAIN = "https://nullinside.com";
+  public const string API_SITE_DOMAIN = "https://{DOMAIN}";
+  
+  /// <summary>
+  ///   The domain that the api service is hosted at.
+  /// </summary>
+  public const string DOMAIN = "nullinside.com";
 #endif
 
   /// <summary>
@@ -46,12 +54,6 @@ public static class Constants {
   /// </summary>
   public static readonly string? APP_VERSION = Assembly.GetEntryAssembly()?.GetName().Version?.ToString()[..^2];
 
-  /// <summary>
-  ///   The reference to the clipboard API.
-  /// </summary>
-  /// <remarks>This is a hack because it's hard to get to.</remarks>
-  public static IClipboard? Clipboard;
-
   /// <summary>
   ///   The default bot list to populate when a user doesn't any have bots configured.
   /// </summary>

src/TwitchStreamingTools/IConfiguration.cs

@@ -18,7 +18,7 @@ public interface IConfiguration {
   /// <summary>
   ///   The twitch OAuth token.
   /// </summary>
-  OAuthResponse? OAuth { get; set; }
+  TwitchAccessToken? OAuth { get; set; }
 
   /// <summary>
   ///   The twitch application configuration for getting OAuth tokens.

src/TwitchStreamingTools/Models/OAuthResponse.cs

@@ -5,7 +5,6 @@
 
 using Nullinside.Api.Common.Twitch;
 
-using TwitchStreamingTools.Models;
 using TwitchStreamingTools.Utilities;
 
 namespace TwitchStreamingTools.Services;
@@ -75,9 +74,9 @@ public async Task UpdateCredentials(string bearer, string refresh, DateTime expi
       // Do nothing
     }
 
-    _configuration.OAuth = new OAuthResponse {
-      Bearer = bearer,
-      Refresh = refresh,
+    _configuration.OAuth = new TwitchAccessToken {
+      AccessToken = bearer,
+      RefreshToken = refresh,
       ExpiresUtc = expires
     };
 
@@ -159,9 +158,9 @@ private async Task DoTokenRefreshIfNearExpiration() {
     await twitchApi.RefreshAccessToken();
 
     // Update the configuration
-    _configuration.OAuth = new OAuthResponse {
-      Bearer = twitchApi.OAuth.AccessToken,
-      Refresh = twitchApi.OAuth.RefreshToken,
+    _configuration.OAuth = new TwitchAccessToken {
+      AccessToken = twitchApi.OAuth.AccessToken,
+      RefreshToken = twitchApi.OAuth.RefreshToken,
       ExpiresUtc = twitchApi.OAuth.ExpiresUtc ?? DateTime.MinValue
     };
     _configuration.WriteConfiguration();

src/TwitchStreamingTools/Services/TwitchAccountService.cs

@@ -97,8 +97,8 @@ private void Main() {
   private void ConnectChatsInConfig() {
     if (Design.IsDesignMode) {
       return;
-    } 
-    
+    }
+
     List<string?>? missing = _configuration.TwitchChats?
       .Select(c => c.TwitchChannel)
       .Except(_chats?.Select(c => c.ChatConfig?.TwitchChannel) ?? [])

src/TwitchStreamingTools/Services/TwitchTtsService.cs

@@ -46,21 +46,21 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.3.2" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2" />
+        <PackageReference Include="Avalonia" Version="11.3.2"/>
+        <PackageReference Include="Avalonia.Desktop" Version="11.3.2"/>
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2"/>
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2"/>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.2" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.2" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.2"/>
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.2"/>
         <PackageReference Include="DynamicData" Version="9.4.1"/>
         <PackageReference Include="log4net" Version="3.1.0"/>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7"/>
         <PackageReference Include="NAudio.Wasapi" Version="2.2.1"/>
         <PackageReference Include="NAudio.WinMM" Version="2.2.1"/>
-        <PackageReference Include="System.Speech" Version="9.0.7" />
-        <PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.2" />
-        <PackageReference Include="Xaml.Behaviors.Interactivity" Version="11.3.2" />
+        <PackageReference Include="System.Speech" Version="9.0.7"/>
+        <PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.2"/>
+        <PackageReference Include="Xaml.Behaviors.Interactivity" Version="11.3.2"/>
     </ItemGroup>
 
     <ItemGroup>