Merge branch 'master' into authenticationdb-efcore

# Conflicts:
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Net/ISessionContext.cs

1 files changed, 2 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Net/ISessionContext.cs b/MediaBrowser.Controller/Net/ISessionContext.cs
index 57938da1f..b48181b3f 100644
--- a/MediaBrowser.Controller/Net/ISessionContext.cs
+++ b/MediaBrowser.Controller/Net/ISessionContext.cs
@@ -11,10 +11,10 @@ namespace MediaBrowser.Controller.Net
     {
         Task<SessionInfo> GetSession(object requestContext);
 
-        Task<User> GetUser(object requestContext);
+        Task<User?> GetUser(object requestContext);
 
         Task<SessionInfo> GetSession(HttpContext requestContext);
 
-        Task<User> GetUser(HttpContext requestContext);
+        Task<User?> GetUser(HttpContext requestContext);
     }
 }