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

Don't logout if deviceId is null

(cherry picked from commit 1594385497fb7f8e7d12169db34c64821c73864f)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Claus Vium 2021-05-24 08:43:44 +02:00 committed by Joshua M. Boniface
parent 49873c3d7f
commit d2db73b876

View File

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