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 0000000..ff6b4b0 Binary files /dev/null and b/Watcher/persistence/watcher.db-shm differ diff --git a/Watcher/persistence/watcher.db-wal b/Watcher/persistence/watcher.db-wal new file mode 100644 index 0000000..2471191 Binary files /dev/null and b/Watcher/persistence/watcher.db-wal differ