Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 3 additions & 51 deletions Common/Services/Session/SessionService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,38 +43,17 @@ await _loginSessions.InsertAsync(new LoginSession

public async Task<IReadOnlyList<LoginSession>> ListSessionsByUserId(Guid userId)
{
var sessions = await _loginSessions.Where(x => x.UserId == userId).ToArrayAsync();

var needsSave = false;
foreach (var session in sessions)
{
needsSave |= UpdateOlderSessions(session);
}

if (needsSave)
{
await _loginSessions.SaveAsync();
}

return sessions;
return await _loginSessions.Where(x => x.UserId == userId).ToArrayAsync();
}

public async Task<LoginSession?> GetSessionById(string sessionId)
{
var session = await _loginSessions.FindByIdAsync(sessionId);

if (UpdateOlderSessions(session)) await _loginSessions.SaveAsync();

return session;
return await _loginSessions.FindByIdAsync(sessionId);
}

public async Task<LoginSession?> GetSessionByPulbicId(Guid publicSessionId)
{
var session = await _loginSessions.Where(x => x.PublicId == publicSessionId).FirstOrDefaultAsync();

if (UpdateOlderSessions(session)) await _loginSessions.SaveAsync();

return session;
return await _loginSessions.Where(x => x.PublicId == publicSessionId).FirstOrDefaultAsync();
}

public async Task UpdateSession(LoginSession session, TimeSpan ttl)
Expand Down Expand Up @@ -104,31 +83,4 @@ public async Task DeleteSession(LoginSession loginSession)
{
await _loginSessions.DeleteAsync(loginSession);
}

private static bool UpdateOlderSessions(LoginSession? session)
{
if (session == null) return false;

var save = false;

if (session.PublicId == null)
{
session.PublicId = Guid.CreateVersion7();
save = true;
}

if (session.Created == null)
{
session.Created = DateTime.UtcNow;
save = true;
}

if (session.Expires == null)
{
session.Expires = DateTime.UtcNow;
save = true;
}

return save;
}
}