Merge pull request #6038 from crobibero/delete-existing-sessions

Don't logout if deviceId is null

(cherry picked from commit 1594385497)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
pull/6284/head
Claus Vium 3 years ago committed by Joshua M. Boniface
parent 49873c3d7f
commit d2db73b876

@ -1543,23 +1543,26 @@ namespace Emby.Server.Implementations.Session
Limit = 1
}).Items.FirstOrDefault();
var allExistingForDevice = _authRepo.Get(
new AuthenticationInfoQuery
{
DeviceId = deviceId
}).Items;
foreach (var auth in allExistingForDevice)
if (!string.IsNullOrEmpty(deviceId))
{
if (existing == null || !string.Equals(auth.AccessToken, existing.AccessToken, StringComparison.Ordinal))
{
try
var allExistingForDevice = _authRepo.Get(
new AuthenticationInfoQuery
{
Logout(auth);
}
catch (Exception ex)
DeviceId = deviceId
}).Items;
foreach (var auth in allExistingForDevice)
{
if (existing == null || !string.Equals(auth.AccessToken, existing.AccessToken, StringComparison.Ordinal))
{
_logger.LogError(ex, "Error while logging out.");
try
{
Logout(auth);
}
catch (Exception ex)
{
_logger.LogError(ex, "Error while logging out.");
}
}
}
}

Loading…
Cancel
Save