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
@@ -4,22 +4,46 @@ namespace PnvPanel.IntegrationTests.TestSupport;
public static class AuthTestHelper
{
public sealed record CurrentUserResponse(Guid Id, string UserName, string Role, bool IsActivated, bool TelegramLinked);
public sealed record CurrentUserResponse(
Guid Id,
string UserName,
string Role,
bool IsActivated,
bool TelegramLinked
);
public sealed record LoginResponse(string AccessToken, DateTimeOffset ExpiresAt, CurrentUserResponse User);
public sealed record LoginResponse(
string AccessToken,
DateTimeOffset ExpiresAt,
CurrentUserResponse User
);
public static async Task<(Guid Id, string AccessToken)> RegisterAndLoginAsync(HttpClient client, string userName, string password)
public static async Task<(Guid Id, string AccessToken)> RegisterAndLoginAsync(
HttpClient client,
string userName,
string password
)
{
var registerResponse = await client.PostJsonAsync("/api/auth/register", new { userName, password });
var registerResponse = await client.PostJsonAsync(
"/api/auth/register",
new { userName, password }
);
registerResponse.EnsureSuccessStatusCode();
var (id, accessToken) = await LoginAsync(client, userName, password);
return (id, accessToken);
}
public static async Task<(Guid Id, string AccessToken)> LoginAsync(HttpClient client, string userName, string password)
public static async Task<(Guid Id, string AccessToken)> LoginAsync(
HttpClient client,
string userName,
string password
)
{
var loginResponse = await client.PostJsonAsync("/api/auth/login", new { userName, password });
var loginResponse = await client.PostJsonAsync(
"/api/auth/login",
new { userName, password }
);
loginResponse.EnsureSuccessStatusCode();
var login = await loginResponse.ReadAsAsync<LoginResponse>();
return (login!.User.Id, login.AccessToken);
@@ -27,7 +51,11 @@ public static class AuthTestHelper
public static async Task<string> LoginAsAdminAsync(HttpClient client)
{
var (_, accessToken) = await LoginAsync(client, PnvPanelWebApplicationFactory.AdminUserName, PnvPanelWebApplicationFactory.AdminPassword);
var (_, accessToken) = await LoginAsync(
client,
PnvPanelWebApplicationFactory.AdminUserName,
PnvPanelWebApplicationFactory.AdminPassword
);
return accessToken;
}
}
@@ -13,10 +13,13 @@ public sealed class FakeXuiPanelGateway : IXuiPanelGateway
{
public Result ValidateBaseAddress(Uri baseAddress) => Result.Success();
public Task<NodeProbeResult> ProbeAsync(Node node, CancellationToken cancellationToken)
=> Task.FromResult(new NodeProbeResult(true, null));
public Task<NodeProbeResult> ProbeAsync(Node node, CancellationToken cancellationToken) =>
Task.FromResult(new NodeProbeResult(true, null));
public Task<Result<IReadOnlyList<RemoteInboundInfo>>> ListInboundsAsync(Node node, CancellationToken cancellationToken)
public Task<Result<IReadOnlyList<RemoteInboundInfo>>> ListInboundsAsync(
Node node,
CancellationToken cancellationToken
)
{
IReadOnlyList<RemoteInboundInfo> inbounds =
[
@@ -26,32 +29,53 @@ public sealed class FakeXuiPanelGateway : IXuiPanelGateway
return Task.FromResult(Result.Success(inbounds));
}
public void InvalidateClient(Guid nodeId)
{
}
public void InvalidateClient(Guid nodeId) { }
public Task<Result<string>> AddClientAsync(
Node node, string inboundRemoteId, VpnProtocol protocol, string clientEmail, string clientName, int limitIp,
CancellationToken cancellationToken)
=> Task.FromResult(Result.Success(Guid.NewGuid().ToString()));
Node node,
string inboundRemoteId,
VpnProtocol protocol,
string clientEmail,
string clientName,
int limitIp,
CancellationToken cancellationToken
) => Task.FromResult(Result.Success(Guid.NewGuid().ToString()));
public Task<Result> RemoveClientAsync(
Node node, string inboundRemoteId, string clientExternalId, VpnProtocol protocol, CancellationToken cancellationToken)
=> Task.FromResult(Result.Success());
Node node,
string inboundRemoteId,
string clientExternalId,
VpnProtocol protocol,
CancellationToken cancellationToken
) => Task.FromResult(Result.Success());
public Task<Result> UpdateClientAsync(
Node node, string inboundRemoteId, string clientExternalId, VpnProtocol protocol,
string name, bool enable, CancellationToken cancellationToken)
=> Task.FromResult(Result.Success());
Node node,
string inboundRemoteId,
string clientExternalId,
VpnProtocol protocol,
string name,
bool enable,
CancellationToken cancellationToken
) => Task.FromResult(Result.Success());
public Task<Result<string>> BuildConnectionStringAsync(
Node node, Inbound inbound, string clientExternalId, string clientName, string publicHost, CancellationToken cancellationToken)
=> Task.FromResult(Result.Success("vless://fake-connection-string"));
Node node,
Inbound inbound,
string clientExternalId,
string clientName,
string publicHost,
CancellationToken cancellationToken
) => Task.FromResult(Result.Success("vless://fake-connection-string"));
public Task<Result<IReadOnlyDictionary<string, ClientTrafficInfo>>> GetClientTrafficAsync(
Node node, string inboundRemoteId, CancellationToken cancellationToken)
Node node,
string inboundRemoteId,
CancellationToken cancellationToken
)
{
IReadOnlyDictionary<string, ClientTrafficInfo> traffic = new Dictionary<string, ClientTrafficInfo>();
IReadOnlyDictionary<string, ClientTrafficInfo> traffic =
new Dictionary<string, ClientTrafficInfo>();
return Task.FromResult(Result.Success(traffic));
}
}
@@ -8,15 +8,24 @@ public static class HttpClientJsonExtensions
{
public static readonly JsonSerializerOptions JsonOptions = new(JsonSerializerDefaults.Web);
public static void UseBearerToken(this HttpClient client, string accessToken)
=> client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
public static void UseBearerToken(this HttpClient client, string accessToken) =>
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
"Bearer",
accessToken
);
public static async Task<T?> ReadAsAsync<T>(this HttpResponseMessage response)
=> await response.Content.ReadFromJsonAsync<T>(JsonOptions);
public static async Task<T?> ReadAsAsync<T>(this HttpResponseMessage response) =>
await response.Content.ReadFromJsonAsync<T>(JsonOptions);
public static Task<HttpResponseMessage> PostJsonAsync(this HttpClient client, string url, object body)
=> client.PostAsJsonAsync(url, body, JsonOptions);
public static Task<HttpResponseMessage> PostJsonAsync(
this HttpClient client,
string url,
object body
) => client.PostAsJsonAsync(url, body, JsonOptions);
public static Task<HttpResponseMessage> SendPutJsonAsync(this HttpClient client, string url, object body)
=> client.PutAsJsonAsync(url, body, JsonOptions);
public static Task<HttpResponseMessage> SendPutJsonAsync(
this HttpClient client,
string url,
object body
) => client.PutAsJsonAsync(url, body, JsonOptions);
}
@@ -42,20 +42,24 @@ public sealed class PnvPanelWebApplicationFactory : WebApplicationFactory<Progra
{
builder.UseEnvironment("Development");
builder.ConfigureAppConfiguration((_, config) =>
{
config.AddInMemoryCollection(new Dictionary<string, string?>
builder.ConfigureAppConfiguration(
(_, config) =>
{
["ConnectionStrings:Default"] = _postgres.GetConnectionString(),
["AdminSeed:Username"] = AdminUserName,
["AdminSeed:Password"] = AdminPassword,
// Пусто — TelegramBotHostedService при пустом токене не стартует (см. Api/Telegram/TelegramBotHostedService.cs).
["Telegram:BotToken"] = "",
// Весь collection делит один TestServer/host — все запросы идут от одного "клиента",
// дефолтный лимит 20/мин быстро исчерпывается. Поднимаем для тестового окружения.
["RateLimiting:AuthPermitLimit"] = "10000",
});
});
config.AddInMemoryCollection(
new Dictionary<string, string?>
{
["ConnectionStrings:Default"] = _postgres.GetConnectionString(),
["AdminSeed:Username"] = AdminUserName,
["AdminSeed:Password"] = AdminPassword,
// Пусто — TelegramBotHostedService при пустом токене не стартует (см. Api/Telegram/TelegramBotHostedService.cs).
["Telegram:BotToken"] = "",
// Весь collection делит один TestServer/host — все запросы идут от одного "клиента",
// дефолтный лимит 20/мин быстро исчерпывается. Поднимаем для тестового окружения.
["RateLimiting:AuthPermitLimit"] = "10000",
}
);
}
);
builder.ConfigureServices(services =>
{