alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 17:44:43 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'master' into authenticationdb-efcore

Browse Source 
# Conflicts:
#	Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
This commit is contained in:
Patrick Barron
2021-06-22 21:09:54 -04:00
parent f96722fa74 9405604913
commit ae878fa051
126 changed files with 429 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Controller/Session/ISessionManager.cs
View File

@@ -276,10 +276,9 @@ namespace MediaBrowser.Controller.Session
/// <summary>
/// Authenticates a new session with quick connect.
/// </summary>
/// <param name="request">The request.</param>
/// <param name="token">Quick connect access token.</param>
/// <param name="userId">The user id.</param>
/// <returns>Task{SessionInfo}.</returns>
Task<AuthenticationResult> AuthenticateQuickConnect(AuthenticationRequest request, string token);
Task<AuthenticationResult> AuthenticateQuickConnect(Guid userId);
/// <summary>
/// Reports the capabilities.