add profile page

josxha · Jan 6, 2024 · 4461c7b · 4461c7b
1 parent a017e3a
commit 4461c7b
Show file tree

Hide file tree

Showing 15 changed files with 261 additions and 12 deletions.
diff --git a/KratosSelfService/Controllers/HomeController.cs b/KratosSelfService/Controllers/HomeController.cs
@@ -1,15 +1,20 @@
+using KratosSelfService.Models;
+using KratosSelfService.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Ory.Kratos.Client.Model;
 
 namespace KratosSelfService.Controllers;
 
-public class HomeController(ILogger<HomeController> logger) : Controller
+public class HomeController(IdentitySchemaService schemaService) : Controller
 {
     [HttpGet("")]
-    [AllowAnonymous]
-    public IActionResult Home()
+    public async Task<IActionResult> Home()
     {
-        return View("Home");
+        var session = (KratosSession)HttpContext.Items[typeof(KratosSession)]!;
+        var schema = await schemaService.FetchSchema(session.Identity.SchemaId,
+            session.Identity.SchemaUrl);
+        return View("Profile", new ProfileModel(session, IdentitySchemaService.GetTraits(schema)));
     }
 
     [HttpGet("welcome")]
@@ -19,4 +24,11 @@ public IActionResult Welcome()
         // this endpoint exists for parity reason to the ory kratos self service ui
         return Redirect("~/");
     }
+
+    [HttpGet("links")]
+    [AllowAnonymous]
+    public IActionResult Links()
+    {
+        return View("Links");
+    }
 }
diff --git a/KratosSelfService/Controllers/WellknownController.cs b/KratosSelfService/Controllers/WellknownController.cs
@@ -4,7 +4,7 @@
 
 namespace KratosSelfService.Controllers;
 
-public class WellknownController(ILogger<WellknownController> logger, ApiService api) : Controller
+public class WellknownController(ApiService api) : Controller
 {
     [HttpGet("/.well-known/ory/webauthn.js")]
     [AllowAnonymous]

diff --git a/KratosSelfService/KratosSelfService.csproj b/KratosSelfService/KratosSelfService.csproj
@@ -69,6 +69,7 @@
     <ItemGroup>
         <PackageReference Include="Ory.Hydra.Client" Version="2.2.0-rc.3"/>
         <PackageReference Include="Ory.Kratos.Client" Version="1.0.0"/>
+        <PackageReference Include="UAParser" Version="3.1.47"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -82,4 +83,8 @@
         <AdditionalFiles Include="Views\Settings\Settings.cshtml"/>
     </ItemGroup>
 
+    <ItemGroup>
+        <ProjectReference Include="..\OryAdmin\OryAdmin.csproj"/>
+    </ItemGroup>
+
 </Project>
diff --git a/KratosSelfService/Models/models.cs b/KratosSelfService/Models/models.cs
@@ -1,4 +1,5 @@
-using Ory.Hydra.Client.Model;
+using Newtonsoft.Json.Schema;
+using Ory.Hydra.Client.Model;
 using Ory.Kratos.Client.Model;
 
 namespace KratosSelfService.Models;
@@ -14,6 +15,11 @@ public record LoginModel(
     string? logoutUrl
 );
 
+public record ProfileModel(
+    KratosSession session,
+    Dictionary<List<string>, JSchema> traitSchemas
+);
+
 public record LogoutModel(
     string logoutChallenge
 );

diff --git a/KratosSelfService/Resources/CustomTranslator.de.resx b/KratosSelfService/Resources/CustomTranslator.de.resx
@@ -118,4 +118,7 @@
     <data name="sessions.authenticationMethods" xml:space="preserve">
         <value>Authentifizierungsmethoden</value>
     </data>
+    <data name="Hello" xml:space="preserve">
+        <value>Hallo</value>
+    </data>
 </root>
diff --git a/KratosSelfService/Resources/CustomTranslator.resx b/KratosSelfService/Resources/CustomTranslator.resx
@@ -69,4 +69,7 @@
     <data name="sessions.authenticationMethods" xml:space="preserve">
         <value>Authentication methods</value>
     </data>
+    <data name="Hello" xml:space="preserve">
+        <value>Hello</value>
+    </data>
 </root>
diff --git a/KratosSelfService/Services/IdentitySchemaService.cs b/KratosSelfService/Services/IdentitySchemaService.cs
@@ -0,0 +1,51 @@
+using Newtonsoft.Json.Schema;
+
+namespace KratosSelfService.Services;
+
+public class IdentitySchemaService
+{
+    private readonly HttpClient _httpClient = new();
+    private readonly Dictionary<string, JSchema> _schemaCache = new();
+
+    public async Task<JSchema> FetchSchema(string schemaId, string schemaUri)
+    {
+        // check if schema object is cached
+        if (_schemaCache.TryGetValue(schemaId, out var schema))
+            return schema;
+        var response = await _httpClient.GetStringAsync(schemaUri);
+        // request and cache new schema object
+        _schemaCache[schemaId] = JSchema.Parse(response);
+        return _schemaCache[schemaId];
+    }
+
+    public static Dictionary<List<string>, JSchema> GetTraits(JSchema schema)
+    {
+        var traits = schema.Properties["traits"].Properties;
+        return FlattenTraits(traits, []);
+    }
+
+    private static Dictionary<List<string>, JSchema> FlattenTraits(IDictionary<string, JSchema> traits,
+        IReadOnlyCollection<string> pathSections)
+    {
+        var map = new Dictionary<List<string>, JSchema>();
+        foreach (var (traitKey, trait) in traits)
+        {
+            var newPathSections = new List<string>(pathSections) { traitKey };
+            switch (trait.Type)
+            {
+                case JSchemaType.Object:
+                    foreach (var entry in FlattenTraits(trait.Properties, newPathSections))
+                        map[entry.Key] = entry.Value;
+                    break;
+                case JSchemaType.Array:
+                    // TODO support arrays
+                    break;
+                default: // string, etc.
+                    map[newPathSections] = trait;
+                    break;
+            }
+        }
+
+        return map;
+    }
+}
diff --git a/KratosSelfService/Startup.cs b/KratosSelfService/Startup.cs
@@ -42,6 +42,7 @@ public void ConfigureServices(IServiceCollection services)
         // own services
         services.AddSingleton<EnvService>();
         services.AddSingleton<ApiService>();
+        services.AddSingleton<IdentitySchemaService>();
     }
 
     public void Configure(WebApplication app)

diff --git a/KratosSelfService/Views/Home/Home.cshtml → KratosSelfService/Views/Home/Links.cshtml b/KratosSelfService/Views/Home/Home.cshtml → KratosSelfService/Views/Home/Links.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewData["Title"] = CustomTranslator.Get("Welcome");
+    ViewData["Title"] = CustomTranslator.Get("Links");
     Layout = "_CardLayout";
 }
 

diff --git a/KratosSelfService/Views/Home/Profile.cshtml b/KratosSelfService/Views/Home/Profile.cshtml
@@ -0,0 +1,51 @@
+@using OryAdmin.Extensions
+@using Newtonsoft.Json.Linq
+@model ProfileModel
+@{
+    ViewData["Title"] = "View Profile";
+    Layout = "_Layout";
+    var traits = (JObject)Model.session.Identity.Traits;
+}
+
+<section class="hero has-background-white-ter is-fullheight">
+    <div class="hero-body">
+        <div class="container">
+            <div class="columns is-centered">
+                <div class="column is-10-tablet is-8-desktop is-6-widescreen">
+                    <div class="box">
+                        <h1 class="title">
+                            @CustomTranslator.Get("Hello") @traits.GetTraitValueFromPath(["name", "first"])
+                        </h1>
+                        <div class="columns is-one-third">
+                            <div class="column">
+                                <figure class="image is-128x128">
+                                    <img alt="Profile picture" class="is-rounded"
+                                         src="img/Missing_avatar.svg">
+                                </figure>
+                            </div>
+                            <div class="column is-two-thirds">
+                                <table class="table is-fullwidth">
+                                    <tbody>
+                                    @foreach (var (schemaPathSections, schema) in Model.traitSchemas)
+                                    {
+                                        <tr>
+                                            <td>@schema.Title</td>
+                                            <td>@traits.GetTraitValueFromPath(schemaPathSections)</td>
+                                        </tr>
+                                    }
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                        <hr/>
+                        <div class="buttons is-right mt-3">
+                            <a class="button is-info" href="settings">@OryTranslator.Get("settings.title")</a>
+                            <a class="button is-info" href="sessions">@CustomTranslator.Get("sessions.title")</a>
+                            <a class="button is-warning" href="logout">@CustomTranslator.Get("Logout")</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/KratosSelfService/Views/Sessions/Sessions.cshtml b/KratosSelfService/Views/Sessions/Sessions.cshtml
@@ -1,7 +1,9 @@
-@model SessionsModel
+@using UAParser
+@model SessionsModel
 @{
     ViewData["Title"] = CustomTranslator.Get("sessions.title");
     var totalSessions = Model.OtherSessions.Count + 1;
+    var uaParser = Parser.GetDefault();
 }
 
 <div class="section">
@@ -21,7 +23,17 @@
             </thead>
             <tbody>
             <tr>
-                <td>@string.Join(", ", Model.CurrentSession.Devices.Select(device => device.IpAddress))</td>
+                <td>
+                    @foreach (var device in Model.CurrentSession.Devices)
+                    {
+                        var info = uaParser.Parse(device.UserAgent);
+                        <p>
+                            @info.Device.Family on @info.OS
+                            @device.IpAddress
+                            @(string.IsNullOrWhiteSpace(device.Location) ? "" : $"({device.Location})")
+                        </p>
+                    }
+                </td>
                 <td>@Model.CurrentSession.AuthenticatedAt</td>
                 <td>@Model.CurrentSession.ExpiresAt</td>
             </tr>
@@ -53,6 +65,17 @@
                 @foreach (var session in Model.OtherSessions)
                 {
                     <tr>
+                        <td>
+                            @foreach (var device in session.Devices)
+                            {
+                                var info = uaParser.Parse(device.UserAgent);
+                                <p>
+                                    @info.Device.Family on @info.OS
+                                    @device.IpAddress
+                                    @(string.IsNullOrWhiteSpace(device.Location) ? "" : $"({device.Location})")
+                                </p>
+                            }
+                        </td>
                         <td>@string.Join(", ", session.Devices.Select(device => device.IpAddress))</td>
                         <td>@session.AuthenticatedAt</td>
                         <td>@session.ExpiresAt</td>

diff --git a/KratosSelfService/Views/Settings/Settings.cshtml b/KratosSelfService/Views/Settings/Settings.cshtml
@@ -35,7 +35,7 @@
                         </li>
                     }
                 </ul>
-                <p class="menu-label mt-5">@CustomTranslator.Get("Actions")</p>
+                <!--<p class="menu-label mt-5">@CustomTranslator.Get("Actions")</p>
                 <ul class="menu-list">
                     <li>
                         <a href="logout">
@@ -49,7 +49,7 @@
                             </span>
                         </a>
                     </li>
-                </ul>
+                </ul>-->
             </aside>
         </div>
     </div>

diff --git a/KratosSelfService/wwwroot/img/Missing_avatar.svg b/KratosSelfService/wwwroot/img/Missing_avatar.svg
diff --git a/OryUI.sln.DotSettings b/OryUI.sln.DotSettings
@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kratos/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kratos/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Wellknown/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/OryUI.sln.DotSettings.user b/OryUI.sln.DotSettings.user
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=KratosSelfService_002FResources_002FCustomTranslator/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>