8000 Fix device user code input styling in keycloak.v2 login theme by kathari00 · Pull Request #47283 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Fix device user code input styling in keycloak.v2 login theme #47283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahus1 merged 2 commits into from
Apr 10, 2026
Merged

Fix device user code input styling in keycloak.v2 login theme #47283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5fe2db
Add keycloak.v2 device verification template
kathari00 Mar 19, 2026
78cfb47
Adjusting the test suite to new field names
ahus1 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ...n/tests/base/src/main/java/org/keycloak/testsuite/pages/OAuth2DeviceVerificationPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@
public class OAuth2DeviceVerificationPage extends LanguageComboboxAwarePage {

private static final String CONSENT_DENIED_MESSAGE = "Consent denied for connecting the device.";

@FindBy(id = "device-user-code")
public static final String DEVICE_USER_CODE = "device_user_code";

@FindBy(name = DEVICE_USER_CODE)
private WebElement userCodeInput;

@FindBy(css = "input[type=\"submit\"]")
@FindBy(css = "button[type=\"submit\"]")
private WebElement submitButton;

@FindBy(className = "pf-v5-c-alert")
Expand All @@ -53,7 +54,7 @@ public String getError() {
public boolean isCurrent() {
if (driver.getTitle().startsWith("Sign in to ")) {
try {
driver.findElement(By.id("device-user-code"));
driver.findElement(By.id(DEVICE_USER_CODE));
return true;
} catch (Throwable t) {
}
Expand Down Expand Up @@ -106,7 +107,7 @@ private boolean isDeniedPage() {
private boolean isInvalidUserCodePage() {
if (driver.getTitle().startsWith("Sign in to ")) {
try {
driver.findElement(By.id("device-user-code"));
driver.findElement(By.id(DEVICE_USER_CODE));
return driver.findElement(By.id("kc-page-title")).getText().equals("Device Login")
&& driver.findElement(By.className("pf-m-danger")).getText().equals("Invalid code, please try again.");
} catch (Throwable t) {
Expand All @@ -118,7 +119,7 @@ private boolean isInvalidUserCodePage() {
private boolean isExpiredUserCodePage() {
if (driver.getTitle().startsWith("Sign in to ")) {
try {
driver.findElement(By.id("device-user-code"));
driver.findElement(By.id(DEVICE_USER_CODE));
return driver.findElement(By.id("kc-page-title")).getText().equals("Device Login")
&& driver.findElement(By.className("pf-m-danger")).getText().equals("The code has expired. Please go back to your device and try connecting again.");
} catch (Throwable t) {
Expand Down
17 changes: 17 additions & 0 deletions themes/src/main/resources/theme/keycloak.v2/login/login-oauth2-device-verify-user-code.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<#import "template.ftl" as layout>
<#import "field.ftl" as field>
<#import "buttons.ftl" as buttons>
<@layout.registrationLayout; section>
<!-- template: login-oauth2-device-verify-user-code.ftl -->
<#if section = "header">
${msg("oauth2DeviceVerificationTitle")}
<#elseif section = "form">
<form id="kc-user-verify-device-user-code-form" class="${properties.kcFormClass!}" action="${url.oauth2DeviceVerificationAction}" method="post">
<@field.input name="device_user_code" label=msg("verifyOAuth2DeviceUserCode") autofocus=true />

<@buttons.actionGroup>
<@buttons.button id="kc-login" label="doSubmit" class=["kcButtonPrimaryClass", "kcButtonBlockClass"] />
</@buttons.actionGroup>
</form>
</#if>
</@layout.registrationLayout>
136 changes: 136 additions & 0 deletions ...es/src/main/resources/theme/keycloak.v2/login/login-passkeys-conditional-authenticate.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<#import "template.ftl" as layout>
<#import "field.ftl" as field>
<#import "buttons.ftl" as buttons>
<@layout.registrationLayout displayInfo=(realm.registrationAllowed && !registrationDisabled??); section>
<!-- template: login-passkeys-conditional-authenticate.ftl -->
<#if section = "title">
title
<#elseif section = "header">
${msg("passkey-login-title")}
<#elseif section = "form">
<form id="webauth" action="${url.loginAction}" method="post">
<input type="hidden" id="clientDataJSON" name="clientDataJSON"/>
<input type="hidden" id="authenticatorData" name="authenticatorData"/>
<input type="hidden" id="signature" name="signature"/>
<input type="hidden" id="credentialId" name="credentialId"/>
<input type="hidden" id="userHandle" name="userHandle"/>
<input type="hidden" id="error" name="error"/>
</form>

<div class="${properties.kcFormGroupClass!} no-bottom-margin">
<#if authenticators??>
<form id="authn_select" class="${properties.kcFormClass!}">
<#list authenticators.authenticators as authenticator>
<input type="hidden" name="authn_use_chk" value="${authenticator.credentialId}"/>
</#list>
</form>

<#if shouldDisplayAuthenticators?? && shouldDisplayAuthenticators>
<#if authenticators.authenticators?size gt 1>
<p class="${properties.kcSelectAuthListItemTitle!}">${msg("passkey-available-authenticators")}</p>
</#if>

<div class="${properties.kcFormClass!}">
<#list authenticators.authenticators as authenticator>
<div id="kc-webauthn-authenticator-item-${authenticator?index}" class="${properties.kcSelectAuthListItemClass!}">
<div class="${properties.kcSelectAuthListItemIconClass!}">
<i class="${(properties['${authenticator.transports.iconClass}'])!'${properties.kcWebAuthnDefaultIcon!}'} ${properties.kcSelectAuthListItemIconPropertyClass!}"></i>
</div>
<div class="${properties.kcSelectAuthListItemBodyClass!}">
<div id="kc-webauthn-authenticator-label-${authenticator?index}"
class="${properties.kcSelectAuthListItemHeadingClass!}">
${authenticator.label}
</div>

<#if authenticator.transports?? && authenticator.transports.displayNameProperties?has_content>
<div id="kc-webauthn-authenticator-transport-${authenticator?index}"
class="${properties.kcSelectAuthListItemDescriptionClass!}">
<#list authenticator.transports.displayNameProperties as nameProperty>
<span>${msg(nameProperty)}</span>
<#if nameProperty?has_next>
<span>, </span>
</#if>
</#list>
</div>
</#if>

<div class="${properties.kcSelectAuthListItemDescriptionClass!}">
<span id="kc-webauthn-authenticator-createdlabel-${authenticator?index}">
${msg('passkey-createdAt-label')}
</span>
<span id="kc-webauthn-authenticator-created-${authenticator?index}">
${authenticator.createdAt}
</span>
</div>
</div>
<div class="${properties.kcSelectAuthListItemFillClass!}"></div>
</div>
</#list>
</div>
</#if>
</#if>

<div id="kc-form">
<div id="kc-form-wrapper">
<#if realm.password>
<form id="kc-form-login" class="${properties.kcFormClass!}" = true; return true;" action="${url.loginAction}" method="post" style="display:none">
<#if !usernameHidden??>
<@field.input name="username" label=msg("passkey-autofill-select") value=login.username!'' autofocus=true autocomplete="username webauthn" />
</#if>
</form>
</#if>
<div id="kc-form-passkey-button" class="${properties.kcFormButtonsClass!}" style="display:none">
<input id="authenticateWebAuthnButton" type="button" autofocus="autofocus"
value="${msg("passkey-doAuthenticate")}"
class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}"/>
</div>
</div>
</div>
</div>

<script type="module">
<#outputformat "JavaScript">
import { authenticateByWebAuthn } from "${url.resourcesPath}/js/webauthnAuthenticate.js";
import { initAuthenticate } from "${url.resourcesPath}/js/passkeysConditionalAuth.js";

const authButton = document.getElementById('authenticateWebAuthnButton');
const input = {
isUserIdentified : ${isUserIdentified},
challenge : ${challenge?c},
userVerification : ${userVerification?c},
rpId : ${rpId?c},
createTimeout : ${createTimeout?c},
errmsg : ${msg("webauthn-unsupported-browser-text")?c}
};
authButton.addEventListener("click", () => {
authenticateByWebAuthn(input);
}, { once: true });

const args = {
isUserIdentified : ${isUserIdentified},
challenge : ${challenge?c},
userVerification : ${userVerification?c},
rpId : ${rpId?c},
createTimeout : ${createTimeout?c},
errmsg : ${msg("passkey-unsupported-browser-text")?c}
};

document.addEventListener("DOMContentLoaded", (event) => initAuthenticate(args, (available) => {
if (available) {
document.getElementById("kc-form-login").style.display = "block";
} else {
document.getElementById("kc-form-passkey-button").style.display = 'block';
}
}));
</#outputformat>
</script>

<#elseif section = "info">
<#if realm.registrationAllowed && !registrationDisabled??>
<div id="kc-registration">
<span>${msg("noAccount")} <a tabindex="6" href="${url.registrationUrl}">${msg("doRegister")}</a></span>
</div>
</#if>
</#if>

</@layout.registrationLayout>
Loading
0