Refactor project files for improved readability and structure
CI / Backend (build + test) (push) Successful in 1m18s
CI / Frontend (lint + typecheck + build) (push) Successful in 31s

- Cleaned up whitespace in Directory.Build.props and Directory.Packages.props for consistency.
- Reformatted project file references in PnvPanel.Api.csproj for better clarity.
- Enhanced code readability in various endpoint files by adjusting line breaks and indentation.
- Standardized method signatures and improved formatting in ResultExtensions and multiple endpoint classes for better maintainability.
This commit is contained in:
Leonid Pershin
2026-07-14 07:24:13 +03:00
parent 9d5424bb9c
commit df137ca5a7
285 changed files with 6911 additions and 2063 deletions
@@ -15,29 +15,50 @@ public class ChangePasswordCommandHandlerTests
[Fact]
public async Task Handle_Unauthenticated_ReturnsUnauthorized()
{
var handler = new ChangePasswordCommandHandler(_identityService, FakeCurrentUser.Anonymous());
var handler = new ChangePasswordCommandHandler(
_identityService,
FakeCurrentUser.Anonymous()
);
var result = await handler.Handle(new ChangePasswordCommand("old", "new"), CancellationToken.None);
var result = await handler.Handle(
new ChangePasswordCommand("old", "new"),
CancellationToken.None
);
Assert.False(result.IsSuccess);
Assert.Equal(AuthErrors.Unauthorized, result.Error);
await _identityService.DidNotReceive().ChangePasswordAsync(
Arg.Any<Guid>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<CancellationToken>());
await _identityService
.DidNotReceive()
.ChangePasswordAsync(
Arg.Any<Guid>(),
Arg.Any<string>(),
Arg.Any<string>(),
Arg.Any<CancellationToken>()
);
}
[Fact]
public async Task Handle_Authenticated_DelegatesToIdentityService()
{
var userId = Guid.NewGuid();
_identityService.ChangePasswordAsync(userId, "old-pass", "new-pass", Arg.Any<CancellationToken>())
_identityService
.ChangePasswordAsync(userId, "old-pass", "new-pass", Arg.Any<CancellationToken>())
.Returns(Result.Success());
var handler = new ChangePasswordCommandHandler(_identityService, FakeCurrentUser.Authenticated(userId));
var handler = new ChangePasswordCommandHandler(
_identityService,
FakeCurrentUser.Authenticated(userId)
);
var result = await handler.Handle(new ChangePasswordCommand("old-pass", "new-pass"), CancellationToken.None);
var result = await handler.Handle(
new ChangePasswordCommand("old-pass", "new-pass"),
CancellationToken.None
);
Assert.True(result.IsSuccess);
await _identityService.Received(1).ChangePasswordAsync(userId, "old-pass", "new-pass", Arg.Any<CancellationToken>());
await _identityService
.Received(1)
.ChangePasswordAsync(userId, "old-pass", "new-pass", Arg.Any<CancellationToken>());
}
[Fact]
@@ -45,12 +66,19 @@ public class ChangePasswordCommandHandlerTests
{
var userId = Guid.NewGuid();
var error = Error.Validation("Auth.WrongCurrentPassword", "Текущий пароль неверен.");
_identityService.ChangePasswordAsync(userId, "wrong", "new-pass", Arg.Any<CancellationToken>())
_identityService
.ChangePasswordAsync(userId, "wrong", "new-pass", Arg.Any<CancellationToken>())
.Returns(Result.Failure(error));
var handler = new ChangePasswordCommandHandler(_identityService, FakeCurrentUser.Authenticated(userId));
var handler = new ChangePasswordCommandHandler(
_identityService,
FakeCurrentUser.Authenticated(userId)
);
var result = await handler.Handle(new ChangePasswordCommand("wrong", "new-pass"), CancellationToken.None);
var result = await handler.Handle(
new ChangePasswordCommand("wrong", "new-pass"),
CancellationToken.None
);
Assert.False(result.IsSuccess);
Assert.Equal(error, result.Error);
@@ -27,9 +27,14 @@ public class GetCurrentUserQueryHandlerTests
public async Task Handle_ProfileMissing_ReturnsUnauthorized()
{
var userId = Guid.NewGuid();
_identityService.GetProfileAsync(userId, Arg.Any<CancellationToken>()).Returns((CurrentUserProfile?)null);
_identityService
.GetProfileAsync(userId, Arg.Any<CancellationToken>())
.Returns((CurrentUserProfile?)null);
var handler = new GetCurrentUserQueryHandler(_identityService, FakeCurrentUser.Authenticated(userId));
var handler = new GetCurrentUserQueryHandler(
_identityService,
FakeCurrentUser.Authenticated(userId)
);
var result = await handler.Handle(new GetCurrentUserQuery(), CancellationToken.None);
@@ -41,12 +46,26 @@ public class GetCurrentUserQueryHandlerTests
public async Task Handle_AuthenticatedWithProfile_ReturnsCurrentUserDto()
{
var userId = Guid.NewGuid();
var profile = new CurrentUserProfile(userId, "alice", Guid.NewGuid(), "user", true, false, 3, RoleQuota.Unlimited, "sub-token");
var profile = new CurrentUserProfile(
userId,
"alice",
Guid.NewGuid(),
"user",
true,
false,
3,
RoleQuota.Unlimited,
"sub-token"
);
_identityService.GetProfileAsync(userId, Arg.Any<CancellationToken>()).Returns(profile);
_identityService.GetTelegramLinkInfoAsync(userId, Arg.Any<CancellationToken>())
_identityService
.GetTelegramLinkInfoAsync(userId, Arg.Any<CancellationToken>())
.Returns(new TelegramLinkInfo(true, 42, "alice_tg"));
var handler = new GetCurrentUserQueryHandler(_identityService, FakeCurrentUser.Authenticated(userId, "alice"));
var handler = new GetCurrentUserQueryHandler(
_identityService,
FakeCurrentUser.Authenticated(userId, "alice")
);
var result = await handler.Handle(new GetCurrentUserQuery(), CancellationToken.None);
@@ -11,9 +11,11 @@ public class LoginCommandHandlerTests
{
private readonly IIdentityService _identityService = Substitute.For<IIdentityService>();
private readonly IJwtTokenService _jwtTokenService = Substitute.For<IJwtTokenService>();
private readonly IRefreshTokenService _refreshTokenService = Substitute.For<IRefreshTokenService>();
private readonly IRefreshTokenService _refreshTokenService =
Substitute.For<IRefreshTokenService>();
private LoginCommandHandler CreateHandler() => new(_identityService, _jwtTokenService, _refreshTokenService);
private LoginCommandHandler CreateHandler() =>
new(_identityService, _jwtTokenService, _refreshTokenService);
[Fact]
public async Task Handle_WithValidCredentials_ReturnsAuthResult()
@@ -21,20 +23,33 @@ public class LoginCommandHandlerTests
var userId = Guid.NewGuid();
var authUser = new AuthenticatedUser(userId, "alice", "user");
var profile = new CurrentUserProfile(
userId, "alice", Guid.NewGuid(), "user", IsActivated: true, IsBlocked: false, MaxConfigs: 3,
MaxIpLimit: RoleQuota.Unlimited, SubscriptionToken: "sub-token");
userId,
"alice",
Guid.NewGuid(),
"user",
IsActivated: true,
IsBlocked: false,
MaxConfigs: 3,
MaxIpLimit: RoleQuota.Unlimited,
SubscriptionToken: "sub-token"
);
_identityService.ValidateCredentialsAsync("alice", "P@ssw0rd", Arg.Any<CancellationToken>())
_identityService
.ValidateCredentialsAsync("alice", "P@ssw0rd", Arg.Any<CancellationToken>())
.Returns(Result.Success(authUser));
_identityService.GetProfileAsync(userId, Arg.Any<CancellationToken>()).Returns(profile);
_identityService.GetTelegramLinkInfoAsync(userId, Arg.Any<CancellationToken>())
_identityService
.GetTelegramLinkInfoAsync(userId, Arg.Any<CancellationToken>())
.Returns(new TelegramLinkInfo(true, 123456, "alice_tg"));
_jwtTokenService.GenerateAccessToken(Arg.Any<AuthenticatedUser>())
_jwtTokenService
.GenerateAccessToken(Arg.Any<AuthenticatedUser>())
.Returns(("access-token", DateTimeOffset.UtcNow.AddMinutes(15)));
_refreshTokenService.IssueAsync(userId, Arg.Any<CancellationToken>())
_refreshTokenService
.IssueAsync(userId, Arg.Any<CancellationToken>())
.Returns(new IssuedRefreshToken("refresh-token", DateTimeOffset.UtcNow.AddDays(30)));
var result = await CreateHandler().Handle(new LoginCommand("alice", "P@ssw0rd"), CancellationToken.None);
var result = await CreateHandler()
.Handle(new LoginCommand("alice", "P@ssw0rd"), CancellationToken.None);
Assert.True(result.IsSuccess);
Assert.Equal("access-token", result.Value.AccessToken);
@@ -46,14 +61,18 @@ public class LoginCommandHandlerTests
[Fact]
public async Task Handle_WithInvalidCredentials_ReturnsFailureWithoutIssuingTokens()
{
_identityService.ValidateCredentialsAsync("alice", "wrong", Arg.Any<CancellationToken>())
_identityService
.ValidateCredentialsAsync("alice", "wrong", Arg.Any<CancellationToken>())
.Returns(Result.Failure<AuthenticatedUser>(AuthErrors.InvalidCredentials));
var result = await CreateHandler().Handle(new LoginCommand("alice", "wrong"), CancellationToken.None);
var result = await CreateHandler()
.Handle(new LoginCommand("alice", "wrong"), CancellationToken.None);
Assert.False(result.IsSuccess);
Assert.Equal(AuthErrors.InvalidCredentials, result.Error);
await _refreshTokenService.DidNotReceive().IssueAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>());
await _refreshTokenService
.DidNotReceive()
.IssueAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>());
}
[Fact]
@@ -62,11 +81,15 @@ public class LoginCommandHandlerTests
var userId = Guid.NewGuid();
var authUser = new AuthenticatedUser(userId, "alice", "user");
_identityService.ValidateCredentialsAsync("alice", "P@ssw0rd", Arg.Any<CancellationToken>())
_identityService
.ValidateCredentialsAsync("alice", "P@ssw0rd", Arg.Any<CancellationToken>())
.Returns(Result.Success(authUser));
_identityService.GetProfileAsync(userId, Arg.Any<CancellationToken>()).Returns((CurrentUserProfile?)null);
_identityService
.GetProfileAsync(userId, Arg.Any<CancellationToken>())
.Returns((CurrentUserProfile?)null);
var result = await CreateHandler().Handle(new LoginCommand("alice", "P@ssw0rd"), CancellationToken.None);
var result = await CreateHandler()
.Handle(new LoginCommand("alice", "P@ssw0rd"), CancellationToken.None);
Assert.False(result.IsSuccess);
Assert.Equal(AuthErrors.InvalidCredentials, result.Error);
@@ -11,27 +11,46 @@ public class RefreshCommandHandlerTests
{
private readonly IIdentityService _identityService = Substitute.For<IIdentityService>();
private readonly IJwtTokenService _jwtTokenService = Substitute.For<IJwtTokenService>();
private readonly IRefreshTokenService _refreshTokenService = Substitute.For<IRefreshTokenService>();
private readonly IRefreshTokenService _refreshTokenService =
Substitute.For<IRefreshTokenService>();
private RefreshCommandHandler CreateHandler() => new(_identityService, _jwtTokenService, _refreshTokenService);
private RefreshCommandHandler CreateHandler() =>
new(_identityService, _jwtTokenService, _refreshTokenService);
[Fact]
public async Task Handle_WithValidToken_RotatesAndReturnsNewAuthResult()
{
var userId = Guid.NewGuid();
var profile = new CurrentUserProfile(
userId, "alice", Guid.NewGuid(), "user", IsActivated: true, IsBlocked: false, MaxConfigs: 3,
MaxIpLimit: RoleQuota.Unlimited, SubscriptionToken: "sub-token");
var rotated = new RotatedRefreshToken(userId, "new-refresh-token", DateTimeOffset.UtcNow.AddDays(30));
userId,
"alice",
Guid.NewGuid(),
"user",
IsActivated: true,
IsBlocked: false,
MaxConfigs: 3,
MaxIpLimit: RoleQuota.Unlimited,
SubscriptionToken: "sub-token"
);
var rotated = new RotatedRefreshToken(
userId,
"new-refresh-token",
DateTimeOffset.UtcNow.AddDays(30)
);
_refreshTokenService.RotateAsync("old-token", Arg.Any<CancellationToken>()).Returns(Result.Success(rotated));
_refreshTokenService
.RotateAsync("old-token", Arg.Any<CancellationToken>())
.Returns(Result.Success(rotated));
_identityService.GetProfileAsync(userId, Arg.Any<CancellationToken>()).Returns(profile);
_identityService.GetTelegramLinkInfoAsync(userId, Arg.Any<CancellationToken>())
_identityService
.GetTelegramLinkInfoAsync(userId, Arg.Any<CancellationToken>())
.Returns(new TelegramLinkInfo(false, null, null));
_jwtTokenService.GenerateAccessToken(Arg.Any<AuthenticatedUser>())
_jwtTokenService
.GenerateAccessToken(Arg.Any<AuthenticatedUser>())
.Returns(("new-access-token", DateTimeOffset.UtcNow.AddMinutes(15)));
var result = await CreateHandler().Handle(new RefreshCommand("old-token"), CancellationToken.None);
var result = await CreateHandler()
.Handle(new RefreshCommand("old-token"), CancellationToken.None);
Assert.True(result.IsSuccess);
Assert.Equal("new-access-token", result.Value.AccessToken);
@@ -41,26 +60,39 @@ public class RefreshCommandHandlerTests
[Fact]
public async Task Handle_WithInvalidOrReusedToken_ReturnsFailure()
{
_refreshTokenService.RotateAsync("stolen-token", Arg.Any<CancellationToken>())
_refreshTokenService
.RotateAsync("stolen-token", Arg.Any<CancellationToken>())
.Returns(Result.Failure<RotatedRefreshToken>(AuthErrors.InvalidRefreshToken));
var result = await CreateHandler().Handle(new RefreshCommand("stolen-token"), CancellationToken.None);
var result = await CreateHandler()
.Handle(new RefreshCommand("stolen-token"), CancellationToken.None);
Assert.False(result.IsSuccess);
Assert.Equal(AuthErrors.InvalidRefreshToken, result.Error);
await _identityService.DidNotReceive().GetProfileAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>());
await _identityService
.DidNotReceive()
.GetProfileAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>());
}
[Fact]
public async Task Handle_WhenProfileNoLongerExists_ReturnsInvalidRefreshToken()
{
var userId = Guid.NewGuid();
var rotated = new RotatedRefreshToken(userId, "new-refresh-token", DateTimeOffset.UtcNow.AddDays(30));
var rotated = new RotatedRefreshToken(
userId,
"new-refresh-token",
DateTimeOffset.UtcNow.AddDays(30)
);
_refreshTokenService.RotateAsync("old-token", Arg.Any<CancellationToken>()).Returns(Result.Success(rotated));
_identityService.GetProfileAsync(userId, Arg.Any<CancellationToken>()).Returns((CurrentUserProfile?)null);
_refreshTokenService
.RotateAsync("old-token", Arg.Any<CancellationToken>())
.Returns(Result.Success(rotated));
_identityService
.GetProfileAsync(userId, Arg.Any<CancellationToken>())
.Returns((CurrentUserProfile?)null);
var result = await CreateHandler().Handle(new RefreshCommand("old-token"), CancellationToken.None);
var result = await CreateHandler()
.Handle(new RefreshCommand("old-token"), CancellationToken.None);
Assert.False(result.IsSuccess);
Assert.Equal(AuthErrors.InvalidRefreshToken, result.Error);