libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

KEYCLOAK-12011 Remove cancel button from OTP form (#6511)

Browse source 
* KEYCLOAK-12011 Remove cancel button from OTP form

* Remove back button
This commit is contained in:
Denis Richtárik 2019-12-09 19:23:26 +01:00 committed by Marek Posolda
parent e2144d6aec
commit 48bddc37ae
5 changed files with 0 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java
View file

@ -59,10 +59,6 @@ public class OTPFormAuthenticator extends AbstractUsernameFormAuthenticator impl
public void validateOTP(AuthenticationFlowContext context) {
MultivaluedMap<String, String> inputData = context.getHttpRequest().getDecodedFormParameters();
if (inputData.containsKey("cancel")) {
context.resetFlow();
return;
}
String otp = inputData.getFirst("otp");
String credentialId = context.getSelectedCredentialId();

7
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginTotpPage.java
View file

@ -34,9 +34,6 @@ public class LoginTotpPage extends CredentialsComboboxPage {
@FindBy(css = "input[type=\"submit\"]")
private WebElement submitButton;
@FindBy(id = "kc-cancel")
private WebElement cancelButton;
@FindBy(className = "alert-error")
private WebElement loginErrorMessage;
@ -47,10 +44,6 @@ public class LoginTotpPage extends CredentialsComboboxPage {
submitButton.click();
}
public void cancel() {
cancelButton.click();
}
public String getError() {
return loginErrorMessage != null ? loginErrorMessage.getText() : null;
}

15
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java
View file

@ -377,21 +377,6 @@ public class BruteForceTest extends AbstractTestRealmKeycloakTest {
continueLoginWithTotp();
}
@Test
public void testTotpGoingBack() throws Exception {
loginPage.open();
loginPage.login("test-user@localhost", "password");
continueLoginWithInvalidTotp();
loginTotpPage.cancel();
loginPage.assertCurrent();
loginPage.login("test-user@localhost", "password");
continueLoginWithInvalidTotp();
continueLoginWithCorrectTotpExpectFailure();
clearUserFailures();
continueLoginWithTotp();
}
@Test
public void testBrowserMissingTotp() throws Exception {
loginSuccess();

10
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java
View file

@ -147,16 +147,6 @@ public class LoginTotpTest extends AbstractTestRealmKeycloakTest {
events.expectLogin().assertEvent();
}
@Test
public void loginWithTotpCancel() throws Exception {
loginPage.open();
loginPage.login("test-user@localhost", "password");
Assert.assertTrue(loginTotpPage.isCurrent());
loginTotpPage.cancel();
loginPage.assertCurrent();
}
@Test
public void loginWithTotpInvalidPassword() throws Exception {
loginPage.open();

2
themes/src/main/resources/theme/base/login/login-otp.ftl
View file

@ -25,8 +25,6 @@
<input type="hidden" id="id-hidden-input" name="credentialId" <#if auth.selectedCredential?has_content>value="${auth.selectedCredential}"</#if>/>
<input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}"
name="login" id="kc-login" type="submit" value="${msg("doLogIn")}"/>
<input class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}"
name="cancel" id="kc-cancel" type="submit" value="${msg("doCancel")}"/>
</div>
</div>
</form>