From 8296f07a39ea96067b8b96289baa1014ed01f4e1 Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Sat, 6 Aug 2022 14:17:04 +0200 Subject: [PATCH 1/2] Make userId truly optional in UniversalAudioController --- Jellyfin.Api/Controllers/UniversalAudioController.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jellyfin.Api/Controllers/UniversalAudioController.cs b/Jellyfin.Api/Controllers/UniversalAudioController.cs index 6fcafd426c..06cd767663 100644 --- a/Jellyfin.Api/Controllers/UniversalAudioController.cs +++ b/Jellyfin.Api/Controllers/UniversalAudioController.cs @@ -117,7 +117,13 @@ namespace Jellyfin.Api.Controllers [FromQuery] bool enableRedirection = true) { var deviceProfile = GetDeviceProfile(container, transcodingContainer, audioCodec, transcodingProtocol, breakOnNonKeyFrames, transcodingAudioChannels, maxAudioSampleRate, maxAudioBitDepth, maxAudioChannels); - (await _authorizationContext.GetAuthorizationInfo(Request).ConfigureAwait(false)).DeviceId = deviceId; + var authorizationInfo = await _authorizationContext.GetAuthorizationInfo(Request).ConfigureAwait(false); + authorizationInfo.DeviceId = deviceId; + + if (!userId.HasValue || userId.Equals(Guid.Empty)) + { + userId = authorizationInfo.UserId; + } var authInfo = await _authorizationContext.GetAuthorizationInfo(Request).ConfigureAwait(false); From 8422ab687b996e467e6d69a170a384d7c5d69181 Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Mon, 22 Aug 2022 17:47:59 +0200 Subject: [PATCH 2/2] Update Jellyfin.Api/Controllers/UniversalAudioController.cs Co-authored-by: Bond-009 --- Jellyfin.Api/Controllers/UniversalAudioController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jellyfin.Api/Controllers/UniversalAudioController.cs b/Jellyfin.Api/Controllers/UniversalAudioController.cs index 06cd767663..fe8125318b 100644 --- a/Jellyfin.Api/Controllers/UniversalAudioController.cs +++ b/Jellyfin.Api/Controllers/UniversalAudioController.cs @@ -120,7 +120,7 @@ namespace Jellyfin.Api.Controllers var authorizationInfo = await _authorizationContext.GetAuthorizationInfo(Request).ConfigureAwait(false); authorizationInfo.DeviceId = deviceId; - if (!userId.HasValue || userId.Equals(Guid.Empty)) + if (!userId.HasValue || userId.Value.Equals(Guid.Empty)) { userId = authorizationInfo.UserId; }