Merge pull request 'enhancement/UserInfo' (#35) from enhancement/UserInfo into development

Reviewed-on: daniel-hbn/Watcher#35

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,11 +86,21 @@ 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.Username == username);
+        if (user == null) return NotFound();
+
+        var DbProvider = _context.Database.ProviderName;
+        var mail = user.Email;
+        var Id = user.Id;
+
+        ViewBag.Name = username;
         ViewBag.Claims = claims;
+        ViewBag.Mail = mail;
+        ViewBag.Id = Id;
 
         return View();
     }
@@ -142,14 +153,17 @@ 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.Username == username);
         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;

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;
 }
 
 <div class="container mt-5">
@@ -20,7 +21,7 @@
                 </div>
             }
             <h3 class="mt-3">
-                <i class="bi bi-person-circle me-1"></i>@(User.FindFirst("name")?.Value ?? "Unbekannter Nutzer")
+                <i class="bi bi-person-circle me-1"></i>@(User.FindFirst("PreferredUsername")?.Value ?? "Unbekannter Nutzer")
             </h3>
             
         </div>
@@ -33,11 +34,11 @@
                 </tr>
                 <tr>
                     <th><i class="bi bi-envelope me-1"></i>E-Mail</th>
-                    <td>@(User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress")?.Value ?? "Nicht verfügbar")</td>
+                    <td>@(ViewBag.Mail ?? "Nicht verfügbar")</td>
                 </tr>
                 <tr>
                     <th><i class="bi bi-fingerprint me-1"></i>Benutzer-ID</th>
-                    <td>@(User.FindFirst("sub")?.Value ?? "Nicht verfügbar")</td>
+                    <td>@(ViewBag.Id ?? "Nicht verfügbar")</td>
                 </tr>
                 <tr>
                     <th><i class="bi bi-clock-history me-1"></i>Login-Zeit</th>

Watcher/Views/Auth/UserSettings.cshtml

@@ -86,6 +86,15 @@
 
         <h5>Anzeigeeinstellungen: </h5>
 
+        <hr class="my-4" />
+
+        <h5>Benachrichtigungen: </h5>
+        <p>Registrierte E-Mail Adresse: <strong>@(ViewBag.mail ?? "nicht gefunden")</strong></p>
+
+        <hr class="my-4" />
+
+        <h5>...: </h5>
+
         
 
     </div>