Refactor project files for improved readability and structure
- 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:
+50
-20
@@ -15,21 +15,37 @@ public class RequireActivationBehaviorTests
|
||||
private readonly ICurrentUser _currentUser = Substitute.For<ICurrentUser>();
|
||||
private readonly IIdentityService _identityService = Substitute.For<IIdentityService>();
|
||||
|
||||
private RequireActivationBehavior<DummyRequest, Result<string>> CreateBehavior() => new(_currentUser, _identityService);
|
||||
private RequireActivationBehavior<DummyRequest, Result<string>> CreateBehavior() =>
|
||||
new(_currentUser, _identityService);
|
||||
|
||||
private static CurrentUserProfile CreateProfile(Guid userId, bool isActivated) =>
|
||||
new(userId, "alice", Guid.NewGuid(), "user", IsActivated: isActivated, IsBlocked: false, MaxConfigs: 3,
|
||||
MaxIpLimit: RoleQuota.Unlimited, SubscriptionToken: "sub-token");
|
||||
new(
|
||||
userId,
|
||||
"alice",
|
||||
Guid.NewGuid(),
|
||||
"user",
|
||||
IsActivated: isActivated,
|
||||
IsBlocked: false,
|
||||
MaxConfigs: 3,
|
||||
MaxIpLimit: RoleQuota.Unlimited,
|
||||
SubscriptionToken: "sub-token"
|
||||
);
|
||||
|
||||
[Fact]
|
||||
public async Task Handle_WhenActivated_CallsNext()
|
||||
{
|
||||
var userId = Guid.NewGuid();
|
||||
_currentUser.UserId.Returns(userId);
|
||||
_identityService.GetProfileAsync(userId, Arg.Any<CancellationToken>()).Returns(CreateProfile(userId, isActivated: true));
|
||||
_identityService
|
||||
.GetProfileAsync(userId, Arg.Any<CancellationToken>())
|
||||
.Returns(CreateProfile(userId, isActivated: true));
|
||||
|
||||
var result = await CreateBehavior().Handle(
|
||||
new DummyRequest(), () => Task.FromResult(Result.Success("ok")), CancellationToken.None);
|
||||
var result = await CreateBehavior()
|
||||
.Handle(
|
||||
new DummyRequest(),
|
||||
() => Task.FromResult(Result.Success("ok")),
|
||||
CancellationToken.None
|
||||
);
|
||||
|
||||
Assert.True(result.IsSuccess);
|
||||
Assert.Equal("ok", result.Value);
|
||||
@@ -40,17 +56,21 @@ public class RequireActivationBehaviorTests
|
||||
{
|
||||
var userId = Guid.NewGuid();
|
||||
_currentUser.UserId.Returns(userId);
|
||||
_identityService.GetProfileAsync(userId, Arg.Any<CancellationToken>()).Returns(CreateProfile(userId, isActivated: false));
|
||||
_identityService
|
||||
.GetProfileAsync(userId, Arg.Any<CancellationToken>())
|
||||
.Returns(CreateProfile(userId, isActivated: false));
|
||||
var nextCalled = false;
|
||||
|
||||
var result = await CreateBehavior().Handle(
|
||||
new DummyRequest(),
|
||||
() =>
|
||||
{
|
||||
nextCalled = true;
|
||||
return Task.FromResult(Result.Success("ok"));
|
||||
},
|
||||
CancellationToken.None);
|
||||
var result = await CreateBehavior()
|
||||
.Handle(
|
||||
new DummyRequest(),
|
||||
() =>
|
||||
{
|
||||
nextCalled = true;
|
||||
return Task.FromResult(Result.Success("ok"));
|
||||
},
|
||||
CancellationToken.None
|
||||
);
|
||||
|
||||
Assert.False(result.IsSuccess);
|
||||
Assert.Equal(AuthErrors.NotActivated, result.Error);
|
||||
@@ -62,8 +82,12 @@ public class RequireActivationBehaviorTests
|
||||
{
|
||||
_currentUser.UserId.Returns((Guid?)null);
|
||||
|
||||
var result = await CreateBehavior().Handle(
|
||||
new DummyRequest(), () => Task.FromResult(Result.Success("ok")), CancellationToken.None);
|
||||
var result = await CreateBehavior()
|
||||
.Handle(
|
||||
new DummyRequest(),
|
||||
() => Task.FromResult(Result.Success("ok")),
|
||||
CancellationToken.None
|
||||
);
|
||||
|
||||
Assert.False(result.IsSuccess);
|
||||
Assert.Equal(AuthErrors.Unauthorized, result.Error);
|
||||
@@ -74,10 +98,16 @@ public class RequireActivationBehaviorTests
|
||||
{
|
||||
var userId = Guid.NewGuid();
|
||||
_currentUser.UserId.Returns(userId);
|
||||
_identityService.GetProfileAsync(userId, Arg.Any<CancellationToken>()).Returns((CurrentUserProfile?)null);
|
||||
_identityService
|
||||
.GetProfileAsync(userId, Arg.Any<CancellationToken>())
|
||||
.Returns((CurrentUserProfile?)null);
|
||||
|
||||
var result = await CreateBehavior().Handle(
|
||||
new DummyRequest(), () => Task.FromResult(Result.Success("ok")), CancellationToken.None);
|
||||
var result = await CreateBehavior()
|
||||
.Handle(
|
||||
new DummyRequest(),
|
||||
() => Task.FromResult(Result.Success("ok")),
|
||||
CancellationToken.None
|
||||
);
|
||||
|
||||
Assert.False(result.IsSuccess);
|
||||
Assert.Equal(AuthErrors.Unauthorized, result.Error);
|
||||
|
||||
Reference in New Issue
Block a user