Merge pull request #4 from nullinside-development-group/feat/chats-view

feat: connecting chat list to chat window

Author: ProgrammingByPermutation

.github/workflows/codeql.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Install .NET Core
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 8.x.x
+          dotnet-version: 9.x.x
 
       # Execute the build
       - name: Execute Release Build
@@ -58,7 +58,7 @@ jobs:
       - name: Install .NET Core
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 8.x.x
+          dotnet-version: 9.x.x
 
       # Execute the tests
       - name: Execute Tests
@@ -120,7 +120,7 @@ jobs:
       - name: Install .NET Core
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 8.x.x
+          dotnet-version: 9.x.x
 
       # Execute the build
       - name: Execute Build

Dockerfile

@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 USER $APP_UID
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
 ARG TAG_VERSION
 WORKDIR /src

Jenkinsfile

@@ -16,9 +16,12 @@ pipeline {
 				withCredentials([
 					string(credentialsId: 'GITHUB_NULLINSIDE_ORG_RELEASE_TOKEN', variable: 'GITHUB_NULLINSIDE_ORG_RELEASE_TOKEN')
 				]) {
-					sh """
-						bash go.sh 
-					"""
+					script {
+						def statusCode = sh script: "bash go.sh", returnStatus:true
+						if (statusCode != 0) {
+							error "Build Failed"
+						}
+					}
 				}
             }
         }

src/TwitchStreamingTools/App.axaml.cs

@@ -1,10 +1,14 @@
 using System;
+using System.Threading.Tasks;
 
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
+using Nullinside.Api.Common.Twitch;
+
+using TwitchStreamingTools.Models;
 using TwitchStreamingTools.ViewModels;
 using TwitchStreamingTools.Views;
 
@@ -25,6 +29,9 @@ public override void Initialize() {
   ///   Launches the main application window.
   /// </summary>
   public override void OnFrameworkInitializationCompleted() {
+    TwitchClientProxy.Instance.TwitchOAuthToken = Configuration.Instance.OAuth?.Bearer;
+    TwitchClientProxy.Instance.TwitchUsername = Configuration.Instance.TwitchUsername;
+
     if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
       desktop.MainWindow = new MainWindow {
         DataContext = new MainWindowViewModel()

src/TwitchStreamingTools/Constants.cs

@@ -20,12 +20,12 @@ public static class Constants {
   public static string API_SITE_DOMAIN = "http://localhost:5036";
 #else
   /// <summary>
-  /// The twitch app client id.
+  ///   The twitch app client id.
   /// </summary>
   public static string TWITCH_CLIENT_ID = "gi1eu8xu9tl6vkjqz4tjqkdzfmcq5h";
 
   /// <summary>
-  /// The domain that the api service is hosted at.
+  ///   The domain that the api service is hosted at.
   /// </summary>
   public static string API_SITE_DOMAIN = "https://nullinside.com";
 #endif

src/TwitchStreamingTools/Models/Configuration.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 
 using Newtonsoft.Json;
@@ -30,6 +31,11 @@ public static Configuration Instance {
     }
   }
 
+  /// <summary>
+  ///   The username of the user logged in through the <see cref="OAuth" /> token.
+  /// </summary>
+  public string? TwitchUsername { get; set; }
+
   /// <summary>
   ///   The twitch OAuth token.
   /// </summary>
@@ -40,6 +46,15 @@ public static Configuration Instance {
   /// </summary>
   public TwitchAppConfig? TwitchAppConfig { get; set; }
 
+  /// <summary>
+  ///   The collection of twitch chats we should read from.
+  /// </summary>
+  public IEnumerable<string>? TwitchChats { get; set; }
+
+  /// <summary>
+  ///   Reads the configuration from disk.
+  /// </summary>
+  /// <returns>The configuration if successful, null otherwise.</returns>
   private static Configuration? ReadConfiguration() {
     try {
       string json = File.ReadAllText(s_configLocation);

src/TwitchStreamingTools/TwitchStreamingTools.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -11,6 +11,7 @@
         <PackageIcon>Assets\icon.png</PackageIcon>
         <RepositoryUrl>https://github.com/nullinside-development-group/nullinside-site-monitor</RepositoryUrl>
         <ApplicationIcon>Assets\logo.ico</ApplicationIcon>
+        <LangVersion>default</LangVersion>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
         <DocumentationFile>bin\Debug\TwitchStreamingTools.xml</DocumentationFile>
@@ -25,14 +26,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.2.2"/>
-        <PackageReference Include="Avalonia.Desktop" Version="11.2.2"/>
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2"/>
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.2"/>
+        <PackageReference Include="Avalonia" Version="11.2.8" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.2.8" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.8" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.8" />
         <!--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.2"/>
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.2"/>
-        <PackageReference Include="Material.Avalonia" Version="3.8.0"/>
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.8" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.8" />
+        <PackageReference Include="Material.Avalonia" Version="3.10.2" />
     </ItemGroup>
 
     <ItemGroup>

src/TwitchStreamingTools/Utilities/ClipboardPoller.cs

@@ -10,7 +10,7 @@ namespace TwitchStreamingTools.Utilities;
 /// <summary>
 ///   Polls the clipboard looking for a specific JSON message.
 /// </summary>
-public class ClipboardPoller<T> : IClipboardPoller<T> {
+public class ClipboardPoller<T> : IClipboardPoller<T>, IDisposable {
   /// <summary>
   ///   The callback to invoke when an OAuth token is found.
   /// </summary>
@@ -48,6 +48,11 @@ public void StopPolling() {
     _timer.Stop();
   }
 
+  /// <inheritdoc />
+  public void Dispose() {
+    _timer.Dispose();
+  }
+
   /// <summary>
   ///   Checks the clipboard for our token.
   /// </summary>

src/TwitchStreamingTools/Utilities/TwitchApiWrapper.cs

@@ -48,6 +48,7 @@ public static async Task<TwitchApiWrapper> CreateApi() {
         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,

src/TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs

@@ -4,6 +4,8 @@
 
 using Avalonia.Threading;
 
+using Nullinside.Api.Common.Twitch;
+
 using ReactiveUI;
 
 using TwitchStreamingTools.Models;
@@ -14,21 +16,21 @@ namespace TwitchStreamingTools.ViewModels.Pages;
 /// <summary>
 ///   Handles binding your account to the application.
 /// </summary>
-public class AccountViewModel : PageViewModelBase {
+public class AccountViewModel : PageViewModelBase, IDisposable {
   /// <summary>
-  ///   Polls the clipboard waiting for an oAuth configuration.
+  ///   The timer used to check the twitch OAuth token against the API.
   /// </summary>
-  private IClipboardPoller<OAuthResponse>? _clipboardPoller;
+  private readonly DispatcherTimer _timer;
 
   /// <summary>
-  ///   True if we have a valid OAuth token, false otherwise.
+  ///   Polls the clipboard waiting for an oAuth configuration.
   /// </summary>
-  private bool _hasValidOAuthToken;
+  private IDisposable? _clipboardPoller;
 
   /// <summary>
-  ///   The timer used to check the twitch OAuth token against the API.
+  ///   True if we have a valid OAuth token, false otherwise.
   /// </summary>
-  private readonly DispatcherTimer _timer;
+  private bool _hasValidOAuthToken;
 
   /// <summary>
   ///   The authenticated user's twitch username.
@@ -40,7 +42,7 @@ public class AccountViewModel : PageViewModelBase {
   /// </summary>
   public AccountViewModel() {
     OnLaunchBrowser = ReactiveCommand.Create(LaunchBrowser);
-    OnLogout = ReactiveCommand.Create(Logout);
+    OnLogout = ReactiveCommand.Create(ClearCredentials);
     _timer = new DispatcherTimer {
       Interval = TimeSpan.FromSeconds(5)
     };
@@ -79,18 +81,12 @@ public string? TwitchUsername {
     set => this.RaiseAndSetIfChanged(ref _twitchUsername, value);
   }
 
-  /// <summary>
-  ///   Handles logging out of the application.
-  /// </summary>
-  private void Logout() {
-    try {
-      Configuration.Instance.OAuth = null;
-      Configuration.Instance.WriteConfiguration();
-      OnCheckApiStatus();
-    }
-    catch {
-      // do nothing
-    }
+  /// <inheritdoc />
+  public void Dispose() {
+    _timer.Stop();
+    _clipboardPoller?.Dispose();
+    OnLaunchBrowser.Dispose();
+    OnLogout.Dispose();
   }
 
   /// <summary>
@@ -100,14 +96,27 @@ private async void OnCheckApiStatus() {
     _timer.Stop();
     try {
       if (null == Configuration.Instance.OAuth?.Bearer) {
-        TwitchUsername = null;
-        HasValidOAuthToken = false;
+        ClearCredentials();
         return;
       }
 
       var api = await TwitchApiWrapper.CreateApi();
       TwitchUsername = (await api.GetUser()).username;
       HasValidOAuthToken = !string.IsNullOrWhiteSpace(TwitchUsername);
+
+      if (HasValidOAuthToken) {
+        if (!string.Equals(api.OAuth?.AccessToken, Configuration.Instance.OAuth.Bearer) ||
+            !string.Equals(TwitchUsername, Configuration.Instance.TwitchUsername)) {
+          SetCredentials(TwitchUsername, new OAuthResponse {
+            Bearer = api.OAuth!.AccessToken!,
+            Refresh = api.OAuth.RefreshToken ?? string.Empty,
+            ExpiresUtc = api.OAuth.ExpiresUtc ?? DateTime.MinValue
+          });
+        }
+      }
+      else {
+        ClearCredentials();
+      }
     }
     catch {
       TwitchUsername = null;
@@ -122,8 +131,9 @@ private async void OnCheckApiStatus() {
   ///   Launches the computer's default browser to generate an OAuth token.
   /// </summary>
   private void LaunchBrowser() {
-    Configuration.Instance.OAuth = null;
-    Configuration.Instance.WriteConfiguration();
+    if (null != _clipboardPoller) {
+      _clipboardPoller.Dispose();
+    }
 
     _clipboardPoller = new ClipboardPoller<OAuthResponse>(Constants.CLIPBOARD!, OnOAuthReceived);
 
@@ -140,12 +150,31 @@ private void LaunchBrowser() {
   /// <param name="oauth">The new OAuth token.</param>
   private void OnOAuthReceived(OAuthResponse oauth) {
     try {
-      Configuration.Instance.OAuth = oauth;
-      Configuration.Instance.WriteConfiguration();
+      SetCredentials(null, oauth);
       OnCheckApiStatus();
     }
     catch {
       // do nothing
     }
   }
+
+  private void ClearCredentials() {
+    TwitchUsername = null;
+    HasValidOAuthToken = false;
+    TwitchClientProxy.Instance.Dispose();
+
+    if (null != Configuration.Instance.OAuth) {
+      Configuration.Instance.OAuth = null;
+      Configuration.Instance.TwitchUsername = null;
+      Configuration.Instance.WriteConfiguration();
+    }
+  }
+
+  private void SetCredentials(string? username, OAuthResponse oauth) {
+    Configuration.Instance.OAuth = oauth;
+    Configuration.Instance.TwitchUsername = username;
+    Configuration.Instance.WriteConfiguration();
+    TwitchClientProxy.Instance.TwitchUsername = username;
+    TwitchClientProxy.Instance.TwitchOAuthToken = oauth.Bearer;
+  }
 }