bug: error handling to clean up the logs

Author: ProgrammingByPermutation

src/TwitchStreamingTools/Services/TwitchAccountService.cs

@@ -58,12 +58,14 @@ public TwitchAccountService(ITwitchClientProxy twitchClient, IConfiguration conf
 
   /// <inheritdoc />
   public async Task UpdateCredentials(string bearer, string refresh, DateTime expires) {
+    var oauth = new TwitchAccessToken {
+      AccessToken = bearer,
+      RefreshToken = refresh,
+      ExpiresUtc = expires
+    };
+    
     var twitchApi = new TwitchApiWrapper {
-      OAuth = new TwitchAccessToken {
-        AccessToken = bearer,
-        RefreshToken = refresh,
-        ExpiresUtc = expires
-      }
+      OAuth = oauth
     };
 
     (string? id, string? username)? user = null;
@@ -74,18 +76,14 @@ public async Task UpdateCredentials(string bearer, string refresh, DateTime expi
       // Do nothing
     }
 
-    _configuration.OAuth = new TwitchAccessToken {
-      AccessToken = bearer,
-      RefreshToken = refresh,
-      ExpiresUtc = expires
-    };
+    _configuration.OAuth = oauth;
 
     _configuration.TwitchUsername = user?.username;
     _configuration.WriteConfiguration();
     _twitchClient.TwitchOAuthToken = bearer;
     _twitchClient.TwitchUsername = user?.username;
 
-    OnCredentialsChanged?.Invoke(null);
+    OnCredentialsChanged?.Invoke(oauth);
     await OnCheckCredentials();
   }
 
@@ -108,10 +106,10 @@ public void DeleteCredentials() {
   /// </summary>
   private async Task OnCheckCredentials() {
     _timer.Stop();
+    // Grab the value so we can check if the value changed
+    bool credsWereValid = CredentialsAreValid;
+    
     try {
-      // Grab the value so we can check if the value changed
-      bool previousValue = CredentialsAreValid;
-
       // Refresh the token
       await DoTokenRefreshIfNearExpiration();
 
@@ -122,16 +120,18 @@ private async Task OnCheckCredentials() {
       // Update the credentials
       CredentialsAreValid = !string.IsNullOrWhiteSpace(username);
       TwitchUsername = username;
-
-      // Fire off the event if something changed
-      if (previousValue != CredentialsAreValid) {
-        OnCredentialsStatusChanged?.Invoke(CredentialsAreValid);
-      }
     }
     catch {
-      // Do nothing
+      if (credsWereValid) {
+        DeleteCredentials();
+      }
     }
     finally {
+      // Fire off the event if something changed
+      if (credsWereValid != CredentialsAreValid) {
+        OnCredentialsStatusChanged?.Invoke(CredentialsAreValid);
+      }
+      
       _timer.Start();
     }
   }

src/TwitchStreamingTools/ViewModels/Pages/SettingsView/TtsSkipUsernamesViewModel.cs

@@ -136,6 +136,9 @@ private void TtsSkipped_OnCollectionChanged(object? sender, NotifyCollectionChan
   private async void UserListRefreshTimer_OnElapsed(object sender, ElapsedEventArgs e) {
     try {
       var api = new TwitchApiWrapper();
+      if (string.IsNullOrWhiteSpace(api.OAuth?.AccessToken)) {
+        return;
+      }
 
       (string? id, string? username) loggedInUser = await api.GetUser().ConfigureAwait(false);