From b611afe34c87fbdd46caa614277e2e899568d7e9 Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Fri, 20 May 2022 20:49:25 -0600
Subject: [PATCH] Merge pull request #7774 from crobibero/api-authinfo

(cherry picked from commit 825e6460c9df04d8023634d71a0c82c93ca6ee2b)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
---
 .../Security/AuthorizationContext.cs               | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs b/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
index d59d36e88e..9f813f532c 100644
--- a/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
+++ b/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Threading.Tasks;
+using MediaBrowser.Controller;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using Microsoft.AspNetCore.Http;
@@ -16,11 +17,16 @@ namespace Jellyfin.Server.Implementations.Security
     {
         private readonly JellyfinDbProvider _jellyfinDbProvider;
         private readonly IUserManager _userManager;
+        private readonly IServerApplicationHost _serverApplicationHost;
 
-        public AuthorizationContext(JellyfinDbProvider jellyfinDb, IUserManager userManager)
+        public AuthorizationContext(
+            JellyfinDbProvider jellyfinDb,
+            IUserManager userManager,
+            IServerApplicationHost serverApplicationHost)
         {
             _jellyfinDbProvider = jellyfinDb;
             _userManager = userManager;
+            _serverApplicationHost = serverApplicationHost;
         }
 
         public Task<AuthorizationInfo> GetAuthorizationInfo(HttpContext requestContext)
@@ -187,17 +193,17 @@ namespace Jellyfin.Server.Implementations.Security
                     authInfo.Token = key.AccessToken;
                     if (string.IsNullOrWhiteSpace(authInfo.DeviceId))
                     {
-                        authInfo.DeviceId = string.Empty;
+                        authInfo.DeviceId = _serverApplicationHost.SystemId;
                     }
 
                     if (string.IsNullOrWhiteSpace(authInfo.Device))
                     {
-                        authInfo.Device = string.Empty;
+                        authInfo.Device = _serverApplicationHost.Name;
                     }
 
                     if (string.IsNullOrWhiteSpace(authInfo.Version))
                     {
-                        authInfo.Version = string.Empty;
+                        authInfo.Version = _serverApplicationHost.ApplicationVersionString;
                     }
 
                     authInfo.IsApiKey = true;