Watcher/watcher
4
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

UserSettings Page erweitert, PaswortChange gefixed

Browse Source
This commit is contained in:
Daniel Habenicht
2025-06-20 17:57:36 +02:00
parent 7ce89d9fda
commit cfd2d08ee9
3 changed files with 107 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Watcher/Controllers/AuthController.cs
View File

@@ -1,8 +1,10 @@
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Watcher.Data;
using Watcher.ViewModels;
@@ -124,7 +126,7 @@ public class AuthController : Controller
if (!string.IsNullOrWhiteSpace(model.NewPassword))
{
user.PreferredUsername = BCrypt.Net.BCrypt.HashPassword(model.NewPassword);
user.Password = BCrypt.Net.BCrypt.HashPassword(model.NewPassword);
}
_context.SaveChanges();
@@ -140,14 +142,19 @@ public class AuthController : Controller
public IActionResult UserSettings()
{
var username = User.Identity?.Name;
var claims = User.Claims.Select(c => new { c.Type, c.Value }).ToList();
var user = _context.Users.FirstOrDefault(u => u.PreferredUsername == username);
if (user == null) return NotFound();
var model = new EditUserSettingsViewModel
{
Username = user.PreferredUsername
};
return View(model);
var DbProvider = _context.Database.ProviderName;
ViewBag.Name = username;
ViewBag.Claims = claims;
ViewBag.IdentityProvider = user.IdentityProvider;
ViewBag.DbProvider = DbProvider;
return View();
}
// Edit speichern
@@ -162,6 +169,8 @@ public class AuthController : Controller
var user = _context.Users.FirstOrDefault(u => u.PreferredUsername == username);
if (user == null) return NotFound();
var databaseProvider = _context.Database.ProviderName;
user.PreferredUsername = model.Username;
// Passwort ändern

30
Watcher/Views/Auth/Info.cshtml
View File

@@ -91,34 +91,4 @@
</form>
</div>
</div>
@if (isAdmin)
{
<div class="card shadow mt-5 p-4" style="max-width: 700px; margin: auto;">
<h4><i class="bi bi-pencil-square me-2"></i>Benutzerdaten ändern</h4>
<form asp-action="Edit" method="post" asp-controller="Auth">
<div class="mb-3">
<label for="Username" class="form-label">Neuer Benutzername</label>
<input type="text" class="form-control" id="Username" name="Username" value="@preferredUsername" />
</div>
<div class="mb-3">
<label for="NewPassword" class="form-label">Neues Passwort</label>
<input type="password" class="form-control" id="NewPassword" name="NewPassword" />
</div>
<div class="mb-3">
<label for="ConfirmPassword" class="form-label">Passwort bestätigen</label>
<input type="password" class="form-control" id="ConfirmPassword" name="ConfirmPassword" />
</div>
<button type="submit" class="btn btn-primary">
<i class="bi bi-save me-1"></i>Speichern
</button>
</form>
</div>
}
else
{
<div class="alert alert-info mt-4 text-center" style="max-width: 700px; margin: auto;">
<i class="bi bi-info-circle me-1"></i>Benutzerdaten können nur für lokal angemeldete Nutzer geändert werden.
</div>
}
</div>

93
Watcher/Views/Auth/UserSettings.cshtml
View File

@@ -1 +1,92 @@
<h1>settings</h1>
@{
ViewData["Title"] = "Settings";
var pictureUrl = User.Claims.FirstOrDefault(c => c.Type == "picture")?.Value ?? "";
var preferredUsername = User.Claims.FirstOrDefault(c => c.Type == "preferred_username")?.Value ?? "admin";
var isLocalUser = ViewBag.IdentityProvider == "local";
var DbEngine = ViewBag.DbProvider;
}
<style>
.Settingscontainer {
display: flex;
flex-wrap: wrap;
/* Wichtig: erlaubt Umbruch */
gap: 1rem;
/* optionaler Abstand */
}
.Settingscontainer>* {
flex: 1 1 calc(50% - 0.5rem);
/* 2 Elemente pro Zeile, inkl. Gap */
box-sizing: border-box;
}
</style>
<div class="Settingscontainer">
@if (isLocalUser)
{
<div class="card shadow mt-5 p-4" style="width: 40%; margin: auto;">
<h4><i class="bi bi-pencil-square me-2"></i>Benutzerdaten ändern</h4>
<form asp-action="Edit" method="post" asp-controller="Auth">
<div class="mb-3">
<label for="Username" class="form-label">Neuer Benutzername</label>
<input type="text" class="form-control" id="Username" name="Username" value="@preferredUsername" />
</div>
<div class="mb-3">
<label for="NewPassword" class="form-label">Neues Passwort</label>
<input type="password" class="form-control" id="NewPassword" name="NewPassword" />
</div>
<div class="mb-3">
<label for="ConfirmPassword" class="form-label">Passwort bestätigen</label>
<input type="password" class="form-control" id="ConfirmPassword" name="ConfirmPassword" />
</div>
<button type="submit" class="btn btn-primary">
<i class="bi bi-save me-1"></i>Speichern
</button>
</form>
</div>
}
else
{
<div class="alert alert-info mt-4 text-center" style="width: 40%; margin: auto;">
<i class="bi bi-info-circle me-1"></i>Benutzerdaten können nur für lokal angemeldete Nutzer geändert werden.
</div>
}
<div class="card shadow mt-5 p-4" style="width: 55%; margin: auto;">
<h4><i class="bi bi-pencil-square me-2"></i>Systemeinformationen</h4>
<br>
<h5>Watcher Version: v0.1.0</h5>
<hr class="my-4" />
<h5>Authentifizierungsmethode: </h5>
<p><strong>@(ViewBag.IdentityProvider ?? "nicht gefunden")</strong></p>
<hr class="my-4" />
<h5>Datenbank-Engine: </h5>
<strong>@(DbEngine ?? "nicht gefunden")</strong>
<form method="get" asp-controller="Auth" asp-action="DbExport" class="text-center mt-4">
<button type="submit" class="btn btn-primary">
<i class="bi bi-gear-wide-connected me-1"></i>Datenbank exportieren
</button>
</form>
</div>
<div class="card shadow mt-5 p-4" style="width: 55%; margin: auto;">
<h4><i class="bi bi-pencil-square me-2"></i>Systemeinstellungen ändern</h4>
<h5>Anzeigeeinstellungen: </h5>
</div>
</div>