Compare commits
12 Commits
c0c18f2ddd
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78135a9f6d | ||
|
|
231e29f877 | ||
|
|
17a0be20b3 | ||
|
|
2f4823ed09 | ||
|
|
1759e8a2d4 | ||
|
|
865797d3f8 | ||
|
|
cefa47a176 | ||
|
|
c4d7fd6ed5 | ||
|
|
f4f04e4a42 | ||
|
|
6807f2b6e6 | ||
|
|
0dd0c1bf4c | ||
|
|
87f26f9367 |
@@ -23,6 +23,9 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
dotnet-version: "9.0.x"
|
dotnet-version: "9.0.x"
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: dotnet test
|
||||||
|
|
||||||
- name: Publish server project
|
- name: Publish server project
|
||||||
run: dotnet publish ./FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj -c Release -o ./Publish/Server
|
run: dotnet publish ./FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj -c Release -o ./Publish/Server
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
dotnet-version: "9.0.x"
|
dotnet-version: "9.0.x"
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: dotnet test
|
||||||
|
|
||||||
- name: Publish server project
|
- name: Publish server project
|
||||||
run: dotnet publish ./FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj -c Release -o ./Publish/Server
|
run: dotnet publish ./FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj -c Release -o ./Publish/Server
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,32 @@ namespace FoodsharingSiegen.Contracts.Enums
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The remove interaction audit type
|
/// The remove interaction audit type
|
||||||
/// </summary>
|
/// </summary>
|
||||||
RemoveInteraction = 100
|
RemoveInteraction = 100,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The delete prospect images audit type
|
||||||
|
/// </summary>
|
||||||
|
DeleteProspectImages = 110,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The view prospect images audit type
|
||||||
|
/// </summary>
|
||||||
|
ViewProspectImages = 120,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The upload prospect image audit type
|
||||||
|
/// </summary>
|
||||||
|
UploadProspectImage = 130,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The request password reset audit type
|
||||||
|
/// </summary>
|
||||||
|
RequestPasswordReset = 140,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The change own password audit type
|
||||||
|
/// </summary>
|
||||||
|
ChangeOwnPassword = 150
|
||||||
|
|
||||||
#endregion Prospects
|
#endregion Prospects
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -251,6 +251,14 @@ namespace FoodsharingSiegen.Server.Auth
|
|||||||
user.ResetToken = resetToken;
|
user.ResetToken = resetToken;
|
||||||
user.ResetTokenExpiry = DateTime.UtcNow.AddMinutes(30);
|
user.ResetTokenExpiry = DateTime.UtcNow.AddMinutes(30);
|
||||||
|
|
||||||
|
Context.Audits?.Add(new Audit
|
||||||
|
{
|
||||||
|
Created = DateTime.Now,
|
||||||
|
Type = AuditType.RequestPasswordReset,
|
||||||
|
UserID = user.Id,
|
||||||
|
Data1 = user.Mail
|
||||||
|
});
|
||||||
|
|
||||||
await Context.SaveChangesAsync();
|
await Context.SaveChangesAsync();
|
||||||
|
|
||||||
var resetLink = $"{baseUri.TrimEnd('/')}/reset-password/{resetToken}";
|
var resetLink = $"{baseUri.TrimEnd('/')}/reset-password/{resetToken}";
|
||||||
|
|||||||
@@ -43,7 +43,20 @@ namespace FoodsharingSiegen.Server.Controls
|
|||||||
{
|
{
|
||||||
var headerText = $"{type.Translate(AppSettings)} für {Prospect.Name} eintragen";
|
var headerText = $"{type.Translate(AppSettings)} für {Prospect.Name} eintragen";
|
||||||
|
|
||||||
await InteractionDialog.ShowAsync(ModalService, new(type, Prospect.Id, headerText, OnDataChanged));
|
Func<Task> onSuccess = async () =>
|
||||||
|
{
|
||||||
|
if (type == InteractionType.IdCheck && Prospect.Images != null && Prospect.Images.Count > 0)
|
||||||
|
{
|
||||||
|
await ConfirmDialog.ShowAsync(ModalService, "Personalausweisbilder löschen?", $"Möchtest du die Personalausweisbilder von {Prospect.Name} löschen? Diese werden für die weitere Bearbeitung nicht mehr benötigt und enthalten persönliche Daten.", async () =>
|
||||||
|
{
|
||||||
|
var result = await ProspectService.DeleteVerificationImagesAsync(Prospect.Id);
|
||||||
|
await OnDataChanged();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
await OnDataChanged();
|
||||||
|
};
|
||||||
|
|
||||||
|
await InteractionDialog.ShowAsync(ModalService, new(type, Prospect.Id, headerText, onSuccess));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,6 +37,16 @@ namespace FoodsharingSiegen.Server.Data
|
|||||||
return $"hat dem Neuling {audit.Data1} folgendes hinzugefügt: {audit.Data2}";
|
return $"hat dem Neuling {audit.Data1} folgendes hinzugefügt: {audit.Data2}";
|
||||||
case AuditType.RemoveInteraction:
|
case AuditType.RemoveInteraction:
|
||||||
return $"hat eine Interaktion bei {audit.Data1} gelöscht.";
|
return $"hat eine Interaktion bei {audit.Data1} gelöscht.";
|
||||||
|
case AuditType.DeleteProspectImages:
|
||||||
|
return $"hat die Bilder von {audit.Data1} gelöscht.";
|
||||||
|
case AuditType.ViewProspectImages:
|
||||||
|
return $"hat die Bilder von {audit.Data1} angesehen.";
|
||||||
|
case AuditType.UploadProspectImage:
|
||||||
|
return $"hat ein Bild für {audit.Data1} hochgeladen.";
|
||||||
|
case AuditType.RequestPasswordReset:
|
||||||
|
return $"hat ein Passwort-Reset für {audit.Data1} angefordert.";
|
||||||
|
case AuditType.ChangeOwnPassword:
|
||||||
|
return $"hat das eigene Passwort geändert.";
|
||||||
case AuditType.None:
|
case AuditType.None:
|
||||||
default:
|
default:
|
||||||
return $"{audit.Data1}, {audit.Data2}";
|
return $"{audit.Data1}, {audit.Data2}";
|
||||||
|
|||||||
@@ -47,7 +47,10 @@ namespace FoodsharingSiegen.Server.Data
|
|||||||
/// <param name="options">The options (ab)</param>
|
/// <param name="options">The options (ab)</param>
|
||||||
public FsContext(DbContextOptions<FsContext> options) : base(options)
|
public FsContext(DbContextOptions<FsContext> options) : base(options)
|
||||||
{
|
{
|
||||||
Database.Migrate();
|
if (Database.IsRelational())
|
||||||
|
{
|
||||||
|
Database.Migrate();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -44,7 +44,11 @@ namespace FoodsharingSiegen.Server.Data.Service
|
|||||||
Data1 = data1,
|
Data1 = data1,
|
||||||
Data2 = data2
|
Data2 = data2
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Console.WriteLine();
|
||||||
|
Console.WriteLine(DateTime.Now.ToString() + " " + CurrentUser?.Name + " " + AuditHelper.CreateText(audit));
|
||||||
|
Console.WriteLine();
|
||||||
|
|
||||||
Context.Audits?.Add(audit);
|
Context.Audits?.Add(audit);
|
||||||
var saveR = await Context.SaveChangesAsync();
|
var saveR = await Context.SaveChangesAsync();
|
||||||
|
|
||||||
@@ -61,29 +65,56 @@ namespace FoodsharingSiegen.Server.Data.Service
|
|||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Public Method Load
|
#region Public Method GetCount
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Loads the count (a. beging, 23.05.2022)
|
/// Gets the total count (ab)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="count">The count</param>
|
|
||||||
/// <param name="type">The type</param>
|
/// <param name="type">The type</param>
|
||||||
/// <returns>A task containing an operation result of list audit</returns>
|
/// <returns>A task containing an operation result of count</returns>
|
||||||
public async Task<OperationResult<List<Audit>>> Load(int count, AuditType? type = null)
|
public async Task<OperationResult<int>> GetCount(AuditType? type = null)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await Task.CompletedTask;
|
var query = Context.Audits?.AsQueryable();
|
||||||
|
|
||||||
var query = Context.Audits?.Include(x => x.User).OrderByDescending(x => x.Created).AsQueryable();
|
|
||||||
|
|
||||||
if (count > 0)
|
|
||||||
query = query?.Take(count);
|
|
||||||
|
|
||||||
if (type != null)
|
if (type != null)
|
||||||
query = query?.Where(x => x.Type == type);
|
query = query?.Where(x => x.Type == type);
|
||||||
|
|
||||||
var mat = query?.ToList();
|
if (query == null) return new(0);
|
||||||
|
|
||||||
|
var count = await query.CountAsync();
|
||||||
|
return new(count);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
return new(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Public Method LoadPage
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Loads the page of audits (ab)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="skip">The skip count</param>
|
||||||
|
/// <param name="take">The take count</param>
|
||||||
|
/// <param name="type">The type</param>
|
||||||
|
/// <returns>A task containing an operation result of list audit</returns>
|
||||||
|
public async Task<OperationResult<List<Audit>>> LoadPage(int skip, int take, AuditType? type = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var query = Context.Audits?.Include(x => x.User).OrderByDescending(x => x.Created).AsQueryable();
|
||||||
|
|
||||||
|
if (type != null)
|
||||||
|
query = query?.Where(x => x.Type == type);
|
||||||
|
|
||||||
|
query = query?.Skip(skip).Take(take);
|
||||||
|
|
||||||
|
var mat = await query!.ToListAsync();
|
||||||
|
|
||||||
if (mat != null) return new(mat);
|
if (mat != null) return new(mat);
|
||||||
|
|
||||||
|
|||||||
@@ -290,6 +290,8 @@ namespace FoodsharingSiegen.Server.Data.Service
|
|||||||
await Context.ProspectImages!.AddAsync(image);
|
await Context.ProspectImages!.AddAsync(image);
|
||||||
await Context.SaveChangesAsync();
|
await Context.SaveChangesAsync();
|
||||||
|
|
||||||
|
await AuditService.Insert(AuditType.UploadProspectImage, prospect.Name);
|
||||||
|
|
||||||
return new();
|
return new();
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -308,6 +310,16 @@ namespace FoodsharingSiegen.Server.Data.Service
|
|||||||
.OrderBy(x => x.Created)
|
.OrderBy(x => x.Created)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
|
var prospectName = await Context.Prospects!
|
||||||
|
.Where(x => x.Id == prospectId)
|
||||||
|
.Select(x => x.Name)
|
||||||
|
.FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(prospectName))
|
||||||
|
{
|
||||||
|
await AuditService.Insert(AuditType.ViewProspectImages, prospectName);
|
||||||
|
}
|
||||||
|
|
||||||
return new(images);
|
return new(images);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -329,6 +341,7 @@ namespace FoodsharingSiegen.Server.Data.Service
|
|||||||
if (prospect != null)
|
if (prospect != null)
|
||||||
{
|
{
|
||||||
prospect.VerificationToken = null; // Clear token when images are deleted
|
prospect.VerificationToken = null; // Clear token when images are deleted
|
||||||
|
await AuditService.Insert(AuditType.DeleteProspectImages, prospect.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
await Context.SaveChangesAsync();
|
await Context.SaveChangesAsync();
|
||||||
|
|||||||
@@ -105,6 +105,13 @@ namespace FoodsharingSiegen.Server.Data.Service
|
|||||||
var user = await Context.Users!.Include(x => x.Interactions).FirstOrDefaultAsync(x => x.Id == userId);
|
var user = await Context.Users!.Include(x => x.Interactions).FirstOrDefaultAsync(x => x.Id == userId);
|
||||||
if (user == null) return new(new Exception("User not found"));
|
if (user == null) return new(new Exception("User not found"));
|
||||||
|
|
||||||
|
if (user.Type == UserType.Admin)
|
||||||
|
{
|
||||||
|
var adminCount = await Context.Users!.CountAsync(x => x.Type == UserType.Admin && x.Id != userId);
|
||||||
|
if (adminCount == 0)
|
||||||
|
return new(new Exception("Der letzte Administrator kann nicht gelöscht werden."));
|
||||||
|
}
|
||||||
|
|
||||||
// Interaktionen vom aktuellen Nutzer übernehmen
|
// Interaktionen vom aktuellen Nutzer übernehmen
|
||||||
if(CurrentUser?.Id != null)
|
if(CurrentUser?.Id != null)
|
||||||
foreach (var userInteraction in user.Interactions)
|
foreach (var userInteraction in user.Interactions)
|
||||||
@@ -151,8 +158,14 @@ namespace FoodsharingSiegen.Server.Data.Service
|
|||||||
|
|
||||||
if (saveR < 1) return new(new Exception("Fehler beim Speichern"));
|
if (saveR < 1) return new(new Exception("Fehler beim Speichern"));
|
||||||
|
|
||||||
var auditData = CurrentUser?.Id == user.Id ? "sich selbst" : user.Mail;
|
if (CurrentUser?.Id == user.Id)
|
||||||
await AuditService.Insert(AuditType.SetUserPassword, auditData);
|
{
|
||||||
|
await AuditService.Insert(AuditType.ChangeOwnPassword);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await AuditService.Insert(AuditType.SetUserPassword, user.Mail);
|
||||||
|
}
|
||||||
|
|
||||||
return new();
|
return new();
|
||||||
}
|
}
|
||||||
@@ -178,6 +191,13 @@ namespace FoodsharingSiegen.Server.Data.Service
|
|||||||
var entityUser = await Context.Users!.FirstOrDefaultAsync(x => x.Id == user.Id);
|
var entityUser = await Context.Users!.FirstOrDefaultAsync(x => x.Id == user.Id);
|
||||||
if (entityUser == null) return new(new Exception("User not found"));
|
if (entityUser == null) return new(new Exception("User not found"));
|
||||||
|
|
||||||
|
if (entityUser.Type == UserType.Admin && user.Type != UserType.Admin)
|
||||||
|
{
|
||||||
|
var adminCount = await Context.Users!.CountAsync(x => x.Type == UserType.Admin && x.Id != user.Id);
|
||||||
|
if (adminCount == 0)
|
||||||
|
return new(new Exception("Der Typ des letzten Administrators kann nicht geändert werden."));
|
||||||
|
}
|
||||||
|
|
||||||
if (entityUser.Mail != user.Mail ||
|
if (entityUser.Mail != user.Mail ||
|
||||||
entityUser.Type != user.Type ||
|
entityUser.Type != user.Type ||
|
||||||
entityUser.Groups != user.Groups)
|
entityUser.Groups != user.Groups)
|
||||||
|
|||||||
@@ -127,9 +127,10 @@ namespace FoodsharingSiegen.Server.Dialogs
|
|||||||
Interaction.UserID = CurrentUser.Id;
|
Interaction.UserID = CurrentUser.Id;
|
||||||
|
|
||||||
var addR = await ProspectService.AddInteraction(Interaction);
|
var addR = await ProspectService.AddInteraction(Interaction);
|
||||||
if (addR.Success && OnSuccess != null) await OnSuccess.Invoke();
|
|
||||||
|
|
||||||
await ModalService.Hide();
|
await ModalService.Hide();
|
||||||
|
|
||||||
|
if (addR.Success && OnSuccess != null) await OnSuccess.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -13,6 +13,8 @@
|
|||||||
|
|
||||||
<DataGrid TItem="Audit"
|
<DataGrid TItem="Audit"
|
||||||
Data="@Audits"
|
Data="@Audits"
|
||||||
|
ReadData="@OnReadData"
|
||||||
|
TotalItems="@TotalAudits"
|
||||||
VirtualizeOptions="@(new() { DataGridHeight = "100%", DataGridMaxHeight = "100%"})"
|
VirtualizeOptions="@(new() { DataGridHeight = "100%", DataGridMaxHeight = "100%"})"
|
||||||
Virtualize="true"
|
Virtualize="true"
|
||||||
Responsive>
|
Responsive>
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
|
using Blazorise.DataGrid;
|
||||||
using FoodsharingSiegen.Contracts.Entity;
|
using FoodsharingSiegen.Contracts.Entity;
|
||||||
|
using FoodsharingSiegen.Contracts.Helper;
|
||||||
using FoodsharingSiegen.Server.Data.Service;
|
using FoodsharingSiegen.Server.Data.Service;
|
||||||
using Microsoft.AspNetCore.Components;
|
using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
@@ -26,16 +28,47 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private List<Audit>? Audits { get; set; }
|
private List<Audit>? Audits { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the value of the total audits (ab)
|
||||||
|
/// </summary>
|
||||||
|
private int TotalAudits { get; set; }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Override InitializeDataAsync
|
#region Override InitializeDataAsync
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override async Task InitializeDataAsync()
|
protected override Task InitializeDataAsync()
|
||||||
{
|
{
|
||||||
var loadR = await AuditService?.Load(100)!;
|
if (!CurrentUser.IsAdmin()) NavigationManager.NavigateTo("/");
|
||||||
if (loadR.Success)
|
return Task.CompletedTask;
|
||||||
Audits = loadR.Data;
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Private Method OnReadData
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Called when data is read (ab)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="e">The params</param>
|
||||||
|
private async Task OnReadData(DataGridReadDataEventArgs<Audit> e)
|
||||||
|
{
|
||||||
|
if (!CurrentUser.IsAdmin()) return;
|
||||||
|
|
||||||
|
var countLoad = await AuditService?.GetCount()!;
|
||||||
|
if (countLoad.Success)
|
||||||
|
TotalAudits = countLoad.Data;
|
||||||
|
|
||||||
|
// Default fallback if VirtualizeCount is not set, though Blazor shouldn't do this usually
|
||||||
|
var limit = e.VirtualizeCount > 0 ? e.VirtualizeCount : 50;
|
||||||
|
var offset = e.VirtualizeOffset;
|
||||||
|
|
||||||
|
var itemsLoad = await AuditService?.LoadPage(offset, limit)!;
|
||||||
|
if (itemsLoad.Success)
|
||||||
|
Audits = itemsLoad.Data;
|
||||||
|
|
||||||
|
await InvokeAsync(StateHasChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -20,6 +20,8 @@
|
|||||||
{
|
{
|
||||||
<div class="alert alert-success text-center">
|
<div class="alert alert-success text-center">
|
||||||
Wenn ein Benutzerkonto mit dieser E-Mail-Adresse existiert, wurde eine E-Mail mit weiteren Anweisungen versendet.
|
Wenn ein Benutzerkonto mit dieser E-Mail-Adresse existiert, wurde eine E-Mail mit weiteren Anweisungen versendet.
|
||||||
|
<br><br>
|
||||||
|
<small><b>Hinweis:</b> Bitte überprüfe auch deinen Spam-Ordner, falls du künftige E-Mails nicht im regulären Posteingang findest.</small>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center mt-4">
|
<div class="text-center mt-4">
|
||||||
<a href="/login" class="btn btn-outline-primary"><i class="fas fa-arrow-left mr-2"></i> Zurück zum Login</a>
|
<a href="/login" class="btn btn-outline-primary"><i class="fas fa-arrow-left mr-2"></i> Zurück zum Login</a>
|
||||||
|
|||||||
@@ -55,13 +55,13 @@
|
|||||||
</div>
|
</div>
|
||||||
</CardBody>
|
</CardBody>
|
||||||
<CardFooter Class="d-flex justify-content-between">
|
<CardFooter Class="d-flex justify-content-between">
|
||||||
<div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<Button Color="Color.Primary" Size="Size.Small" Clicked="() => EditUser(user)"><Icon Name="IconName.Edit" /></Button>
|
<Button Color="Color.Primary" Size="Size.Small" Clicked="() => EditUser(user)"><Icon Name="IconName.Edit" /></Button>
|
||||||
<Button Color="Color.Info" Size="Size.Small" Clicked="() => SetPassword(user)"><i class="fa-solid fa-key"></i></Button>
|
<Button Color="Color.Info" Size="Size.Small" Clicked="() => SetPassword(user)"><i class="fa-solid fa-key"></i></Button>
|
||||||
<Button Color="Color.Secondary" Size="Size.Small" Clicked="() => SendPasswordSetupMail(user)"><Icon Name="IconName.Mail" /></Button>
|
<Button Color="Color.Secondary" Size="Size.Small" Clicked="() => SendPasswordSetupMail(user)"><Icon Name="IconName.Mail" /></Button>
|
||||||
<Button Color="Color.Danger" Size="Size.Small" Clicked="() => RemoveUserAsync(user)"><Icon Name="IconName.Delete" /></Button>
|
@if (!(user.Type == UserType.Admin && SortedUsers.Count(x => x.Type == UserType.Admin) <= 1))
|
||||||
|
{
|
||||||
|
<Button Color="Color.Danger" Size="Size.Small" Clicked="() => RemoveUserAsync(user)"><Icon Name="IconName.Delete" /></Button>
|
||||||
|
}
|
||||||
</CardFooter>
|
</CardFooter>
|
||||||
</Card>
|
</Card>
|
||||||
}
|
}
|
||||||
@@ -105,12 +105,16 @@
|
|||||||
</Field>
|
</Field>
|
||||||
<Field>
|
<Field>
|
||||||
<FieldLabel>Typ</FieldLabel>
|
<FieldLabel>Typ</FieldLabel>
|
||||||
<Select TValue="UserType" SelectedValue="EditModel.Type" SelectedValueChanged="@(v => EditModel.Type = v)">
|
<Select TValue="UserType" SelectedValue="EditModel.Type" SelectedValueChanged="@(v => EditModel.Type = v)" Disabled="@IsLastAdmin">
|
||||||
@foreach (var enumValue in Enum.GetValues<UserType>())
|
@foreach (var enumValue in Enum.GetValues<UserType>())
|
||||||
{
|
{
|
||||||
<SelectItem TValue="UserType" Value="enumValue">@enumValue</SelectItem>
|
<SelectItem TValue="UserType" Value="enumValue">@enumValue</SelectItem>
|
||||||
}
|
}
|
||||||
</Select>
|
</Select>
|
||||||
|
@if (IsLastAdmin)
|
||||||
|
{
|
||||||
|
<small class="text-danger mt-1 d-block">Das ist der letzte Administrator-Account. Der Typ kann nicht geändert werden.</small>
|
||||||
|
}
|
||||||
</Field>
|
</Field>
|
||||||
<Field>
|
<Field>
|
||||||
<FieldLabel>Gruppen</FieldLabel>
|
<FieldLabel>Gruppen</FieldLabel>
|
||||||
|
|||||||
@@ -57,6 +57,11 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private bool IsEditing { get; set; }
|
private bool IsEditing { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets a value indicating whether the current editing user is the last admin
|
||||||
|
/// </summary>
|
||||||
|
private bool IsLastAdmin => IsEditing && EditModel?.Type == UserType.Admin && UserList?.Count(x => x.Type == UserType.Admin) <= 1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the value of the user groups (ab)
|
/// Gets the value of the user groups (ab)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -126,6 +131,10 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
await ConfirmDialog.ShowAsync(ModalService, "Bestätigen", $"Soll eine E-Mail zum Festlegen des Passworts an {user.Mail} gesendet werden?", async () =>
|
await ConfirmDialog.ShowAsync(ModalService, "Bestätigen", $"Soll eine E-Mail zum Festlegen des Passworts an {user.Mail} gesendet werden?", async () =>
|
||||||
{
|
{
|
||||||
await AuthService.InitiateInitialPasswordSetup(user.Mail, NavigationManager.BaseUri);
|
await AuthService.InitiateInitialPasswordSetup(user.Mail, NavigationManager.BaseUri);
|
||||||
|
if (Notification != null)
|
||||||
|
{
|
||||||
|
await Notification.Success("E-Mail gesendet. Bitte weise den Benutzer darauf hin, auch den Spam-Ordner zu prüfen.");
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,12 +189,6 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// <returns>A task that represents the asynchronous remove operation.</returns>
|
/// <returns>A task that represents the asynchronous remove operation.</returns>
|
||||||
private async Task RemoveUserAsync(User user)
|
private async Task RemoveUserAsync(User user)
|
||||||
{
|
{
|
||||||
if (user.IsAdmin())
|
|
||||||
{
|
|
||||||
await Notification.Error("Admins können nicht gelöscht werden!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await ConfirmDialog.ShowAsync(ModalService, "Bestätigen", $"User {user.Mail} löschen?", async () =>
|
await ConfirmDialog.ShowAsync(ModalService, "Bestätigen", $"User {user.Mail} löschen?", async () =>
|
||||||
{
|
{
|
||||||
var removeR = await UserService.RemoveAsync(user.Id);
|
var removeR = await UserService.RemoveAsync(user.Id);
|
||||||
|
|||||||
@@ -14,18 +14,18 @@
|
|||||||
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
|
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
|
||||||
<meta name="apple-mobile-web-app-title" content="Foodsharing Einarbeitungen" />
|
<meta name="apple-mobile-web-app-title" content="Foodsharing Einarbeitungen" />
|
||||||
<link rel="manifest" href="/site.webmanifest" />
|
<link rel="manifest" href="/site.webmanifest" />
|
||||||
<link rel="stylesheet" href="css/bootstrap/bootstrap.min.css"/>
|
<link rel="stylesheet" href="~/css/bootstrap/bootstrap.min.css" asp-append-version="true" />
|
||||||
<link href="css/site.css" rel="stylesheet"/>
|
<link href="~/css/site.css" rel="stylesheet" asp-append-version="true" />
|
||||||
<link href="FoodsharingSiegen.Server.styles.css" rel="stylesheet"/>
|
<link href="~/FoodsharingSiegen.Server.styles.css" rel="stylesheet" asp-append-version="true" />
|
||||||
|
|
||||||
<!-- Material CSS -->
|
<!-- Material CSS -->
|
||||||
<link href="css/material.min.css" rel="stylesheet">
|
<link href="~/css/material.min.css" rel="stylesheet" asp-append-version="true" />
|
||||||
|
|
||||||
<!-- Add Material font (Roboto) and Material icon as needed -->
|
<!-- Add Material font (Roboto) and Material icon as needed -->
|
||||||
<link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i|Roboto+Mono:300,400,700|Roboto+Slab:300,400,700" rel="stylesheet">
|
<link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i|Roboto+Mono:300,400,700|Roboto+Slab:300,400,700" rel="stylesheet">
|
||||||
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
||||||
|
|
||||||
<link href="css/all.min.css" rel="stylesheet" />
|
<link href="~/css/all.min.css" rel="stylesheet" asp-append-version="true" />
|
||||||
<link href="_content/Blazorise/blazorise.css?v=1.7.5.0" rel="stylesheet" />
|
<link href="_content/Blazorise/blazorise.css?v=1.7.5.0" rel="stylesheet" />
|
||||||
<link href="_content/Blazorise.Material/blazorise.material.css?v=1.7.5.0" rel="stylesheet" />
|
<link href="_content/Blazorise.Material/blazorise.material.css?v=1.7.5.0" rel="stylesheet" />
|
||||||
<link href="_content/Blazorise.Icons.Material/blazorise.icons.material.css?v=1.7.5.0" rel="stylesheet" />
|
<link href="_content/Blazorise.Icons.Material/blazorise.icons.material.css?v=1.7.5.0" rel="stylesheet" />
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using FoodsharingSiegen.Contracts.Model;
|
using FoodsharingSiegen.Contracts.Model;
|
||||||
using MailKit.Net.Smtp;
|
using MailKit.Net.Smtp;
|
||||||
@@ -15,15 +16,17 @@ namespace FoodsharingSiegen.Server.Service
|
|||||||
{
|
{
|
||||||
private readonly MailSettings _mailSettings;
|
private readonly MailSettings _mailSettings;
|
||||||
private readonly TermSettings _termSettings;
|
private readonly TermSettings _termSettings;
|
||||||
|
private readonly Func<ISmtpClient> _smtpClientFactory;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="MailService"/> class.
|
/// Initializes a new instance of the <see cref="MailService"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="appSettings">The configured application settings injected by DI, containing the <see cref="MailSettings"/>.</param>
|
/// <param name="appSettings">The configured application settings injected by DI, containing the <see cref="MailSettings"/>.</param>
|
||||||
public MailService(IOptions<AppSettings> appSettings)
|
public MailService(IOptions<AppSettings> appSettings, Func<ISmtpClient>? smtpClientFactory = null)
|
||||||
{
|
{
|
||||||
_mailSettings = appSettings.Value.Mail;
|
_mailSettings = appSettings.Value.Mail;
|
||||||
_termSettings = appSettings.Value.Terms;
|
_termSettings = appSettings.Value.Terms;
|
||||||
|
_smtpClientFactory = smtpClientFactory ?? (() => new SmtpClient());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
@@ -40,7 +43,7 @@ namespace FoodsharingSiegen.Server.Service
|
|||||||
};
|
};
|
||||||
email.Body = textPart;
|
email.Body = textPart;
|
||||||
|
|
||||||
using var smtp = new SmtpClient();
|
using var smtp = _smtpClientFactory();
|
||||||
var secureOptions = _mailSettings.UseSsl ? SecureSocketOptions.StartTls : SecureSocketOptions.Auto;
|
var secureOptions = _mailSettings.UseSsl ? SecureSocketOptions.StartTls : SecureSocketOptions.Auto;
|
||||||
|
|
||||||
await smtp.ConnectAsync(_mailSettings.Host, _mailSettings.Port, secureOptions);
|
await smtp.ConnectAsync(_mailSettings.Host, _mailSettings.Port, secureOptions);
|
||||||
|
|||||||
@@ -64,15 +64,15 @@
|
|||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
|
||||||
|
|
||||||
<div class="nav-item px-3">
|
<div class="nav-item px-3">
|
||||||
<div @onclick="NavLinkClickedAsync">
|
<div @onclick="NavLinkClickedAsync">
|
||||||
<NavLink class="nav-link" href="audit" Match="NavLinkMatch.All">
|
<NavLink class="nav-link" href="audit" Match="NavLinkMatch.All">
|
||||||
<span class="fa-solid fa-clock-rotate-left mr-2" aria-hidden="true" style="font-size: 1.4em;"></span> Aktivitäten
|
<span class="fa-solid fa-clock-rotate-left mr-2" aria-hidden="true" style="font-size: 1.4em;"></span> Aktivitäten
|
||||||
</NavLink>
|
</NavLink>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
}
|
||||||
|
|
||||||
<div class="flex-grow-1"></div>
|
<div class="flex-grow-1"></div>
|
||||||
|
|
||||||
|
|||||||
27
FoodsharingSiegen.Tests/FoodsharingSiegen.Tests.csproj
Normal file
27
FoodsharingSiegen.Tests/FoodsharingSiegen.Tests.csproj
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<IsPackable>false</IsPackable>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="coverlet.collector" Version="6.0.4" />
|
||||||
|
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.2" />
|
||||||
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
|
||||||
|
<PackageReference Include="Moq" Version="4.20.72" />
|
||||||
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
|
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Using Include="Xunit" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\FoodsharingSiegen.Server\FoodsharingSiegen.Server.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
87
FoodsharingSiegen.Tests/LocalStorageServiceTests.cs
Normal file
87
FoodsharingSiegen.Tests/LocalStorageServiceTests.cs
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using FoodsharingSiegen.Server.Service;
|
||||||
|
using Microsoft.JSInterop;
|
||||||
|
using Moq;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace FoodsharingSiegen.Tests
|
||||||
|
{
|
||||||
|
public class LocalStorageServiceTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public async Task GetItem_ReturnsDeserializedObject_WhenItemExists()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var mockJsRuntime = new Mock<IJSRuntime>();
|
||||||
|
var service = new LocalStorageService(mockJsRuntime.Object);
|
||||||
|
var expectedObject = new { Name = "Test" };
|
||||||
|
var jsonString = JsonSerializer.Serialize(expectedObject);
|
||||||
|
|
||||||
|
mockJsRuntime.Setup(x => x.InvokeAsync<string>("localStorage.getItem", It.IsAny<object[]>()))
|
||||||
|
.ReturnsAsync(jsonString);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
var result = await service.GetItem<dynamic>("testKey");
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
Assert.NotNull(result);
|
||||||
|
mockJsRuntime.Verify(x => x.InvokeAsync<string>("localStorage.getItem", It.Is<object[]>(args => args.Length == 1 && args[0].ToString() == "testKey")), Times.Once);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task GetItem_ReturnsDefault_WhenItemDoesNotExist()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var mockJsRuntime = new Mock<IJSRuntime>();
|
||||||
|
var service = new LocalStorageService(mockJsRuntime.Object);
|
||||||
|
|
||||||
|
mockJsRuntime.Setup(x => x.InvokeAsync<string>("localStorage.getItem", It.IsAny<object[]>()))
|
||||||
|
.ReturnsAsync((string?)null);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
var result = await service.GetItem<string>("testKey");
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
Assert.Null(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task SetItem_CallsSetItemInLocalStorage()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var mockJsRuntime = new Mock<IJSRuntime>();
|
||||||
|
var service = new LocalStorageService(mockJsRuntime.Object);
|
||||||
|
var objectToSave = new { Name = "Test" };
|
||||||
|
var expectedJson = JsonSerializer.Serialize(objectToSave);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
await service.SetItem("testKey", objectToSave);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
// Note: InvokeVoidAsync is an extension method that calls InvokeAsync<IJSVoidResult> under the hood in Blazor.
|
||||||
|
mockJsRuntime.Verify(
|
||||||
|
x => x.InvokeAsync<It.IsAnyType>(
|
||||||
|
"localStorage.setItem",
|
||||||
|
It.Is<object[]>(args => args.Length == 2 && args[0].ToString() == "testKey" && args[1].ToString() == expectedJson)),
|
||||||
|
Times.Once);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task RemoveItem_CallsRemoveItemInLocalStorage()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var mockJsRuntime = new Mock<IJSRuntime>();
|
||||||
|
var service = new LocalStorageService(mockJsRuntime.Object);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
await service.RemoveItem("testKey");
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
mockJsRuntime.Verify(
|
||||||
|
x => x.InvokeAsync<It.IsAnyType>(
|
||||||
|
"localStorage.removeItem",
|
||||||
|
It.Is<object[]>(args => args.Length == 1 && args[0].ToString() == "testKey")),
|
||||||
|
Times.Once);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
110
FoodsharingSiegen.Tests/MailServiceTests.cs
Normal file
110
FoodsharingSiegen.Tests/MailServiceTests.cs
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using FoodsharingSiegen.Contracts.Model;
|
||||||
|
using FoodsharingSiegen.Server.Service;
|
||||||
|
using MailKit.Net.Smtp;
|
||||||
|
using MailKit.Security;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using MimeKit;
|
||||||
|
using Moq;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace FoodsharingSiegen.Tests
|
||||||
|
{
|
||||||
|
public class MailServiceTests
|
||||||
|
{
|
||||||
|
private readonly Mock<IOptions<AppSettings>> _mockOptions;
|
||||||
|
private readonly AppSettings _appSettings;
|
||||||
|
private readonly Mock<ISmtpClient> _mockSmtpClient;
|
||||||
|
|
||||||
|
public MailServiceTests()
|
||||||
|
{
|
||||||
|
_appSettings = new AppSettings
|
||||||
|
{
|
||||||
|
Mail = new MailSettings
|
||||||
|
{
|
||||||
|
Host = "smtp.test.com",
|
||||||
|
Port = 587,
|
||||||
|
UseSsl = false,
|
||||||
|
Username = "user@test.com",
|
||||||
|
Password = "password123",
|
||||||
|
FromAddress = "no-reply@test.com"
|
||||||
|
},
|
||||||
|
Terms = new TermSettings
|
||||||
|
{
|
||||||
|
Title = "Foodsharing Test"
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
_mockOptions = new Mock<IOptions<AppSettings>>();
|
||||||
|
_mockOptions.Setup(o => o.Value).Returns(_appSettings);
|
||||||
|
|
||||||
|
_mockSmtpClient = new Mock<ISmtpClient>();
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task SendEmailAsync_ConnectsAuthenticatesAndSendsEmail()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var service = new MailService(_mockOptions.Object, () => _mockSmtpClient.Object);
|
||||||
|
var toEmail = "recipient@test.com";
|
||||||
|
var subject = "Test Subject";
|
||||||
|
var body = "<p>Test Body</p>";
|
||||||
|
|
||||||
|
// Act
|
||||||
|
await service.SendEmailAsync(toEmail, subject, body);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
_mockSmtpClient.Verify(
|
||||||
|
x => x.ConnectAsync(
|
||||||
|
"smtp.test.com",
|
||||||
|
587,
|
||||||
|
SecureSocketOptions.Auto,
|
||||||
|
It.IsAny<CancellationToken>()),
|
||||||
|
Times.Once);
|
||||||
|
|
||||||
|
_mockSmtpClient.Verify(
|
||||||
|
x => x.AuthenticateAsync(
|
||||||
|
"user@test.com",
|
||||||
|
"password123",
|
||||||
|
It.IsAny<CancellationToken>()),
|
||||||
|
Times.Once);
|
||||||
|
|
||||||
|
// Verify a MimeMessage is passed to SendAsync with correct attributes
|
||||||
|
_mockSmtpClient.Verify(
|
||||||
|
x => x.SendAsync(
|
||||||
|
It.Is<MimeMessage>(m => m.Subject == subject),
|
||||||
|
It.IsAny<CancellationToken>(),
|
||||||
|
It.IsAny<MailKit.ITransferProgress>()),
|
||||||
|
Times.Once);
|
||||||
|
|
||||||
|
_mockSmtpClient.Verify(
|
||||||
|
x => x.DisconnectAsync(
|
||||||
|
true,
|
||||||
|
It.IsAny<CancellationToken>()),
|
||||||
|
Times.Once);
|
||||||
|
|
||||||
|
_mockSmtpClient.Verify(
|
||||||
|
x => x.Dispose(),
|
||||||
|
Times.Once);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task SendEmailAsync_SkipsAuthentication_WhenUsernameIsBlank()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
_appSettings.Mail.Username = "";
|
||||||
|
_appSettings.Mail.Password = "";
|
||||||
|
var service = new MailService(_mockOptions.Object, () => _mockSmtpClient.Object);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
await service.SendEmailAsync("recipient@test.com", "Subject", "Body");
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
_mockSmtpClient.Verify(
|
||||||
|
x => x.AuthenticateAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()),
|
||||||
|
Times.Never);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
236
FoodsharingSiegen.Tests/UserServiceTests.cs
Normal file
236
FoodsharingSiegen.Tests/UserServiceTests.cs
Normal file
@@ -0,0 +1,236 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using FoodsharingSiegen.Contracts.Entity;
|
||||||
|
using FoodsharingSiegen.Contracts.Enums;
|
||||||
|
using FoodsharingSiegen.Contracts.Model;
|
||||||
|
using FoodsharingSiegen.Server.Auth;
|
||||||
|
using FoodsharingSiegen.Server.Data;
|
||||||
|
using FoodsharingSiegen.Server.Data.Service;
|
||||||
|
using FoodsharingSiegen.Server.Service;
|
||||||
|
using Microsoft.AspNetCore.Components.Authorization;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using Microsoft.JSInterop;
|
||||||
|
using Moq;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace FoodsharingSiegen.Tests
|
||||||
|
{
|
||||||
|
public class UserServiceTests
|
||||||
|
{
|
||||||
|
private FsContext CreateInMemoryContext(string dbName)
|
||||||
|
{
|
||||||
|
var options = new DbContextOptionsBuilder<FsContext>()
|
||||||
|
.UseInMemoryDatabase(databaseName: dbName)
|
||||||
|
.Options;
|
||||||
|
return new FsContext(options);
|
||||||
|
}
|
||||||
|
|
||||||
|
private AuthService CreateAuthService(FsContext context, User? currentUser = null)
|
||||||
|
{
|
||||||
|
var mockJsRuntime = new Mock<IJSRuntime>();
|
||||||
|
var localStorageService = new LocalStorageService(mockJsRuntime.Object);
|
||||||
|
var authStateProvider = new Mock<AuthenticationStateProvider>();
|
||||||
|
var mailService = new Mock<IMailService>();
|
||||||
|
var appSettings = new Mock<IOptions<AppSettings>>();
|
||||||
|
appSettings.Setup(x => x.Value).Returns(new AppSettings());
|
||||||
|
|
||||||
|
var authService = new AuthService(context, localStorageService, authStateProvider.Object, mailService.Object, appSettings.Object);
|
||||||
|
|
||||||
|
if (currentUser != null)
|
||||||
|
{
|
||||||
|
var field = typeof(AuthService).GetField("_user", BindingFlags.NonPublic | BindingFlags.Instance);
|
||||||
|
field?.SetValue(authService, currentUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
return authService;
|
||||||
|
}
|
||||||
|
|
||||||
|
private AuditService CreateAuditService(FsContext context, AuthService authService)
|
||||||
|
{
|
||||||
|
return new AuditService(context, authService);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task AddUserAsync_Fails_WhenEmailAlreadyExists()
|
||||||
|
{
|
||||||
|
var dbName = Guid.NewGuid().ToString();
|
||||||
|
using var context = CreateInMemoryContext(dbName);
|
||||||
|
var authService = CreateAuthService(context);
|
||||||
|
var auditService = CreateAuditService(context, authService);
|
||||||
|
var userService = new UserService(context, authService, auditService);
|
||||||
|
|
||||||
|
context.Users!.Add(new User { Mail = "existing@example.com", Name = "Existing", Password = "123" });
|
||||||
|
context.SaveChanges();
|
||||||
|
|
||||||
|
var result = await userService.AddUserAsync(new User { Mail = "EXISTING@example.com", Name = "New" });
|
||||||
|
|
||||||
|
Assert.False(result.Success);
|
||||||
|
Assert.Equal("Diese E-Mail Adresse wird bereits verwendet", result.ErrorMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task AddUserAsync_Succeeds_AndSetsPasswordEmpty_IfNull()
|
||||||
|
{
|
||||||
|
var dbName = Guid.NewGuid().ToString();
|
||||||
|
using var context = CreateInMemoryContext(dbName);
|
||||||
|
var authService = CreateAuthService(context);
|
||||||
|
var auditService = CreateAuditService(context, authService);
|
||||||
|
var userService = new UserService(context, authService, auditService);
|
||||||
|
|
||||||
|
var newUser = new User { Mail = "new@example.com", Name = "New", };
|
||||||
|
|
||||||
|
var result = await userService.AddUserAsync(newUser);
|
||||||
|
|
||||||
|
Assert.True(result.Success);
|
||||||
|
Assert.Equal(string.Empty, result.Data?.Password);
|
||||||
|
Assert.NotNull(result.Data?.Created);
|
||||||
|
Assert.Single(context.Users!);
|
||||||
|
Assert.Single(context.Audits!);
|
||||||
|
Assert.Equal(AuditType.CreateUser, context.Audits!.First().Type);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task RemoveAsync_TransferInteractions_AndRemovesUser()
|
||||||
|
{
|
||||||
|
var dbName = Guid.NewGuid().ToString();
|
||||||
|
using var context = CreateInMemoryContext(dbName);
|
||||||
|
|
||||||
|
var currentUser = new User { Id = Guid.NewGuid(), Mail = "current@example.com" };
|
||||||
|
var authService = CreateAuthService(context, currentUser);
|
||||||
|
var auditService = CreateAuditService(context, authService);
|
||||||
|
var userService = new UserService(context, authService, auditService);
|
||||||
|
|
||||||
|
var userToRemove = new User { Id = Guid.NewGuid(), Mail = "remove@example.com", Type = UserType.User };
|
||||||
|
context.Users!.Add(currentUser);
|
||||||
|
context.Users!.Add(userToRemove);
|
||||||
|
|
||||||
|
context.Interactions!.Add(new Interaction { Id = Guid.NewGuid(), UserID = userToRemove.Id });
|
||||||
|
context.Audits!.Add(new Audit { Id = Guid.NewGuid(), UserID = userToRemove.Id, Type = AuditType.None });
|
||||||
|
context.SaveChanges();
|
||||||
|
|
||||||
|
var result = await userService.RemoveAsync(userToRemove.Id);
|
||||||
|
|
||||||
|
Assert.True(result.Success);
|
||||||
|
Assert.Empty(context.Users!.Where(u => u.Id == userToRemove.Id));
|
||||||
|
var interaction = context.Interactions!.First();
|
||||||
|
Assert.Equal(currentUser.Id, interaction.UserID);
|
||||||
|
Assert.Single(context.Audits!.Where(a => a.Type == AuditType.RemoveUser)); // created audit for remove
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task RemoveAsync_Fails_WhenLastAdmin()
|
||||||
|
{
|
||||||
|
var dbName = Guid.NewGuid().ToString();
|
||||||
|
using var context = CreateInMemoryContext(dbName);
|
||||||
|
var authService = CreateAuthService(context);
|
||||||
|
var auditService = CreateAuditService(context, authService);
|
||||||
|
var userService = new UserService(context, authService, auditService);
|
||||||
|
|
||||||
|
var admin = new User { Id = Guid.NewGuid(), Mail = "admin@example.com", Type = UserType.Admin };
|
||||||
|
context.Users!.Add(admin);
|
||||||
|
context.SaveChanges();
|
||||||
|
|
||||||
|
var result = await userService.RemoveAsync(admin.Id);
|
||||||
|
|
||||||
|
Assert.False(result.Success);
|
||||||
|
Assert.Equal("Der letzte Administrator kann nicht gelöscht werden.", result.ErrorMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task SetPassword_Fails_IfUserNotFound()
|
||||||
|
{
|
||||||
|
var dbName = Guid.NewGuid().ToString();
|
||||||
|
using var context = CreateInMemoryContext(dbName);
|
||||||
|
var authService = CreateAuthService(context);
|
||||||
|
var auditService = CreateAuditService(context, authService);
|
||||||
|
var userService = new UserService(context, authService, auditService);
|
||||||
|
|
||||||
|
var result = await userService.SetPassword(new User { Id = Guid.NewGuid(), Password = "P" });
|
||||||
|
|
||||||
|
Assert.False(result.Success);
|
||||||
|
Assert.Equal("User not found", result.ErrorMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task SetPassword_Succeeds()
|
||||||
|
{
|
||||||
|
var dbName = Guid.NewGuid().ToString();
|
||||||
|
using var context = CreateInMemoryContext(dbName);
|
||||||
|
var authService = CreateAuthService(context);
|
||||||
|
var auditService = CreateAuditService(context, authService);
|
||||||
|
var userService = new UserService(context, authService, auditService);
|
||||||
|
|
||||||
|
var user = new User { Id = Guid.NewGuid(), Mail = "test@example.com", Password = "Old" };
|
||||||
|
context.Users!.Add(user);
|
||||||
|
context.SaveChanges();
|
||||||
|
|
||||||
|
var result = await userService.SetPassword(new User { Id = user.Id, Password = "New" });
|
||||||
|
|
||||||
|
Assert.True(result.Success);
|
||||||
|
Assert.Equal("New", context.Users!.First().Password);
|
||||||
|
Assert.Equal(AuditType.SetUserPassword, context.Audits!.First().Type);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Update_Fails_IfNoChanges()
|
||||||
|
{
|
||||||
|
var dbName = Guid.NewGuid().ToString();
|
||||||
|
using var context = CreateInMemoryContext(dbName);
|
||||||
|
var authService = CreateAuthService(context);
|
||||||
|
var auditService = CreateAuditService(context, authService);
|
||||||
|
var userService = new UserService(context, authService, auditService);
|
||||||
|
|
||||||
|
var user = new User { Id = Guid.NewGuid(), Mail = "a@a.com", Type = UserType.User };
|
||||||
|
context.Users!.Add(user);
|
||||||
|
context.SaveChanges();
|
||||||
|
|
||||||
|
var result = await userService.Update(new User { Id = user.Id, Mail = "a@a.com", Type = UserType.User });
|
||||||
|
|
||||||
|
Assert.False(result.Success);
|
||||||
|
Assert.Equal("Nichts zum Speichern gefunden", result.ErrorMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Update_ForcesLogoutOnChange()
|
||||||
|
{
|
||||||
|
var dbName = Guid.NewGuid().ToString();
|
||||||
|
using var context = CreateInMemoryContext(dbName);
|
||||||
|
var authService = CreateAuthService(context);
|
||||||
|
var auditService = CreateAuditService(context, authService);
|
||||||
|
var userService = new UserService(context, authService, auditService);
|
||||||
|
|
||||||
|
var user = new User { Id = Guid.NewGuid(), Mail = "a@a.com", Type = UserType.User };
|
||||||
|
context.Users!.Add(user);
|
||||||
|
context.SaveChanges();
|
||||||
|
|
||||||
|
var result = await userService.Update(new User { Id = user.Id, Mail = "b@b.com", Type = UserType.User });
|
||||||
|
|
||||||
|
Assert.True(result.Success);
|
||||||
|
Assert.True(context.Users!.First().ForceLogout);
|
||||||
|
Assert.Single(context.Audits!.Where(a => a.Type == AuditType.UpdateUser));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Update_Fails_WhenDemotingLastAdmin()
|
||||||
|
{
|
||||||
|
var dbName = Guid.NewGuid().ToString();
|
||||||
|
using var context = CreateInMemoryContext(dbName);
|
||||||
|
var authService = CreateAuthService(context);
|
||||||
|
var auditService = CreateAuditService(context, authService);
|
||||||
|
var userService = new UserService(context, authService, auditService);
|
||||||
|
|
||||||
|
var admin = new User { Id = Guid.NewGuid(), Mail = "a@a.com", Type = UserType.Admin };
|
||||||
|
context.Users!.Add(admin);
|
||||||
|
context.SaveChanges();
|
||||||
|
|
||||||
|
var result = await userService.Update(new User { Id = admin.Id, Mail = "a@a.com", Type = UserType.User });
|
||||||
|
|
||||||
|
Assert.False(result.Success);
|
||||||
|
Assert.Equal("Der Typ des letzten Administrators kann nicht geändert werden.", result.ErrorMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,23 +6,68 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FoodsharingSiegen.Contracts
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FoodsharingSiegen.Shared", "FoodsharingSiegen.Shared\FoodsharingSiegen.Shared.csproj", "{625167D9-A375-40AF-82DE-87484519F6D9}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FoodsharingSiegen.Shared", "FoodsharingSiegen.Shared\FoodsharingSiegen.Shared.csproj", "{625167D9-A375-40AF-82DE-87484519F6D9}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FoodsharingSiegen.Tests", "FoodsharingSiegen.Tests\FoodsharingSiegen.Tests.csproj", "{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Debug|x64 = Debug|x64
|
||||||
|
Debug|x86 = Debug|x86
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
|
Release|x64 = Release|x64
|
||||||
|
Release|x86 = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Release|Any CPU.Build.0 = Release|Any CPU
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{63D6CC91-095D-44C3-8752-660DDF9C710C}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Release|Any CPU.Build.0 = Release|Any CPU
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{F39AE3B4-E4CE-421E-AFB0-E9C9B3B670FE}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{625167D9-A375-40AF-82DE-87484519F6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{625167D9-A375-40AF-82DE-87484519F6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{625167D9-A375-40AF-82DE-87484519F6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{625167D9-A375-40AF-82DE-87484519F6D9}.Release|Any CPU.Build.0 = Release|Any CPU
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{625167D9-A375-40AF-82DE-87484519F6D9}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{A3BBF859-E3BB-420A-895F-B1BCF4B38B74}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|||||||
Reference in New Issue
Block a user