Fixed the missing OAuth token requirement for Twitch Helix API

Author: csharpfritz

Fritz.StreamTools/Services/TwitchPubSubService.cs

@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,18 @@ public class TwitchPubSubService : IHostedService
 		private readonly Twitch.PubSub.Proxy _Proxy;
 		private readonly ConfigurationSettings _Configuration;
 		private readonly IHostEnvironment _HostEnvironment;
-		private readonly Dictionary<string, Action<IHubContext<AttentionHub, IAttentionHubClient>>> _ChannelPointActions = new Dictionary<string, Action<IHubContext<AttentionHub, IAttentionHubClient>>>();
+    private readonly ILogger _Logger;
+    private readonly Dictionary<string, Action<IHubContext<AttentionHub, IAttentionHubClient>>> _ChannelPointActions = new Dictionary<string, Action<IHubContext<AttentionHub, IAttentionHubClient>>>();
 
-		public TwitchPubSubService(IServiceProvider serviceProvider, Twitch.PubSub.Proxy proxy, IHostEnvironment hostEnvironment, IOptions<ConfigurationSettings> settings)
+		public TwitchPubSubService(IServiceProvider serviceProvider, Twitch.PubSub.Proxy proxy, IHostEnvironment hostEnvironment, IOptions<ConfigurationSettings> settings, ILoggerFactory loggerFactory)
 		{
 			_ServiceProvider = serviceProvider;
 			_Proxy = proxy;
 			_Configuration = settings.Value;
 			_HostEnvironment = hostEnvironment;
 
+			_Logger = loggerFactory.CreateLogger("TwitchPubSub");
+
 			InitializeChannelPointActions();
 
 		}
@@ -47,6 +51,12 @@ private void InitializeChannelPointActions()
 
 		public Task StartAsync(CancellationToken cancellationToken)
 		{
+
+			if (string.IsNullOrEmpty(_Configuration.PubSubAuthToken)) {
+				_Logger.LogError("Twitch PubSub token was not provided, unable to start this service");
+				return Task.CompletedTask;
+			}
+
 			_Proxy.OnChannelPointsRedeemed += _Proxy_OnChannelPointsRedeemed;
 			_Token = cancellationToken;
 			_BackgroundTask = _Proxy.StartAsync(new TwitchTopic[] { TwitchTopic.ChannelPoints(_Configuration.UserId) }, _Token);
@@ -59,7 +69,10 @@ private void IdentifyOldManAudio()
 
 			var oldManPath = Path.Combine(_HostEnvironment.ContentRootPath, "wwwroot", "contents", "oldman");
 			var di = new DirectoryInfo(oldManPath);
-			_OldManSoundFx = di.GetFiles().Select(f => f.Name).OrderBy(x => Guid.NewGuid()).ToArray();
+
+			if (di.Exists && di.GetFiles().Any()) {
+				_OldManSoundFx = di.GetFiles().Select(f => f.Name).OrderBy(x => Guid.NewGuid()).ToArray();
+			}
 
 		}
 

Fritz.StreamTools/StartupServices/ConfigureServices.cs

@@ -99,6 +99,7 @@ private static void RegisterGitHubServices(IServiceCollection services, IConfigu
 			services.AddHttpClient("ShoutoutCommand", c =>
 			{
 				c.DefaultRequestHeaders.Add("client-id", configuration["StreamServices:Twitch:ClientId"]);
+				c.DefaultRequestHeaders.Add("Authorization", $"Bearer {configuration["StreamServices:Twitch:ClientAccessToken"]}");
 			});
 
 			services.AddHostedService<GitHubService>();

Fritz.Twitch/PubSub/Proxy.cs

@@ -45,6 +45,11 @@ public Proxy(IOptions<ConfigurationSettings> settings, ILoggerFactory loggerFact
 		public async Task StartAsync(IEnumerable<TwitchTopic> topics, CancellationToken token)
 		{
 
+			if (string.IsNullOrEmpty(_Configuration.PubSubAuthToken)) {
+				_Logger.LogError("No token configured for Twitch Pubsub");
+				return;
+			}
+
 			_Topics = topics;
 			_Reconnect = false;
 
@@ -173,7 +178,7 @@ private void _PingTimer_Elapsed(object sender, ElapsedEventArgs e)
 			_PongTimer.Start();
 			_PingAcknowledged = false;
 
-			// TODO: handle the lack of returned PONG message 
+			// TODO: handle the lack of returned PONG message
 
 		}