auth token endpoint finished
This commit is contained in:
@@ -10,13 +10,13 @@ public class AuthPasswordHandler : IRequestHandler<AuthPasswordCommand, AuthPass
|
||||
{
|
||||
private readonly DatabaseContext _databaseContext;
|
||||
private readonly IPasswordHasher _passwordHasher;
|
||||
private readonly IAccessTokenGenerator _accessTokenGenerator;
|
||||
private readonly ITokenHelper _tokenHelper;
|
||||
|
||||
public AuthPasswordHandler(DatabaseContext databaseContext, IPasswordHasher passwordHasher, IAccessTokenGenerator accessTokenGenerator)
|
||||
public AuthPasswordHandler(DatabaseContext databaseContext, IPasswordHasher passwordHasher, ITokenHelper tokenHelper)
|
||||
{
|
||||
_databaseContext = databaseContext;
|
||||
_passwordHasher = passwordHasher;
|
||||
_accessTokenGenerator = accessTokenGenerator;
|
||||
_tokenHelper = tokenHelper;
|
||||
}
|
||||
|
||||
public async Task<AuthPasswordResult> Handle(AuthPasswordCommand request, CancellationToken cancellationToken)
|
||||
@@ -33,10 +33,17 @@ public class AuthPasswordHandler : IRequestHandler<AuthPasswordCommand, AuthPass
|
||||
return AuthPasswordResult.Failure();
|
||||
}
|
||||
|
||||
string accessToken = _accessTokenGenerator.GenerateAccessToken(account);
|
||||
RefreshToken refreshToken = _accessTokenGenerator.GenerateRefreshToken(request.RememberMe);
|
||||
string accessToken = _tokenHelper.GenerateAccessToken(account.Id);
|
||||
|
||||
account.RefreshTokens.Add(refreshToken);
|
||||
RefreshToken refreshToken = new RefreshToken
|
||||
{
|
||||
Token = Guid.NewGuid(),
|
||||
IsExtendable = request.RememberMe,
|
||||
AccountId = account.Id,
|
||||
ExpirationDate = _tokenHelper.CalculateRefreshTokenExpirationDate(request.RememberMe),
|
||||
};
|
||||
|
||||
await _databaseContext.RefreshTokens.AddAsync(refreshToken, cancellationToken);
|
||||
await _databaseContext.SaveChangesAsync(cancellationToken);
|
||||
|
||||
return AuthPasswordResult.Success(accessToken, refreshToken.Token.ToString());
|
||||
|
||||
@@ -9,31 +9,32 @@ namespace TimetableDesigner.Backend.Services.Authentication.Core.Commands.AuthTo
|
||||
public class AuthTokenHandler : IRequestHandler<AuthTokenCommand, AuthTokenResult>
|
||||
{
|
||||
private readonly DatabaseContext _databaseContext;
|
||||
private readonly IAccessTokenGenerator _accessTokenGenerator;
|
||||
private readonly ITokenHelper _tokenHelper;
|
||||
|
||||
public AuthTokenHandler(DatabaseContext databaseContext, IAccessTokenGenerator accessTokenGenerator)
|
||||
public AuthTokenHandler(DatabaseContext databaseContext, ITokenHelper tokenHelper)
|
||||
{
|
||||
_databaseContext = databaseContext;
|
||||
_accessTokenGenerator = accessTokenGenerator;
|
||||
_tokenHelper = tokenHelper;
|
||||
}
|
||||
|
||||
public async Task<AuthTokenResult> Handle(AuthTokenCommand request, CancellationToken cancellationToken)
|
||||
{
|
||||
RefreshToken? token = await _databaseContext.RefreshTokens
|
||||
RefreshToken? refreshToken = await _databaseContext.RefreshTokens
|
||||
.Include(x => x.Account)
|
||||
.FirstOrDefaultAsync(x => x.Token == Guid.Parse(request.RefreshToken), cancellationToken);
|
||||
if (token is null || token.ExpirationDate < DateTimeOffset.UtcNow || !_accessTokenGenerator.ValidateExpiredAccessToken(request.AccessToken))
|
||||
if (refreshToken is null || refreshToken.ExpirationDate < DateTimeOffset.UtcNow || !_tokenHelper.ValidateExpiredAccessToken(request.AccessToken))
|
||||
{
|
||||
return AuthTokenResult.Failure();
|
||||
}
|
||||
|
||||
string accessToken = _accessTokenGenerator.GenerateAccessToken(token.Account);
|
||||
if (token.IsExtendable)
|
||||
{
|
||||
|
||||
}
|
||||
string accessToken = _tokenHelper.GenerateAccessToken(refreshToken.Account.Id);
|
||||
|
||||
if (refreshToken.IsExtendable)
|
||||
{
|
||||
refreshToken.ExpirationDate = _tokenHelper.CalculateRefreshTokenExpirationDate();
|
||||
await _databaseContext.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
return AuthTokenResult.Success(refreshToken, accessToken);
|
||||
return AuthTokenResult.Success(accessToken, refreshToken.Token.ToString());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user