Merge pull request #45 from sebadob/admin-ui-user-mfa-section

Admin UI user mfa section improvements
sebadob · Sep 6, 2023 · 61464bf · 61464bf
2 parents 4f0d75a + f94f4c2
commit 61464bf
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.15.0-20230904"
+version = "0.15.0-20230906"
 edition = "2021"
 authors = ["Sebastian Dobe <sebastiandobe@mailbox.org>"]
 license = "AGPLv3"

diff --git a/frontend/src/components/admin/users/UserMfa.svelte b/frontend/src/components/admin/users/UserMfa.svelte
@@ -66,19 +66,25 @@
             {#each passkeys as passkey (passkey.name)}
                 <div class="keyContainer">
                     <div class="row">
-                        Passkey Name:
+                        <div class="label">
+                            Passkey Name:
+                        </div>
                         <b>{passkey.name}</b>
                     </div>
                     <div class="row">
-                        Key Registered:
+                        <div class="label">
+                            Key Registered:
+                        </div>
                         <span class="font-mono">{formatDateFromTs(passkey.registered)}</span>
                     </div>
                     <div class="row">
-                        Last Usage:
+                        <div class="label">
+                            Last Usage:
+                        </div>
                         <span class="font-mono">{formatDateFromTs(passkey.last_used)}</span>
                     </div>
                     <div class="row">
-                        <div></div>
+                        <div class="label"></div>
                         <div class="deleteBtn">
                             <Button on:click={() => handleDeleteKey(passkey.name)} level={4}>
                                 DELETE
@@ -103,7 +109,8 @@
     }
 
     .deleteBtn {
-        margin-right: -.8rem;
+        text-align: right;
+        margin: -.33rem 0 0 -.8rem;
     }
 
     .desc {
@@ -121,14 +128,17 @@
 
     .keysContainer {
         margin: .5rem;
-        max-width: 22rem;
+        gap: .5rem;
         padding-right: 2rem;
         overflow-y: auto;
     }
 
+    .label {
+        width: 7rem;
+    }
+
     .row {
         display: flex;
         gap: .5rem;
-        justify-content: space-between;
     }
 </style>
diff --git a/frontend/src/components/admin/users/UserPassword.svelte b/frontend/src/components/admin/users/UserPassword.svelte
@@ -166,9 +166,8 @@
     </Button>
 
     <div class="desc">
-        You can reset the users MFA / Security Keys.<br>
-        Be careful though, since this <b>cannot be reverted</b> without user interaction.<br>
-        It will disable all MFA logins for this user.
+        You can either set and reset a user's password<br/>
+        or send out a new reset E-Mail for self-service.
     </div>
 
     <Button

diff --git a/out/rauthy b/out/rauthy
diff --git a/out/rauthy-lite b/out/rauthy-lite
diff --git a/rauthy-models/src/entity/jwk.rs b/rauthy-models/src/entity/jwk.rs
@@ -11,7 +11,6 @@ use sqlx::postgres::PgRow;
 use sqlx::sqlite::SqliteRow;
 use sqlx::{Error, FromRow, Row};
 use std::str::FromStr;
-use tracing::debug;
 
 #[macro_export]
 macro_rules! sign_jwt {