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:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user