diff --git a/Watcher/Controllers/DatabaseController.cs b/Watcher/Controllers/DatabaseController.cs index 3fd5495..d6cb17f 100644 --- a/Watcher/Controllers/DatabaseController.cs +++ b/Watcher/Controllers/DatabaseController.cs @@ -115,12 +115,14 @@ namespace Watcher.Controllers //return Ok($"Dump erfolgreich erstellt: {dumpFileName}"); TempData["DumpMessage"] = "SQLite-Dump erfolgreich erstellt."; + _logger.LogInformation("SQLite-Dump erfolgreich erstellt."); return RedirectToAction("UserSettings", "User"); } catch (Exception ex) { //return StatusCode(500, $"Fehler beim Erstellen des Dumps: {ex.Message}"); TempData["DumpError"] = $"Fehler beim Erstellen des Dumps: {ex.Message}"; + _logger.LogError("Fehler beim Erstellen des Dumps: {message}", ex.Message); return RedirectToAction("UserSettings", "User"); } } diff --git a/Watcher/Controllers/UserController.cs b/Watcher/Controllers/UserController.cs index 8822274..a9700c7 100644 --- a/Watcher/Controllers/UserController.cs +++ b/Watcher/Controllers/UserController.cs @@ -1,12 +1,5 @@ -using System.Net.Mail; -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 Microsoft.Extensions.Options; using Watcher.Data; using Watcher.ViewModels; @@ -25,7 +18,7 @@ public class UserController : Controller } - // Anzeigen der User-Informationen + // Anzeigen der User-Informationen [Authorize] public IActionResult Info() { @@ -40,12 +33,15 @@ public class UserController : Controller var username = user.Username; var mail = user.Email; var Id = user.Id; + var IdProvider = user.IdentityProvider; // Anzeigedaten an View übergeben ViewBag.Claims = claims; ViewBag.Name = username; ViewBag.Mail = mail; ViewBag.Id = Id; + ViewBag.IdProvider = IdProvider; + return View(); } diff --git a/Watcher/Views/Shared/_Layout.cshtml b/Watcher/Views/Shared/_Layout.cshtml index 3cbd23e..944f4ef 100644 --- a/Watcher/Views/Shared/_Layout.cshtml +++ b/Watcher/Views/Shared/_Layout.cshtml @@ -93,7 +93,7 @@
- @User.Claims.FirstOrDefault(c => c.Type == "name")?.Value
+ @User.Identity?.Name
Profil ansehen
diff --git a/Watcher/Views/User/Info.cshtml b/Watcher/Views/User/Info.cshtml index cf62d4a..6c92135 100644 --- a/Watcher/Views/User/Info.cshtml +++ b/Watcher/Views/User/Info.cshtml @@ -1,9 +1,9 @@ @{ ViewData["Title"] = "Account Info"; var pictureUrl = User.Claims.FirstOrDefault(c => c.Type == "picture")?.Value ?? ""; - var preferredUsername = User.Claims.FirstOrDefault(c => c.Type == "preferred_username")?.Value ?? "admin"; - var isAdmin = preferredUsername == "admin"; - var preferred_username = ViewBag.name; + var Id = ViewBag.Id; + var preferredUsername = ViewBag.name; + var IdProvider = ViewBag.IdProvider; }
@@ -21,7 +21,7 @@
}

- @(User.FindFirst("PreferredUsername")?.Value ?? "Unbekannter Nutzer") + @preferredUsername

@@ -40,6 +40,8 @@ Benutzer-ID @(ViewBag.Id ?? "Nicht verfügbar") + @if(IdProvider != "local") + { Login-Zeit @@ -77,6 +79,8 @@ } + } +
diff --git a/Watcher/Views/User/UserSettings.cshtml b/Watcher/Views/User/UserSettings.cshtml index 1a1013b..5bb6f35 100644 --- a/Watcher/Views/User/UserSettings.cshtml +++ b/Watcher/Views/User/UserSettings.cshtml @@ -111,11 +111,7 @@
-

Systemeinstellungen ändern

- -
Anzeigeeinstellungen:
- -
+

Systemeinstellungen

Benachrichtigungen:

Registrierte E-Mail Adresse: @(ViewBag.mail ?? "nicht gefunden")

@@ -155,9 +151,5 @@
-
...:
- - -