Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v2_ChangeArchitecture' of https://github.com/Moonlight-Panel/Moonlight into v2_ChangeArchitecture

Browse Source
This commit is contained in:
Masu-Baumgartner
2024-10-07 12:05:18 +02:00
parent 966e67afee f48e5d4b19
commit bb29177e41
10 changed files with 194 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
Moonlight.ApiServer/Http/Controllers/Admin/Users/UsersController.cs Normal file
View File

@@ -0,0 +1,81 @@
using Microsoft.AspNetCore.Mvc;
using MoonCore.Exceptions;
using MoonCore.Extended.Abstractions;
using MoonCore.Extended.Helpers;
using MoonCore.Models;
using Moonlight.ApiServer.Database.Entities;
using Moonlight.Shared.Http.Requests.Admin.Users;
using Moonlight.Shared.Http.Responses.Admin.Users;
namespace Moonlight.ApiServer.Http.Controllers.Admin.Users;
[ApiController]
[Route("api/admin/users")]
public class UsersController : Controller
{
private readonly CrudHelper<User, UserDetailResponse> CrudHelper;
private readonly DatabaseRepository<User> UserRepository;
public UsersController(CrudHelper<User, UserDetailResponse> crudHelper, DatabaseRepository<User> userRepository)
{
CrudHelper = crudHelper;
UserRepository = userRepository;
}
[HttpGet]
public async Task<IPagedData<UserDetailResponse>> Get([FromQuery] int page, [FromQuery] int pageSize = 50)
=> await CrudHelper.Get(page, pageSize);
[HttpGet("{id}")]
public async Task<UserDetailResponse> GetSingle(int id)
=> await CrudHelper.GetSingle(id);
[HttpPost]
public async Task<UserDetailResponse> Create([FromBody] CreateUserRequest request)
{
// Reformat values
request.Username = request.Username.ToLower().Trim();
request.Email = request.Email.ToLower().Trim();
// Check for users with the same values
if (UserRepository.Get().Any(x => x.Username == request.Username))
throw new HttpApiException("A user with that username already exists", 400);
if (UserRepository.Get().Any(x => x.Email == request.Email))
throw new HttpApiException("A user with that email address already exists", 400);
request.Password = HashHelper.Hash(request.Password);
return await CrudHelper.Create(request);
}
[HttpPatch("{id}")]
public async Task<UserDetailResponse> Update([FromRoute] int id, [FromBody] UpdateUserRequest request)
{
var user = await CrudHelper.GetSingleModel(id);
// Reformat values
request.Username = request.Username.ToLower().Trim();
request.Email = request.Email.ToLower().Trim();
// Check for users with the same values
if (UserRepository.Get().Any(x => x.Username == request.Username && x.Id != user.Id))
throw new HttpApiException("A user with that username already exists", 400);
if (UserRepository.Get().Any(x => x.Email == request.Email && x.Id != user.Id))
throw new HttpApiException("A user with that email address already exists", 400);
// Perform hashing the password if required
if (!string.IsNullOrEmpty(request.Password))
{
request.Password = HashHelper.Hash(request.Password);
user.TokenValidTimestamp = DateTime.UtcNow; // This change will get applied by the crud helper
}
return await CrudHelper.Update(user, request);
}
[HttpDelete("{id}")]
public async Task Delete([FromRoute] int id)
=> await CrudHelper.Delete(id);
}

2
Moonlight.ApiServer/Moonlight.ApiServer.csproj
View File

@@ -13,7 +13,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MoonCore" Version="1.5.8" />
<PackageReference Include="MoonCore.Extended" Version="1.0.2" />
<PackageReference Include="MoonCore.Extended" Version="1.0.6" />
<PackageReference Include="MoonCore.PluginFramework" Version="1.0.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/>

1
Moonlight.ApiServer/Program.cs
View File

@@ -86,6 +86,7 @@ var databaseHelper = new DatabaseHelper(
builder.Services.AddSingleton(databaseHelper);
builder.Services.AddScoped(typeof(DatabaseRepository<>));
builder.Services.AddScoped(typeof(CrudHelper<,>));
builder.Services.AddDbContext<CoreDataContext>();
databaseHelper.AddDbContext<CoreDataContext>();

1
Moonlight.Client/Moonlight.Client.csproj
View File

@@ -13,6 +13,7 @@
<PackageReference Include="MoonCore" Version="1.5.8" />
<PackageReference Include="MoonCore.Blazor" Version="1.2.1" />
<PackageReference Include="MoonCore.PluginFramework" Version="1.0.0" />
<PackageReference Include="MoonCore.Blazor.Tailwind" Version="1.0.2" />
</ItemGroup>
<ItemGroup>

2
Moonlight.Client/UI/Partials/AppHeader.razor
View File

@@ -62,7 +62,7 @@
From: "transform opacity-100 scale-100"
To: "transform opacity-0 scale-95"
-->
<div class="@(ShowProfileNav ? "opacity-100" : "opacity-0") transition ease-out duration-100 absolute right-0 z-10 mt-2.5 w-44 origin-top-right rounded-md bg-gray-750 py-2 shadow-lg ring-1 ring-gray-100/5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="user-menu-button" tabindex="-1">
<div class="@(ShowProfileNav ? "opacity-100" : "opacity-0 hidden") transition ease-out duration-100 absolute right-0 z-10 mt-2.5 w-44 origin-top-right rounded-md bg-gray-750 py-2 shadow-lg ring-1 ring-gray-100/5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="user-menu-button" tabindex="-1">
<!-- Active: "bg-gray-50", Not Active: "" -->
<a href="/admin" class="block px-3 py-1 text-sm leading-6 text-gray-100 hover:text-primary-500" role="menuitem" tabindex="-1" id="user-menu-item-0">Your profile</a>
<a @onclick="Logout" @onclick:preventDefault href="#" class="block px-3 py-1 text-sm leading-6 text-gray-100 hover:text-primary-500" role="menuitem" tabindex="-1" id="user-menu-item-1">Sign out</a>

2
Moonlight.Client/UI/Partials/AppSidebar.razor
View File

@@ -10,7 +10,7 @@
var url = new Uri(Navigation.Uri);
}
<div class="relative z-40 lg:hidden transition-opacity @(Layout.ShowMobileNavigation ? "opacity-100" : "opacity-0")" role="dialog" aria-modal="true">
<div class="relative z-40 lg:hidden transition-opacity @(Layout.ShowMobileNavigation ? "opacity-100" : "opacity-0 hidden")" role="dialog" aria-modal="true">
<div class="fixed inset-0 bg-gray-800/80"></div>
<div class="fixed inset-0 flex justify-center bg-gray-900">

65
Moonlight.Client/UI/Views/Admin/Users/Index.razor Normal file
View File

@@ -0,0 +1,65 @@
@page "/admin/users"
@using MoonCore.Blazor.Tailwind.Forms.Components
@using MoonCore.Helpers
@using MoonCore.Models
@using Moonlight.Shared.Http.Requests.Admin.Users
@using Moonlight.Shared.Http.Responses.Admin.Users
@inject HttpApiClient HttpApiClient
<Crud TItem="UserDetailResponse"
TCreateForm="CreateUserRequest"
TUpdateForm="UpdateUserRequest"
OnConfigure="OnConfigure">
<View>
<Column TItem="UserDetailResponse" Field="@(x => x.Id)" Title="Id" />
<Column TItem="UserDetailResponse" Field="@(x => x.Username)" Title="Username" />
<Column TItem="UserDetailResponse" Field="@(x => x.Email)" Title="Email" />
</View>
</Crud>
@code
{
private void OnConfigure(CrudOptions<UserDetailResponse, CreateUserRequest, UpdateUserRequest> crudOptions)
{
crudOptions.ItemName = "User";
crudOptions.ItemLoader = async (page, pageSize)
=> await HttpApiClient.GetJson<PagedData<UserDetailResponse>>($"api/admin/users?page={page}&pageSize={pageSize}");
crudOptions.SingleItemLoader = async id
=> await HttpApiClient.GetJson<UserDetailResponse>($"api/admin/users/{id}");
crudOptions.QueryIdentifier = item => item.Id.ToString(); //TODO: Make this default
crudOptions.OnCreate = async request
=> await HttpApiClient.Post("api/admin/users", request);
crudOptions.OnUpdate = async (item, request)
=> await HttpApiClient.Patch($"api/admin/users/{item.Id}", request);
crudOptions.OnDelete = async item
=> await HttpApiClient.Delete($"api/admin/users/{item.Id}");
crudOptions.OnConfigureCreate = configuration =>
{
configuration.WithField(x => x.Username);
configuration.WithField(x => x.Email);
configuration.WithField(x => x.Password)
.WithComponent<StringComponent>(component => component.Type = "password");
};
crudOptions.OnConfigureUpdate = (_, configuration) =>
{
configuration.WithField(x => x.Username);
configuration.WithField(x => x.Email);
configuration.WithField(x => x.Password, fieldConfiguration =>
{
fieldConfiguration.Description = "Optional. Specify if you want to change this accounts password";
})
.WithComponent<StringComponent>(component => component.Type = "password");
};
}
}

19
Moonlight.Shared/Http/Requests/Admin/Users/CreateUserRequest.cs Normal file
View File

@@ -0,0 +1,19 @@
using System.ComponentModel.DataAnnotations;
namespace Moonlight.Shared.Http.Requests.Admin.Users;
public class CreateUserRequest
{
[Required(ErrorMessage = "You need to provide an email address")]
[EmailAddress(ErrorMessage = "You need to provide a valid email address")]
public string Email { get; set; }
[Required(ErrorMessage = "You need to provide a username")]
[RegularExpression("^[a-z][a-z0-9]*$", ErrorMessage = "Usernames can only contain lowercase characters and numbers and should not start with a number")]
public string Username { get; set; }
[Required(ErrorMessage = "You need to provide a password")]
[MinLength(8, ErrorMessage = "Your password needs to be at least 8 characters long")]
[MaxLength(256, ErrorMessage = "Your password should not exceed the length of 256 characters")]
public string Password { get; set; }
}

16
Moonlight.Shared/Http/Requests/Admin/Users/UpdateUserRequest.cs Normal file
View File

@@ -0,0 +1,16 @@
using System.ComponentModel.DataAnnotations;
namespace Moonlight.Shared.Http.Requests.Admin.Users;
public class UpdateUserRequest
{
[Required(ErrorMessage = "You need to provide an email address")]
[EmailAddress(ErrorMessage = "You need to provide a valid email address")]
public string Email { get; set; }
[Required(ErrorMessage = "You need to provide a username")]
[RegularExpression("^[a-z][a-z0-9]*$", ErrorMessage = "Usernames can only contain lowercase characters and numbers and should not start with a number")]
public string Username { get; set; }
public string? Password { get; set; }
}

8
Moonlight.Shared/Http/Responses/Admin/Users/UserDetailResponse.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Moonlight.Shared.Http.Responses.Admin.Users;
public class UserDetailResponse
{
public int Id { get; set; }
public string Username { get; set; }
public string Email { get; set; }
}