Refactor VPN configuration handling to remove device limit management
CI / Backend (build + test) (push) Successful in 1m24s
CI / Frontend (lint + typecheck + build) (push) Successful in 30s

- Updated the VPN configuration commands and handlers to eliminate the device limit parameter, simplifying the configuration process.
- Adjusted related API documentation to reflect the removal of device limit management, clarifying that this setting is now handled directly in the 3x-ui by node administrators.
- Enhanced the overall codebase by removing unnecessary device limit references across various components, ensuring a cleaner and more maintainable code structure.
This commit is contained in:
Leonid Pershin
2026-07-02 23:21:26 +03:00
parent 05d49a8cbd
commit bea2b5fcf7
43 changed files with 933 additions and 157 deletions
@@ -13,13 +13,12 @@ public class VpnConfigTests
var userId = Guid.NewGuid();
var inboundId = Guid.NewGuid();
var config = VpnConfig.Create(userId, inboundId, VpnProtocol.Vless, "My device", deviceLimit: 3);
var config = VpnConfig.Create(userId, inboundId, VpnProtocol.Vless, "My device");
Assert.Equal(userId, config.UserId);
Assert.Equal(inboundId, config.InboundId);
Assert.Equal(VpnProtocol.Vless, config.Protocol);
Assert.Equal("My device", config.Label);
Assert.Equal(3, config.DeviceLimit);
Assert.Equal(ConfigStatus.Active, config.Status);
Assert.Equal(string.Empty, config.ClientExternalId);
Assert.False(string.IsNullOrWhiteSpace(config.ClientEmail));
@@ -32,8 +31,8 @@ public class VpnConfigTests
public void Create_GeneratesUniqueSubscriptionTokensAndClientEmails()
{
var userId = Guid.NewGuid();
var a = VpnConfig.Create(userId, Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var b = VpnConfig.Create(userId, Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var a = VpnConfig.Create(userId, Guid.NewGuid(), VpnProtocol.Vless, null);
var b = VpnConfig.Create(userId, Guid.NewGuid(), VpnProtocol.Vless, null);
Assert.NotEqual(a.SubscriptionToken, b.SubscriptionToken);
Assert.NotEqual(a.ClientEmail, b.ClientEmail);
@@ -42,7 +41,7 @@ public class VpnConfigTests
[Fact]
public void AssignRemoteClient_SetsClientExternalId()
{
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Trojan, null, 1);
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Trojan, null);
config.AssignRemoteClient("some-remote-password");
@@ -52,7 +51,7 @@ public class VpnConfigTests
[Fact]
public void Rotate_WhenActive_ChangesEmailExternalIdAndToken()
{
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null);
config.AssignRemoteClient("old-id");
var oldToken = config.SubscriptionToken;
var oldEmail = config.ClientEmail;
@@ -70,7 +69,7 @@ public class VpnConfigTests
[InlineData(ConfigStatus.Disabled)]
public void Rotate_WhenNotActive_Throws(ConfigStatus status)
{
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null);
MoveToStatus(config, status);
Assert.Throws<DomainException>(() => config.Rotate("e", "i"));
@@ -79,7 +78,7 @@ public class VpnConfigTests
[Fact]
public void Revoke_WhenActive_SetsRevokedStatus()
{
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null);
config.Revoke();
@@ -89,7 +88,7 @@ public class VpnConfigTests
[Fact]
public void Revoke_WhenAlreadyRevoked_Throws()
{
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null);
config.Revoke();
Assert.Throws<DomainException>(() => config.Revoke());
@@ -98,7 +97,7 @@ public class VpnConfigTests
[Fact]
public void Disable_WhenActive_SetsDisabled()
{
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null);
config.Disable();
@@ -108,7 +107,7 @@ public class VpnConfigTests
[Fact]
public void Disable_WhenRevoked_DoesNotChangeStatus()
{
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null);
config.Revoke();
config.Disable();
@@ -119,7 +118,7 @@ public class VpnConfigTests
[Fact]
public void Enable_WhenDisabled_ReturnsToActive()
{
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null);
config.Disable();
config.Enable();
@@ -130,7 +129,7 @@ public class VpnConfigTests
[Fact]
public void Enable_WhenRevoked_DoesNotResurrect()
{
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null);
config.Revoke();
config.Enable();
@@ -141,7 +140,7 @@ public class VpnConfigTests
[Fact]
public void UpdateTraffic_SetsBytesAndLastSyncAt()
{
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null, 1);
var config = VpnConfig.Create(Guid.NewGuid(), Guid.NewGuid(), VpnProtocol.Vless, null);
config.UpdateTraffic(100, 200);