Merge branch 'main' into rework-auth-flows

defenseunicorns · Dec 10, 2024 · 87cca99 · 87cca99
2 parents 9b14438 + f0a198e
commit 87cca99
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 3 deletions.
diff --git a/src/realm.json b/src/realm.json
@@ -2976,7 +2976,25 @@
             "defaultAction": false,
             "priority": 1001,
             "config": {}
-        }
+        },
+        {
+            "alias": "webauthn-register-passwordless",
+            "name": "Webauthn Register Passwordless",
+            "providerId": "webauthn-register-passwordless",
+            "enabled": true,
+            "defaultAction": false,
+            "priority": 1002,
+            "config": {}
+          },
+          {
+            "alias": "webauthn-register",
+            "name": "Webauthn Register",
+            "providerId": "webauthn-register",
+            "enabled": true,
+            "defaultAction": false,
+            "priority": 1003,
+            "config": {}
+          }
     ],
     "browserFlow": "UDS Authentication",
     "registrationFlow": "UDS Registration",

diff --git a/src/test/cypress/realm.json b/src/test/cypress/realm.json
@@ -2749,7 +2749,25 @@
             "defaultAction": false,
             "priority": 1001,
             "config": {}
-        }
+        },
+        {
+            "alias": "webauthn-register-passwordless",
+            "name": "Webauthn Register Passwordless",
+            "providerId": "webauthn-register-passwordless",
+            "enabled": true,
+            "defaultAction": false,
+            "priority": 1002,
+            "config": {}
+          },
+          {
+            "alias": "webauthn-register",
+            "name": "Webauthn Register",
+            "providerId": "webauthn-register",
+            "enabled": true,
+            "defaultAction": false,
+            "priority": 1003,
+            "config": {}
+          }
     ],
     "browserFlow": "UDS Authentication",
     "registrationFlow": "UDS Registration",

diff --git a/src/theme/login/resources/css/new-ui.css b/src/theme/login/resources/css/new-ui.css
@@ -374,4 +374,12 @@ body.password .subtitle {
 .kc-social-section hr{
   margin-bottom: 16px;
   margin-top: 16px;
-}
+}
+
+#authenticateWebAuthnButton {
+  display: block;
+}
+
+#registerWebAuthn {
+  display: block;
+}
diff --git a/src/theme/login/template.ftl b/src/theme/login/template.ftl
@@ -25,6 +25,13 @@ ${msg("loginTitle",(realm.displayName!''))}
             <script src="${url.resourcesPath}/${script}" type="text/javascript"></script>
         </#list>
     </#if>
+    <script type="importmap">
+        {
+            "imports": {
+                "rfc4648": "${url.resourcesCommonPath}/vendor/rfc4648/rfc4648.js"
+            }
+        }
+    </script>
     <#if scripts??>
         <#list scripts as script>
             <script src="${script}" type="text/javascript"></script>