mirror of
https://github.com/Govor-team/Govor.git
synced 2026-11-18 05:15:06 +00:00
Switch to SmartRes Result/Error, upgrade to .NET 10
Migrate codebase to use SmartRes Result<T, Error> (and Unit) across services and interfaces, replacing previous Result usage and updating many method signatures and implementations. Add ResultExtensions to convert SmartRes results to ASP.NET ActionResult and refactor AuthController to use functional Bind/Tap chains for registration/login flows. Upgrade projects to .NET 10 and bump related NuGet packages; add libs/SmartRes.dll and project references. Simplify DbContext registration to use Npgsql only with retry policies and enable detailed logging. Update Swagger/launch settings and other minor fixes (AutoMapper registration change, whitespace/exception handling, and removal of the Govor.ConsoleClient files).
This commit is contained in:
@@ -4,6 +4,7 @@ using Govor.Domain.Common;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.Options;
|
||||
using SmartRes;
|
||||
|
||||
namespace Govor.Application.Users.UserSessions;
|
||||
|
||||
@@ -29,11 +30,11 @@ public class UserSessionRefresher : IUserSessionRefresher
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task<Result<RefreshResult>> RefreshTokenAsync(string refreshToken)
|
||||
public async Task<Result<RefreshResult, Error>> RefreshTokenAsync(string refreshToken)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(refreshToken))
|
||||
{
|
||||
return Result<RefreshResult>.Failure(new Error("Auth.EmptyToken", "Refresh token cannot be empty."));
|
||||
return Result.Failure<RefreshResult>(Error.Failure("Auth.EmptyToken", "Refresh token cannot be empty."));
|
||||
}
|
||||
|
||||
var hashedToken = _jwtTokenHasher.HashToken(refreshToken);
|
||||
@@ -48,13 +49,13 @@ public class UserSessionRefresher : IUserSessionRefresher
|
||||
if (session is null)
|
||||
{
|
||||
_logger.LogWarning("Refresh token session not found for hashed token");
|
||||
return Result<RefreshResult>.Failure(new Error("Auth.InvalidToken", "Invalid refresh token."));
|
||||
return Result.Failure<RefreshResult>(Error.Failure("Auth.InvalidToken", "Invalid refresh token."));
|
||||
}
|
||||
|
||||
if (session.IsRevoked || session.ExpiresAt <= DateTime.UtcNow)
|
||||
{
|
||||
_logger.LogWarning("Attempted to refresh an expired or revoked session: {SessionId}", session.Id);
|
||||
return Result<RefreshResult>.Failure(new Error("Auth.InvalidToken", "Refresh token is invalid or expired."));
|
||||
return Result.Failure<RefreshResult>(Error.Failure("Auth.InvalidToken", "Refresh token is invalid or expired."));
|
||||
}
|
||||
|
||||
var newAccessToken = await _jwtService.GenerateAccessTokenAsync(session.User, session.Id);
|
||||
@@ -74,7 +75,7 @@ public class UserSessionRefresher : IUserSessionRefresher
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Database error occurred during token refresh execution");
|
||||
return Result<RefreshResult>.Failure(ex);
|
||||
return Result.Failure<RefreshResult>(ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user