Merge pull request #6822 from NickSica/master

3 years ago · 8868b34d78
parent 01a1209f0e 8ae5316198
commit 8868b34d78
1 changed files with 15 additions and 3 deletions
--- a/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
+++ b/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
@ -185,9 +185,21 @@ namespace Jellyfin.Server.Implementations.Security
                    authInfo.IsAuthenticated = true;
                    authInfo.Client = key.Name;
                    authInfo.Token = key.AccessToken;
-                    authInfo.DeviceId = string.Empty;
-                    authInfo.Device = string.Empty;
-                    authInfo.Version = string.Empty;
+                    if (string.IsNullOrWhiteSpace(authInfo.DeviceId))
+                    {
+                        authInfo.DeviceId = string.Empty;
+                    }
+
+                    if (string.IsNullOrWhiteSpace(authInfo.Device))
+                    {
+                        authInfo.Device = string.Empty;
+                    }
+
+                    if (string.IsNullOrWhiteSpace(authInfo.Version))
+                    {
+                        authInfo.Version = string.Empty;
+                    }
+
                    authInfo.IsApiKey = true;
                }
            }