azaion/admin
1
0
Fork 0
mirror of https://github.com/azaion/admin.git synced 2026-04-22 07:06:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

add ClearFolder, ListResources, GetInstaller

Browse Source 
endpoints
This commit is contained in:
Alex Bezdieniezhnykh
2025-06-13 23:27:37 +03:00
parent c15167f21d
commit 3be7062993
5 changed files with 109 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Azaion.Services/ResourcesService.cs
+47 -8
View File
@@ -8,18 +8,36 @@ namespace Azaion.Services;
public interface IResourcesService
{
(string?, Stream?) GetInstaller(string? dataFolder);
Task<Stream> GetEncryptedResource(string? dataFolder, string fileName, string key, CancellationToken cancellationToken = default);
Task SaveResource(string? dataFolder, IFormFile data, CancellationToken cancellationToken = default);
Task<IEnumerable<string>> ListResources(string? dataFolder, string? search, CancellationToken cancellationToken = default);
void ClearFolder(string? dataFolder);
}
public class ResourcesService(IOptions<ResourcesConfig> resourcesConfig, ILogger<ResourcesService> logger) : IResourcesService
{
private string GetResourceFolder(string? dataFolder)
{
return string.IsNullOrWhiteSpace(dataFolder)
? resourcesConfig.Value.ResourcesFolder
: Path.Combine(resourcesConfig.Value.ResourcesFolder, dataFolder);
}
public (string?, Stream?) GetInstaller(string? dataFolder)
{
var suiteFolder = Path.Combine(resourcesConfig.Value.ResourcesFolder, dataFolder ?? resourcesConfig.Value.SuiteInstallerFolder);
var installer = new DirectoryInfo(suiteFolder).GetFiles("AzaionSuite.Iterative*").FirstOrDefault();
if (installer == null)
return (null, null);
var fileStream = new FileStream(installer.FullName, FileMode.Open, FileAccess.Read);
return (installer.Name, fileStream);
}
public async Task<Stream> GetEncryptedResource(string? dataFolder, string fileName, string key, CancellationToken cancellationToken = default)
{
var resourcePath = string.IsNullOrWhiteSpace(dataFolder)
? Path.Combine(resourcesConfig.Value.ResourcesFolder, fileName)
: Path.Combine(resourcesConfig.Value.ResourcesFolder, dataFolder, fileName);
var fileStream = new FileStream(resourcePath, FileMode.Open, FileAccess.Read);
var fileStream = new FileStream(Path.Combine(GetResourceFolder(dataFolder), fileName), FileMode.Open, FileAccess.Read);
var ms = new MemoryStream();
await fileStream.EncryptTo(ms, key, cancellationToken);
@@ -31,10 +49,7 @@ public class ResourcesService(IOptions<ResourcesConfig> resourcesConfig, ILogger
{
if (data == null)
throw new BusinessException(ExceptionEnum.NoFileProvided);
var resourceFolder = string.IsNullOrWhiteSpace(dataFolder)
? resourcesConfig.Value.ResourcesFolder
: Path.Combine(resourcesConfig.Value.ResourcesFolder, dataFolder);
var resourceFolder = GetResourceFolder(dataFolder);
if (!Directory.Exists(resourceFolder))
Directory.CreateDirectory(resourceFolder);
@@ -45,4 +60,28 @@ public class ResourcesService(IOptions<ResourcesConfig> resourcesConfig, ILogger
await data.CopyToAsync(fileStream, cancellationToken);
logger.LogInformation($"Resource {data.FileName} Saved Successfully");
}
public async Task<IEnumerable<string>> ListResources(string? dataFolder, string? search, CancellationToken cancellationToken = default)
{
var resourceFolder = GetResourceFolder(dataFolder);
return await Task.FromResult(
(string.IsNullOrWhiteSpace(search)
? new DirectoryInfo(resourceFolder).GetFiles()
: new DirectoryInfo(resourceFolder).GetFiles(search))
.Select(f => f.Name)
.ToList());
}
public void ClearFolder(string? dataFolder)
{
var di = new DirectoryInfo(GetResourceFolder(dataFolder));
if (!di.Exists)
return;
foreach (var file in di.GetFiles())
file.Delete();
foreach (var dir in di.GetDirectories())
dir.Delete(true);
}
}
Azaion.Services/UserService.cs
+23 -23
View File
@@ -10,22 +10,22 @@ namespace Azaion.Services;
public interface IUserService
{
Task RegisterUser(RegisterUserRequest request, CancellationToken cancellationToken = default);
Task<User> ValidateUser(LoginRequest request, CancellationToken cancellationToken = default);
Task<User?> GetByEmail(string? email, CancellationToken cancellationToken = default);
Task UpdateHardware(string email, string? hardware = null, CancellationToken cancellationToken = default);
Task UpdateQueueOffsets(string email, UserQueueOffsets queueOffsets, CancellationToken cancellationToken = default);
Task<IEnumerable<User>> GetUsers(string? searchEmail, RoleEnum? searchRole, CancellationToken cancellationToken);
Task<string> CheckHardwareHash(User user, GetResourceRequest request);
Task RegisterUser(RegisterUserRequest request, CancellationToken ct = default);
Task<User> ValidateUser(LoginRequest request, CancellationToken ct = default);
Task<User?> GetByEmail(string? email, CancellationToken ct = default);
Task UpdateHardware(string email, string? hardware = null, CancellationToken ct = default);
Task UpdateQueueOffsets(string email, UserQueueOffsets queueOffsets, CancellationToken ct = default);
Task<IEnumerable<User>> GetUsers(string? searchEmail, RoleEnum? searchRole, CancellationToken ct = default);
Task<string> CheckHardwareHash(User user, GetResourceRequest request, CancellationToken ct = default);
}
public class UserService(IDbFactory dbFactory, ICache cache) : IUserService
{
public async Task RegisterUser(RegisterUserRequest request, CancellationToken cancellationToken = default)
public async Task RegisterUser(RegisterUserRequest request, CancellationToken ct = default)
{
await dbFactory.RunAdmin(async db =>
{
var existingUser = await db.Users.FirstOrDefaultAsync(u => u.Email == request.Email, token: cancellationToken);
var existingUser = await db.Users.FirstOrDefaultAsync(u => u.Email == request.Email, token: ct);
if (existingUser != null)
throw new BusinessException(ExceptionEnum.EmailExists);
@@ -35,24 +35,24 @@ public class UserService(IDbFactory dbFactory, ICache cache) : IUserService
Email = request.Email,
PasswordHash = request.Password.ToHash(),
Role = request.Role
}, token: cancellationToken);
}, token: ct);
});
}
public async Task<User?> GetByEmail(string? email, CancellationToken cancellationToken = default)
public async Task<User?> GetByEmail(string? email, CancellationToken ct = default)
{
if (string.IsNullOrWhiteSpace(email)) throw new ArgumentNullException(nameof(email));
return await cache.GetFromCacheAsync(User.GetCacheKey(email),
async () => await dbFactory.Run(async db =>
await db.Users.FirstOrDefaultAsync(x => x.Email == email, cancellationToken)));
await db.Users.FirstOrDefaultAsync(x => x.Email == email, ct)));
}
public async Task<User> ValidateUser(LoginRequest request, CancellationToken cancellationToken = default) =>
public async Task<User> ValidateUser(LoginRequest request, CancellationToken ct = default) =>
await dbFactory.Run(async db =>
{
var user = await db.Users.FirstOrDefaultAsync(x => x.Email == request.Email, token: cancellationToken);
var user = await db.Users.FirstOrDefaultAsync(x => x.Email == request.Email, token: ct);
if (user == null)
throw new BusinessException(ExceptionEnum.NoEmailFound);
@@ -63,21 +63,21 @@ public class UserService(IDbFactory dbFactory, ICache cache) : IUserService
});
public async Task UpdateHardware(string email, string? hardware = null, CancellationToken cancellationToken = default)
public async Task UpdateHardware(string email, string? hardware = null, CancellationToken ct = default)
{
await dbFactory.RunAdmin(async db =>
{
await db.Users.UpdateAsync(x => x.Email == email,
u => new User { Hardware = hardware }, token: cancellationToken);
u => new User { Hardware = hardware }, token: ct);
});
cache.Invalidate(User.GetCacheKey(email));
}
public async Task UpdateQueueOffsets(string email, UserQueueOffsets queueOffsets, CancellationToken cancellationToken = default)
public async Task UpdateQueueOffsets(string email, UserQueueOffsets queueOffsets, CancellationToken ct = default)
{
await dbFactory.RunAdmin(async db =>
{
var userConfig = await db.Users.Where(x => x.Email == email).Select(x => x.UserConfig).FirstOrDefaultAsync(token: cancellationToken);
var userConfig = await db.Users.Where(x => x.Email == email).Select(x => x.UserConfig).FirstOrDefaultAsync(token: ct);
userConfig ??= new UserConfig();
userConfig.QueueOffsets = queueOffsets;
@@ -85,28 +85,28 @@ public class UserService(IDbFactory dbFactory, ICache cache) : IUserService
u => new User
{
UserConfig = userConfig
}, token: cancellationToken);
}, token: ct);
});
cache.Invalidate(User.GetCacheKey(email));
}
public async Task<IEnumerable<User>> GetUsers(string? searchEmail, RoleEnum? searchRole, CancellationToken cancellationToken) =>
public async Task<IEnumerable<User>> GetUsers(string? searchEmail, RoleEnum? searchRole, CancellationToken ct) =>
await dbFactory.Run(async db =>
await db.Users
.WhereIf(!string.IsNullOrEmpty(searchEmail),
u => u.Email.ToLower().Contains(searchEmail!.ToLower()))
.WhereIf(searchRole != null,
u => u.Role == searchRole)
.ToListAsync(token: cancellationToken));
.ToListAsync(token: ct));
public async Task<string> CheckHardwareHash(User user, GetResourceRequest request)
public async Task<string> CheckHardwareHash(User user, GetResourceRequest request, CancellationToken ct = default)
{
var requestHWHash = Security.GetHWHash(request.Hardware);
//For the new users Hardware would be empty, fill it with actual hardware on the very first request
if (string.IsNullOrEmpty(user.Hardware))
{
await UpdateHardware(user.Email, request.Hardware);
await UpdateHardware(user.Email, request.Hardware, ct);
cache.Invalidate(User.GetCacheKey(user.Email));
return requestHWHash;
}