cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Matt Montgomery 2020-07-26 23:13:14 -05:00
parent 0945659cb5
commit 3c91aa0c3d
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs
View File

@ -14,6 +14,7 @@ using MediaBrowser.Model.Services;
using MediaBrowser.Common;
using Microsoft.Extensions.Logging;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Authentication;
namespace Emby.Server.Implementations.QuickConnect
{
@ -83,13 +84,13 @@ namespace Emby.Server.Implementations.QuickConnect
public void Activate()
{
DateActivated = DateTime.Now;
SetEnabled(QuickConnectState.Active);
SetState(QuickConnectState.Active);
}
/// <inheritdoc/>
public void SetEnabled(QuickConnectState newState)
public void SetState(QuickConnectState newState)
{
_logger.LogDebug("Changed quick connect state from {0} to {1}", State, newState);
_logger.LogDebug("Changed quick connect state from {State} to {newState}", State, newState);
ExpireRequests(true);
@ -107,12 +108,8 @@ namespace Emby.Server.Implementations.QuickConnect
if (State != QuickConnectState.Active)
{
_logger.LogDebug("Refusing quick connect initiation request, current state is {0}", State);
return new QuickConnectResult()
{
Error = "Quick connect is not active on this server"
};
_logger.LogDebug("Refusing quick connect initiation request, current state is {State}", State);
throw new AuthenticationException("Quick connect is not active on this server");
}
_logger.LogDebug("Got new quick connect request from {friendlyName}", friendlyName);
@ -200,7 +197,7 @@ namespace Emby.Server.Implementations.QuickConnect
UserId = auth.UserId
});
_logger.LogInformation("Allowing device {0} to login as user {1} with quick connect code {2}", result.FriendlyName, auth.User.Username, result.Code);
_logger.LogInformation("Allowing device {FriendlyName} to login as user {Username} with quick connect code {Code}", result.FriendlyName, auth.User.Username, result.Code);
return true;
}
@ -216,13 +213,15 @@ namespace Emby.Server.Implementations.QuickConnect
var tokens = raw.Items.Where(x => x.AppName.StartsWith(TokenNamePrefix, StringComparison.CurrentCulture));
var removed = 0;
foreach (var token in tokens)
{
_authenticationRepository.Delete(token);
_logger.LogDebug("Deleted token {0}", token.AccessToken);
_logger.LogDebug("Deleted token {AccessToken}", token.AccessToken);
removed++;
}
return tokens.Count();
return removed;
}
/// <summary>
@ -261,7 +260,7 @@ namespace Emby.Server.Implementations.QuickConnect
if (State == QuickConnectState.Active && DateTime.Now > DateActivated.AddMinutes(Timeout) && !expireAll)
{
_logger.LogDebug("Quick connect time expired, deactivating");
SetEnabled(QuickConnectState.Available);
SetState(QuickConnectState.Available);
expireAll = true;
}

2
MediaBrowser.Api/QuickConnect/QuickConnectService.cs
View File

@ -125,7 +125,7 @@ namespace MediaBrowser.Api.QuickConnect
public object Post(Available request)
{
_quickConnect.SetEnabled(request.Status);
_quickConnect.SetState(request.Status);
return _quickConnect.State;
}
}

6
MediaBrowser.Controller/QuickConnect/IQuickConnect.cs
View File

@ -41,16 +41,16 @@ namespace MediaBrowser.Controller.QuickConnect
void Activate();
/// <summary>
/// Changes the status of quick connect.
/// Changes the state of quick connect.
/// </summary>
/// <param name="newState">New state to change to.</param>
void SetEnabled(QuickConnectState newState);
void SetState(QuickConnectState newState);
/// <summary>
/// Initiates a new quick connect request.
/// </summary>
/// <param name="friendlyName">Friendly device name to display in the request UI.</param>
/// <returns>A quick connect result with tokens to proceed or a descriptive error message otherwise.</returns>
/// <returns>A quick connect result with tokens to proceed or throws an exception if not active.</returns>
QuickConnectResult TryConnect(string friendlyName);
/// <summary>