From 083471afd05e3069b7b9f4a18d8477b29b897f97 Mon Sep 17 00:00:00 2001 From: daniel-hbn Date: Fri, 20 Jun 2025 21:58:36 +0200 Subject: [PATCH] email settings started --- Watcher/Controllers/AuthController.cs | 17 +++++++++++++++-- Watcher/Program.cs | 2 +- Watcher/Views/Auth/Info.cshtml | 3 ++- Watcher/Views/Auth/UserSettings.cshtml | 9 +++++++++ Watcher/persistence/watcher.db-shm | Bin 0 -> 32768 bytes Watcher/persistence/watcher.db-wal | Bin 0 -> 271952 bytes 6 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 Watcher/persistence/watcher.db-shm create mode 100644 Watcher/persistence/watcher.db-wal diff --git a/Watcher/Controllers/AuthController.cs b/Watcher/Controllers/AuthController.cs index bd15c18..98775d5 100644 --- a/Watcher/Controllers/AuthController.cs +++ b/Watcher/Controllers/AuthController.cs @@ -1,3 +1,4 @@ +using System.Net.Mail; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; @@ -85,10 +86,18 @@ public class AuthController : Controller [Authorize] public IActionResult Info() { - var name = User.Identity?.Name; + var username = User.Identity?.Name; + Console.WriteLine("gefundener User: " + username); var claims = User.Claims.Select(c => new { c.Type, c.Value }).ToList(); - ViewBag.Name = name; + var user = _context.Users.FirstOrDefault(u => u.PreferredUsername == username); + Console.WriteLine(user.Email); + if (user == null) return NotFound(); + + var DbProvider = _context.Database.ProviderName; + var mail = user.Email; + + ViewBag.Name = username; ViewBag.Claims = claims; return View(); @@ -142,14 +151,18 @@ public class AuthController : Controller public IActionResult UserSettings() { var username = User.Identity?.Name; + Console.WriteLine("gefundener User: " + username); var claims = User.Claims.Select(c => new { c.Type, c.Value }).ToList(); var user = _context.Users.FirstOrDefault(u => u.PreferredUsername == username); + Console.WriteLine(user.Email); if (user == null) return NotFound(); var DbProvider = _context.Database.ProviderName; + var mail = user.Email; ViewBag.Name = username; + ViewBag.mail = mail; ViewBag.Claims = claims; ViewBag.IdentityProvider = user.IdentityProvider; ViewBag.DbProvider = DbProvider; diff --git a/Watcher/Program.cs b/Watcher/Program.cs index 4765b87..9e13e85 100644 --- a/Watcher/Program.cs +++ b/Watcher/Program.cs @@ -153,7 +153,7 @@ using (var scope = app.Services.CreateScope()) { PocketId = string.Empty, PreferredUsername = "admin", - Email = string.Empty, + Email = "admin@changeme.com", LastLogin = DateTime.UtcNow, IdentityProvider = "local", Password = BCrypt.Net.BCrypt.HashPassword("changeme") diff --git a/Watcher/Views/Auth/Info.cshtml b/Watcher/Views/Auth/Info.cshtml index 4e73972..62a8ef8 100644 --- a/Watcher/Views/Auth/Info.cshtml +++ b/Watcher/Views/Auth/Info.cshtml @@ -3,6 +3,7 @@ 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; }
@@ -20,7 +21,7 @@
}

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

diff --git a/Watcher/Views/Auth/UserSettings.cshtml b/Watcher/Views/Auth/UserSettings.cshtml index f1e5aca..49c029f 100644 --- a/Watcher/Views/Auth/UserSettings.cshtml +++ b/Watcher/Views/Auth/UserSettings.cshtml @@ -86,6 +86,15 @@
Anzeigeeinstellungen:
+
+ +
Benachrichtigungen:
+

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

+ +
+ +
...:
+ diff --git a/Watcher/persistence/watcher.db-shm b/Watcher/persistence/watcher.db-shm new file mode 100644 index 0000000000000000000000000000000000000000..ff6b4b042dab2245cb3ae4aa9bd39dab462ab57c GIT binary patch literal 32768 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