Merge from master & fix conflict

1 files changed, 7 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Net/AuthorizationInfo.cs b/MediaBrowser.Controller/Net/AuthorizationInfo.cs
index 3e004763d..4361e253b 100644
--- a/MediaBrowser.Controller/Net/AuthorizationInfo.cs
+++ b/MediaBrowser.Controller/Net/AuthorizationInfo.cs
@@ -1,36 +1,40 @@
 using System;
-using MediaBrowser.Controller.Entities;
+using Jellyfin.Data.Entities;
 
 namespace MediaBrowser.Controller.Net
 {
     public class AuthorizationInfo
     {
         /// <summary>
-        /// Gets or sets the user identifier.
+        /// Gets the user identifier.
         /// </summary>
         /// <value>The user identifier.</value>
-        public Guid UserId => User == null ? Guid.Empty : User.Id;
+        public Guid UserId => User?.Id ?? Guid.Empty;
 
         /// <summary>
         /// Gets or sets the device identifier.
         /// </summary>
         /// <value>The device identifier.</value>
         public string DeviceId { get; set; }
+
         /// <summary>
         /// Gets or sets the device.
         /// </summary>
         /// <value>The device.</value>
         public string Device { get; set; }
+
         /// <summary>
         /// Gets or sets the client.
         /// </summary>
         /// <value>The client.</value>
         public string Client { get; set; }
+
         /// <summary>
         /// Gets or sets the version.
         /// </summary>
         /// <value>The version.</value>
         public string Version { get; set; }
+
         /// <summary>
         /// Gets or sets the token.
         /// </summary>