mirror of
https://github.com/Govor-team/Govor.git
synced 2026-07-21 19:54:55 +00:00
Implement refresh token flow and refactor session handling
Added refresh token endpoint and controller, introduced IUserSessionRefresher and UserSessionRefresher for token renewal, and updated session handling to return both access and refresh tokens. Refactored AuthController, tests, and related interfaces to support new token flow. Fixed JwtAccessOption property typo, updated configuration, and extended UserSessionsRepository to support lookup by refresh token.
This commit is contained in:
@@ -3,6 +3,7 @@ using Govor.Application.Interfaces.UserSession;
|
||||
using Govor.Application.Services.Authentication;
|
||||
using Govor.Core.Models.Users;
|
||||
using Govor.Core.Repositories.UserSessionsRepository;
|
||||
using Govor.Data.Repositories.Exceptions;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
@@ -11,58 +12,78 @@ namespace Govor.Application.Services.UserSessions;
|
||||
public class UserSessionOpener : IUserSessionOpener
|
||||
{
|
||||
private readonly IUserSessionsRepository _repository;
|
||||
private readonly IJwtService _jwtService;
|
||||
private readonly ILogger<UserSessionOpener> _logger;
|
||||
private readonly JwtRefreshOption _options;
|
||||
private readonly IJwtService _jwtService;
|
||||
|
||||
public UserSessionOpener(IUserSessionsRepository repository, IJwtService jwtService, IOptions<JwtRefreshOption> options, ILogger<UserSessionOpener> logger)
|
||||
public UserSessionOpener(
|
||||
IUserSessionsRepository repository,
|
||||
IJwtService jwtService,
|
||||
IOptions<JwtRefreshOption> options,
|
||||
ILogger<UserSessionOpener> logger)
|
||||
{
|
||||
_jwtService = jwtService;
|
||||
_repository = repository;
|
||||
_logger = logger;
|
||||
_options = options.Value;
|
||||
}
|
||||
public async Task<string> OpenSessionAsync(User user, string deviceInfo)
|
||||
|
||||
public async Task<RefreshResult> OpenSessionAsync(User user, string deviceInfo)
|
||||
{
|
||||
_logger.LogInformation($"Opening session for user {user.Id} on device '{deviceInfo}'");
|
||||
|
||||
var sessions = await _repository.GetByUserIdAsync(user.Id);
|
||||
var session = sessions.FirstOrDefault(s => s.DeviceInfo == deviceInfo);
|
||||
|
||||
var newRefreshToken = await _jwtService.GenerateRefreshTokenAsync(user);
|
||||
var newExpiresAt = DateTime.UtcNow.AddDays(_options.RefreshTokenLifetimeDays);
|
||||
|
||||
if (session is not null)
|
||||
try
|
||||
{
|
||||
if (session.IsRevoked || session.ExpiresAt <= DateTime.UtcNow)
|
||||
var sessions = await _repository.GetByUserIdAsync(user.Id);
|
||||
var session = sessions.FirstOrDefault(s => s.DeviceInfo == deviceInfo);
|
||||
|
||||
var newRefreshToken = await _jwtService.GenerateRefreshTokenAsync(user);
|
||||
var accessToken = await _jwtService.GenerateAccessTokenAsync(user);
|
||||
|
||||
var newExpiresAt = DateTime.UtcNow.AddDays(_options.RefreshTokenLifetimeDays);
|
||||
|
||||
if (session is not null)
|
||||
{
|
||||
// Update Session
|
||||
// Всегда обновляем токен и дату
|
||||
session.RefreshToken = newRefreshToken;
|
||||
session.ExpiresAt = newExpiresAt;
|
||||
session.CreatedAt = DateTime.UtcNow;
|
||||
session.IsRevoked = false;
|
||||
|
||||
await _repository.UpdateAsync(session);
|
||||
_logger.LogInformation($"Updated expired/revoked session for user {user.Id} on device '{deviceInfo}'");
|
||||
_logger.LogInformation($"Updated session for user {user.Id} on device '{deviceInfo}'");
|
||||
|
||||
return new RefreshResult(session.RefreshToken, accessToken);
|
||||
}
|
||||
|
||||
return session.RefreshToken;
|
||||
|
||||
return await OpenNewSession();
|
||||
}
|
||||
|
||||
// New Session
|
||||
var newSession = new Core.Models.UserSession
|
||||
catch (NotFoundByKeyException<Guid> ex)
|
||||
{
|
||||
UserId = user.Id,
|
||||
DeviceInfo = deviceInfo,
|
||||
RefreshToken = newRefreshToken,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
ExpiresAt = newExpiresAt,
|
||||
IsRevoked = false
|
||||
};
|
||||
return await OpenNewSession();
|
||||
}
|
||||
|
||||
async Task<RefreshResult> OpenNewSession()
|
||||
{
|
||||
var newRefreshToken = await _jwtService.GenerateRefreshTokenAsync(user);
|
||||
var accessToken = await _jwtService.GenerateAccessTokenAsync(user);
|
||||
|
||||
var newSession = new Core.Models.UserSession
|
||||
{
|
||||
UserId = user.Id,
|
||||
DeviceInfo = deviceInfo,
|
||||
RefreshToken = newRefreshToken,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
ExpiresAt = DateTime.UtcNow.AddDays(_options.RefreshTokenLifetimeDays),
|
||||
IsRevoked = false
|
||||
};
|
||||
|
||||
await _repository.AddAsync(newSession);
|
||||
_logger.LogInformation($"Created new session for user {user.Id} on device '{deviceInfo}'");
|
||||
await _repository.AddAsync(newSession);
|
||||
|
||||
_logger.LogInformation($"Created new session for user {user.Id} on device '{deviceInfo}'");
|
||||
|
||||
return newRefreshToken;
|
||||
return new RefreshResult(newRefreshToken, accessToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user