2 files changed, 1 insertions, 20 deletions
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
index 8f6d042dd..9dfb8cf03 100644
--- a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -51,12 +51,7 @@ namespace Emby.Server.Implementations.HttpServer.Security
 
             if (!IsExemptFromAuthenticationToken(auth, authAttribtues, request))
             {
-                var valid = IsValidConnectKey(auth.Token);
-
-                if (!valid)
-                {
-                    ValidateSecurityToken(request, auth.Token);
-                }
+                ValidateSecurityToken(request, auth.Token);
             }
 
             if (authAttribtues.AllowLocalOnly && !request.IsLocal)
@@ -221,16 +216,6 @@ namespace Emby.Server.Implementations.HttpServer.Security
             return info as AuthenticationInfo;
         }
 
-        private bool IsValidConnectKey(string token)
-        {
-            if (string.IsNullOrEmpty(token))
-            {
-                return false;
-            }
-
-            return ConnectManager.IsAuthorizationTokenValid(token);
-        }
-
         private void ValidateSecurityToken(IRequest request, string token)
         {
             if (string.IsNullOrEmpty(token))
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
index ee8f6c60b..75dfa95d9 100644
--- a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
@@ -162,10 +162,6 @@ namespace Emby.Server.Implementations.HttpServer.Security
                         _authRepo.Update(tokenInfo);
                     }
                 }
-                else
-                {
-                    info.User = _connectManager.GetUserFromExchangeToken(token);
-                }
                 httpReq.Items["OriginalAuthenticationInfo"] = tokenInfo;
             }