1 files changed, 58 insertions, 7 deletions

diff --git a/tests/Jellyfin.Server.Implementations.Tests/QuickConnect/QuickConnectManagerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/QuickConnect/QuickConnectManagerTests.cs
index 365acfa34..28d832ef8 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/QuickConnect/QuickConnectManagerTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/QuickConnect/QuickConnectManagerTests.cs
@@ -1,17 +1,29 @@
 using System;
+using System.Linq;
+using System.Threading.Tasks;
 using AutoFixture;
 using AutoFixture.AutoMoq;
 using Emby.Server.Implementations.QuickConnect;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Authentication;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Configuration;
 using Moq;
 using Xunit;
 
-namespace Jellyfin.Server.Implementations.Tests.LiveTv
+namespace Jellyfin.Server.Implementations.Tests.QuickConnect
 {
     public class QuickConnectManagerTests
     {
+        private static readonly AuthorizationInfo _quickConnectAuthInfo = new AuthorizationInfo
+        {
+            Device = "Device",
+            DeviceId = "DeviceId",
+            Client = "Client",
+            Version = "1.0.0"
+        };
+
         private readonly Fixture _fixture;
         private readonly ServerConfiguration _config;
         private readonly QuickConnectManager _quickConnectManager;
@@ -27,6 +39,12 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv
             {
                 ConfigureMembers = true
             }).Inject(configManager.Object);
+
+            // User object contains circular references.
+            _fixture.Behaviors.OfType<ThrowingRecursionBehavior>().ToList()
+                .ForEach(b => _fixture.Behaviors.Remove(b));
+            _fixture.Behaviors.Add(new OmitOnRecursionBehavior());
+
             _quickConnectManager = _fixture.Create<QuickConnectManager>();
         }
 
@@ -34,9 +52,24 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv
         public void IsEnabled_QuickConnectUnavailable_False()
             => Assert.False(_quickConnectManager.IsEnabled);
 
+        [Theory]
+        [InlineData("", "DeviceId", "Client", "1.0.0")]
+        [InlineData("Device", "", "Client", "1.0.0")]
+        [InlineData("Device", "DeviceId", "", "1.0.0")]
+        [InlineData("Device", "DeviceId", "Client", "")]
+        public void TryConnect_InvalidAuthorizationInfo_ThrowsArgumentException(string device, string deviceId, string client, string version)
+            => Assert.Throws<ArgumentException>(() => _quickConnectManager.TryConnect(
+                new AuthorizationInfo
+                {
+                    Device = device,
+                    DeviceId = deviceId,
+                    Client = client,
+                    Version = version
+                }));
+
         [Fact]
         public void TryConnect_QuickConnectUnavailable_ThrowsAuthenticationException()
-            => Assert.Throws<AuthenticationException>(_quickConnectManager.TryConnect);
+            => Assert.Throws<AuthenticationException>(() => _quickConnectManager.TryConnect(_quickConnectAuthInfo));
 
         [Fact]
         public void CheckRequestStatus_QuickConnectUnavailable_ThrowsAuthenticationException()
@@ -44,7 +77,11 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv
 
         [Fact]
         public void AuthorizeRequest_QuickConnectUnavailable_ThrowsAuthenticationException()
-            => Assert.Throws<AuthenticationException>(() => _quickConnectManager.AuthorizeRequest(Guid.Empty, string.Empty));
+            => Assert.ThrowsAsync<AuthenticationException>(() => _quickConnectManager.AuthorizeRequest(Guid.Empty, string.Empty));
+
+        [Fact]
+        public void GetAuthorizedRequest_QuickConnectUnavailable_ThrowsAuthenticationException()
+            => Assert.Throws<AuthenticationException>(() => _quickConnectManager.GetAuthorizedRequest(string.Empty));
 
         [Fact]
         public void IsEnabled_QuickConnectAvailable_True()
@@ -57,17 +94,31 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv
         public void CheckRequestStatus_QuickConnectAvailable_Success()
         {
             _config.QuickConnectAvailable = true;
-            var res1 = _quickConnectManager.TryConnect();
+            var res1 = _quickConnectManager.TryConnect(_quickConnectAuthInfo);
             var res2 = _quickConnectManager.CheckRequestStatus(res1.Secret);
             Assert.Equal(res1, res2);
         }
 
         [Fact]
-        public void AuthorizeRequest_QuickConnectAvailable_Success()
+        public void CheckRequestStatus_UnknownSecret_ThrowsResourceNotFoundException()
+        {
+            _config.QuickConnectAvailable = true;
+            Assert.Throws<ResourceNotFoundException>(() => _quickConnectManager.CheckRequestStatus("Unknown secret"));
+        }
+
+        [Fact]
+        public void GetAuthorizedRequest_UnknownSecret_ThrowsResourceNotFoundException()
+        {
+            _config.QuickConnectAvailable = true;
+            Assert.Throws<ResourceNotFoundException>(() => _quickConnectManager.GetAuthorizedRequest("Unknown secret"));
+        }
+
+        [Fact]
+        public async Task AuthorizeRequest_QuickConnectAvailable_Success()
         {
             _config.QuickConnectAvailable = true;
-            var res = _quickConnectManager.TryConnect();
-            Assert.True(_quickConnectManager.AuthorizeRequest(Guid.Empty, res.Code));
+            var res = _quickConnectManager.TryConnect(_quickConnectAuthInfo);
+            Assert.True(await _quickConnectManager.AuthorizeRequest(Guid.Empty, res.Code));
         }
     }
 }