mirror of
https://github.com/Govor-team/Govor.git
synced 2026-09-23 02:43:18 +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:
@@ -6,6 +6,7 @@ using Govor.Domain.Common;
|
||||
using Govor.Domain.Models;
|
||||
using Govor.Domain.Models.Users;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SmartRes;
|
||||
|
||||
namespace Govor.Application.Authentication;
|
||||
|
||||
@@ -28,18 +29,18 @@ public class AuthService : IAccountService
|
||||
_usernameValidator = usernameValidator;
|
||||
}
|
||||
|
||||
public async Task<Result<User>> RegistrationAsync(string name, string password, Invitation invitation)
|
||||
public async Task<Result<User, Error>> RegistrationAsync(string name, string password, Invitation invitation)
|
||||
{
|
||||
|
||||
var validationResult = _usernameValidator.Validate(name);
|
||||
if (validationResult.IsFailure)
|
||||
{
|
||||
return Result<User>.Failure(validationResult.Error);
|
||||
return Result.Failure<User>(validationResult.Error);
|
||||
}
|
||||
|
||||
if (await _userNameExistValidator.IsUsernameExistsAsync(name))
|
||||
{
|
||||
return Result<User>.Failure(new Error(
|
||||
return Result.Failure<User>(Error.Conflict(
|
||||
nameof(UserAlreadyExistException),
|
||||
$"User with username '{name}' already exists."));
|
||||
}
|
||||
@@ -63,12 +64,14 @@ public class AuthService : IAccountService
|
||||
|
||||
await SetRoleAsync(user, invitation);
|
||||
|
||||
// TODO: inv.participantCount -= 1; db.save();
|
||||
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
return user; // Success
|
||||
}
|
||||
|
||||
public async Task<Result<User>> LoginAsync(string name, string password)
|
||||
public async Task<Result<User, Error>> LoginAsync(string name, string password)
|
||||
{
|
||||
var user = await _context.Users
|
||||
.AsNoTracking()
|
||||
@@ -76,14 +79,14 @@ public class AuthService : IAccountService
|
||||
|
||||
if (user is null)
|
||||
{
|
||||
return Result<User>.Failure(new Error(
|
||||
return Result.Failure<User>(Error.NotFound(
|
||||
nameof(UserNotRegisteredException),
|
||||
$"User '{name}' is not registered."));
|
||||
}
|
||||
|
||||
if (!_passwordHasher.Verify(password, user.PasswordHash))
|
||||
{
|
||||
return Result<User>.Failure(new Error(
|
||||
return Result.Failure<User>(Error.Failure(
|
||||
nameof(InvalidOperationException),
|
||||
"The password provided is incorrect."));
|
||||
}
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
using Govor.Domain.Common;
|
||||
using Govor.Domain.Models;
|
||||
using Govor.Domain.Models.Users;
|
||||
using SmartRes;
|
||||
|
||||
namespace Govor.Application.Authentication;
|
||||
|
||||
public interface IAccountService
|
||||
{
|
||||
public Task<Result<User>> RegistrationAsync(string name, string password, Invitation invitation);
|
||||
public Task<Result<User>> LoginAsync(string name, string password);
|
||||
public Task<Result<User, Error>> RegistrationAsync(string name, string password, Invitation invitation);
|
||||
public Task<Result<User, Error>> LoginAsync(string name, string password);
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
using Govor.Domain.Common;
|
||||
using Govor.Domain.Models;
|
||||
using Govor.Domain.Models.Users;
|
||||
using SmartRes;
|
||||
|
||||
namespace Govor.Application.Authentication;
|
||||
|
||||
@@ -8,5 +9,5 @@ public interface IInvitesService
|
||||
{
|
||||
public Task<string> GetRoleNameAsync(User user);
|
||||
public Task<string> GetRoleNameAsync(Guid sessionId);
|
||||
public Task<Result<Invitation>> ValidateAsync(string inviteCode);
|
||||
public Task<Result<Invitation, Error>> ValidateAsync(string inviteCode);
|
||||
}
|
||||
@@ -4,6 +4,7 @@ using Govor.Domain.Common;
|
||||
using Govor.Domain.Models;
|
||||
using Govor.Domain.Models.Users;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SmartRes;
|
||||
|
||||
namespace Govor.Application.Authentication;
|
||||
|
||||
@@ -31,22 +32,24 @@ public class InvitesService : IInvitesService
|
||||
return invitation.IsAdmin ? "Admin" : "User";
|
||||
}
|
||||
|
||||
public async Task<Result<Invitation>> ValidateAsync(string inviteCode)
|
||||
public async Task<Result<Invitation, Error>> ValidateAsync(string inviteCode)
|
||||
{
|
||||
var invite = await _context.Invitations
|
||||
.Include(s => s.Users)
|
||||
.FirstOrDefaultAsync(s => s.Code == inviteCode);
|
||||
|
||||
if (invite == null)
|
||||
return Result<Invitation>.Failure(Error.Null);
|
||||
return Result.Failure<Invitation>(Error.NotFound("Auth.LinkNotFount","Invitation not found."));
|
||||
|
||||
if (invite.EndDate < DateTime.Now || invite.MaxParticipants <= invite.Users.Count)
|
||||
{
|
||||
invite.IsActive = false;
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
return Result<Invitation>.Failure(new Error(
|
||||
"Auth.InviteLinkInvalid", $"Invite link invalid: {inviteCode}")
|
||||
return Result.Failure<Invitation>(
|
||||
Error.Failure(
|
||||
"Auth.InviteLinkInvalid", $"Invite link invalid: {inviteCode}"
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user