Refactor client update handling to support nullable parameters for name and expiration
- Updated the `UpdateClientAsync` method in `IXuiPanelGateway` to accept nullable parameters for `name` and `expiresAt`, allowing for more flexible client management without unintended modifications. - Adjusted the `BlockUserCommandHandler`, `UnblockUserCommandHandler`, and other related command handlers to utilize the new nullable parameters, ensuring that client names remain unchanged during block/unblock operations and that expiration dates are managed correctly. - Enhanced the billing and configuration handling to reflect the new logic for managing client states based on expiration rather than enabling/disabling, improving reliability in client status management. - Updated tests to cover the new behavior and ensure proper functionality across the application.
This commit is contained in:
+6
-2
@@ -167,7 +167,8 @@ public class ConfirmPaymentRequestCommandHandlerTests
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<VpnProtocol>(),
|
||||
Arg.Any<string>(),
|
||||
enable: true,
|
||||
Arg.Any<bool?>(),
|
||||
Arg.Any<DateTimeOffset?>(),
|
||||
Arg.Any<CancellationToken>()
|
||||
)
|
||||
.Returns(Result.Success());
|
||||
@@ -192,6 +193,8 @@ public class ConfirmPaymentRequestCommandHandlerTests
|
||||
Assert.NotNull(expiredConfig.ExpiresAt);
|
||||
Assert.NotNull(activeConfig.ExpiresAt);
|
||||
Assert.Equal(expiredConfig.ExpiresAt, activeConfig.ExpiresAt);
|
||||
// enable: null — возврат из приостановки теперь идёт через expiresAt (новый newPaidUntil),
|
||||
// а не через переключение enable (см. IXuiPanelGateway.UpdateClientAsync).
|
||||
await _gateway
|
||||
.Received(1)
|
||||
.UpdateClientAsync(
|
||||
@@ -200,7 +203,8 @@ public class ConfirmPaymentRequestCommandHandlerTests
|
||||
"ext-1",
|
||||
VpnProtocol.Vless,
|
||||
Arg.Any<string>(),
|
||||
enable: true,
|
||||
null,
|
||||
Arg.Is<DateTimeOffset?>(d => d == expiredConfig.ExpiresAt),
|
||||
Arg.Any<CancellationToken>()
|
||||
);
|
||||
}
|
||||
|
||||
+2
-1
@@ -128,7 +128,8 @@ public class ApproveExtensionRequestCommandHandlerTests
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<VpnProtocol>(),
|
||||
Arg.Any<string>(),
|
||||
enable: true,
|
||||
Arg.Any<bool?>(),
|
||||
Arg.Any<DateTimeOffset?>(),
|
||||
Arg.Any<CancellationToken>()
|
||||
)
|
||||
.Returns(Result.Success());
|
||||
|
||||
+12
-5
@@ -54,7 +54,8 @@ public class BlockUserCommandHandlerTests
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<VpnProtocol>(),
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<bool>(),
|
||||
Arg.Any<bool?>(),
|
||||
Arg.Any<DateTimeOffset?>(),
|
||||
Arg.Any<CancellationToken>()
|
||||
);
|
||||
}
|
||||
@@ -91,7 +92,8 @@ public class BlockUserCommandHandlerTests
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<VpnProtocol>(),
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<bool>(),
|
||||
Arg.Any<bool?>(),
|
||||
Arg.Any<DateTimeOffset?>(),
|
||||
Arg.Any<CancellationToken>()
|
||||
)
|
||||
.Returns(Result.Success());
|
||||
@@ -111,6 +113,8 @@ public class BlockUserCommandHandlerTests
|
||||
Assert.True(result.IsSuccess);
|
||||
Assert.Equal(ConfigStatus.Disabled, config.Status);
|
||||
|
||||
// name: null — блокировка не переименовывает клиента; expiresAt: null — блокировка не трогает
|
||||
// срок оплаты (см. IXuiPanelGateway.UpdateClientAsync).
|
||||
await _gateway
|
||||
.Received(1)
|
||||
.UpdateClientAsync(
|
||||
@@ -118,8 +122,9 @@ public class BlockUserCommandHandlerTests
|
||||
inbound.RemoteInboundId,
|
||||
config.ClientExternalId,
|
||||
config.Protocol,
|
||||
"my-config",
|
||||
null,
|
||||
enable: false,
|
||||
expiresAt: null,
|
||||
Arg.Any<CancellationToken>()
|
||||
);
|
||||
await _notifier
|
||||
@@ -168,7 +173,8 @@ public class BlockUserCommandHandlerTests
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<VpnProtocol>(),
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<bool>(),
|
||||
Arg.Any<bool?>(),
|
||||
Arg.Any<DateTimeOffset?>(),
|
||||
Arg.Any<CancellationToken>()
|
||||
);
|
||||
}
|
||||
@@ -205,7 +211,8 @@ public class BlockUserCommandHandlerTests
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<VpnProtocol>(),
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<bool>(),
|
||||
Arg.Any<bool?>(),
|
||||
Arg.Any<DateTimeOffset?>(),
|
||||
Arg.Any<CancellationToken>()
|
||||
)
|
||||
.Returns(Result.Failure(Error.Failure("Xui.UpdateClientFailed", "Нода недоступна.")));
|
||||
|
||||
+5
-2
@@ -54,7 +54,8 @@ public class UnblockUserCommandHandlerTests
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<VpnProtocol>(),
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<bool>(),
|
||||
Arg.Any<bool?>(),
|
||||
Arg.Any<DateTimeOffset?>(),
|
||||
Arg.Any<CancellationToken>()
|
||||
)
|
||||
.Returns(Result.Success());
|
||||
@@ -81,6 +82,7 @@ public class UnblockUserCommandHandlerTests
|
||||
config.Protocol,
|
||||
Arg.Any<string>(),
|
||||
true,
|
||||
null,
|
||||
Arg.Any<CancellationToken>()
|
||||
);
|
||||
await _notifier
|
||||
@@ -155,7 +157,8 @@ public class UnblockUserCommandHandlerTests
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<VpnProtocol>(),
|
||||
Arg.Any<string>(),
|
||||
Arg.Any<bool>(),
|
||||
Arg.Any<bool?>(),
|
||||
Arg.Any<DateTimeOffset?>(),
|
||||
Arg.Any<CancellationToken>()
|
||||
)
|
||||
.Returns(Result.Failure(Error.Failure("Xui.UpdateClientFailed", "Нода недоступна.")));
|
||||
|
||||
Reference in New Issue
Block a user