HAM/Berufsschule_HAM
1
0
Fork 1
mirror of https://github.com/LD-Reborn/Berufsschule_HAM.git synced 2025-12-20 06:51:55 +00:00
Code Issues Packages Projects 1 Releases Wiki Activity

Add return model to AssetsController

Browse Source
This commit is contained in:
anomny
2025-10-05 14:50:59 +02:00
parent 35d95b7783
commit d12ac659f5
6 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Controllers/AssetsController.cs
View File

@@ -106,20 +106,28 @@ public class AssetsController : Controller
}
[HttpGet("Delete")]
public async Task<bool> Delete(string cn)
public async Task<AssetsDeleteResponseModel> Delete(string cn)
{
if (cn is null) { return false; }
return await Task.Run(() =>
AssetsDeleteResponseModel response;
return await Task.Run(async () =>
{
if (cn is null)
{
response = new AssetsDeleteResponseModel(false, AssetsDeleteErrorEnum.CnIsNull);
return response;
}
try
{
_ldap.DeleteAsset(cn);
return true;
await _ldap.DeleteAssetAsync(cn);
response = new AssetsDeleteResponseModel(true, AssetsDeleteErrorEnum.None);
}
catch (Exception)
catch (Exception e)
{
return false;
response = new AssetsDeleteResponseModel(false, AssetsDeleteErrorEnum.UnableToDeleteAsset, e.Message);
}
return response;
});
}

4
src/Controllers/GroupsController.cs
View File

@@ -45,11 +45,11 @@ public class GroupsController : Controller
[HttpGet("Delete")]
public async Task<bool> Delete(string uid)
{
return await Task.Run(() =>
return await Task.Run(async () =>
{
try
{
_ldap.DeleteGroup(uid);
await _ldap.DeleteGroupAsync(uid);
return true;
}
catch (Exception)

4
src/Controllers/LocationsController.cs
View File

@@ -26,11 +26,11 @@ public class LocationsController : Controller
public async Task<bool> Delete(string cn)
{
if (cn is null) { return false; }
return await Task.Run(() =>
return await Task.Run(async () =>
{
try
{
_ldap.DeleteLocation(cn);
await _ldap.DeleteLocationAsync(cn);
return true;
}
catch (Exception)

4
src/Controllers/UsersController.cs
View File

@@ -45,11 +45,11 @@ public class UsersController : Controller
[HttpGet("Delete")]
public async Task<bool> Delete(string uid)
{
return await Task.Run(() =>
return await Task.Run(async () =>
{
try
{
_ldap.DeleteUser(uid);
await _ldap.DeleteUserAsync(uid);
return true;
}
catch (Exception)

14
src/Models/AssetsDeleteResponseModel.cs Normal file
View File

@@ -0,0 +1,14 @@
public class AssetsDeleteResponseModel(bool successful, AssetsDeleteErrorEnum errorReason, string exception = "none")
{
public bool Success { get; set; } = successful;
public AssetsDeleteErrorEnum Reason { get; set; } = errorReason;
public string? Exception { get; set; } = exception;
}
public enum AssetsDeleteErrorEnum
{
None,
CnIsNull,
UnableToDeleteAsset
}

18
src/Services/LdapService.cs
View File

@@ -275,28 +275,28 @@ public async Task CreateAsset(LdapAttributeSet attributeSet)
});
}
public void DeleteUser(string uid)
public async Task DeleteUserAsync(string uid)
{
string dn = PrependRDN($"uid={uid}", UsersBaseDn);
DeleteObjectByDn(dn);
await DeleteObjectByDnAsync(dn);
}
public void DeleteGroup(string cn)
public async Task DeleteGroupAsync(string cn)
{
string dn = PrependRDN($"cn={cn}", GroupsBaseDn);
DeleteObjectByDn(dn);
await DeleteObjectByDnAsync(dn);
}
public void DeleteLocation(string cn)
public async Task DeleteLocationAsync(string cn)
{
string dn = PrependRDN($"cn={cn}", LocationsBaseDn);
DeleteObjectByDn(dn);
await DeleteObjectByDnAsync(dn);
}
public void DeleteAsset(string cn)
public async Task DeleteAssetAsync(string cn)
{
string dn = PrependRDN($"cn={cn}", AssetsBaseDn);
DeleteObjectByDn(dn);
await DeleteObjectByDnAsync(dn);
}
public async Task UpdateUser(string uid, string attributeName, string attributeValue)
@@ -337,7 +337,7 @@ public async Task CreateAsset(LdapAttributeSet attributeSet)
}
}
public async void DeleteObjectByDn(string dn)
public async Task DeleteObjectByDnAsync(string dn)
{
await _conn.DeleteAsync(dn);
}