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

KEYCLOAK-183 Don't show totp on main login form if totp is required by realm

Browse source
This commit is contained in:
Stian Thorgersen 2013-12-04 19:42:41 +00:00
parent eea812dfda
commit 5415a878e8
4 changed files with 10 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
forms/src/main/java/org/keycloak/forms/LoginBean.java
View file

@ -38,8 +38,6 @@ public class LoginBean {
private String password; private String password;
private List<RequiredCredential> requiredCredentials;
public LoginBean(RealmBean realm, MultivaluedMap<String, String> formData){ public LoginBean(RealmBean realm, MultivaluedMap<String, String> formData){
this.realm = realm; this.realm = realm;
@ -48,14 +46,6 @@ public class LoginBean {
username = formData.getFirst("username"); username = formData.getFirst("username");
password = formData.getFirst("password"); password = formData.getFirst("password");
} }
requiredCredentials = new LinkedList<RequiredCredential>();
for (org.keycloak.models.RequiredCredentialModel c : realm.getRealm().getRequiredCredentials()) {
if (c.isInput()) {
requiredCredentials.add(new RequiredCredential(c.getType(), c.isSecret(), c.getFormLabel()));
}
}
} }
public String getUsername() { public String getUsername() {
@ -66,10 +56,6 @@ public class LoginBean {
return password; return password;
} }
public List<RequiredCredential> getRequiredCredentials() {
return requiredCredentials;
}
public RealmBean getRealm() { public RealmBean getRealm() {
return realm; return realm;
} }

8
forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
View file

@ -16,11 +16,9 @@
<label for="username">${rb.getString('username')}</label><input id="username" name="username" value="${login.username!''}" type="text" autofocus /> <label for="username">${rb.getString('username')}</label><input id="username" name="username" value="${login.username!''}" type="text" autofocus />
</div> </div>
<#list login.requiredCredentials as c> <div>
<div> <label for="password">${rb.getString('password')}</label><input id="password" name="password" type="password" />
<label for="${c.name}">${rb.getString(c.label)}</label><input id="${c.name}" name="${c.name}" type="${c.inputType}" /> </div>
</div>
</#list>
<div class="form-buttons"> <div class="form-buttons">
<input class="btn-primary" name="login" type="submit" value="Log In"/> <input class="btn-primary" name="login" type="submit" value="Log In"/>

9
testsuite/integration/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java
View file

@ -35,6 +35,7 @@ import org.keycloak.testsuite.pages.AppPage;
import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.AppPage.RequestType;
import org.keycloak.testsuite.pages.LoginConfigTotpPage; import org.keycloak.testsuite.pages.LoginConfigTotpPage;
import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginPage;
import org.keycloak.testsuite.pages.LoginTotpPage;
import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.pages.RegisterPage;
import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.KeycloakRule;
import org.keycloak.testsuite.rule.KeycloakRule.KeycloakSetup; import org.keycloak.testsuite.rule.KeycloakRule.KeycloakSetup;
@ -70,6 +71,9 @@ public class RequiredActionTotpSetupTest {
@WebResource @WebResource
protected LoginPage loginPage; protected LoginPage loginPage;
@WebResource
protected LoginTotpPage loginTotpPage;
@WebResource @WebResource
protected LoginConfigTotpPage totpPage; protected LoginConfigTotpPage totpPage;
@ -113,7 +117,8 @@ public class RequiredActionTotpSetupTest {
oauth.openLogout(); oauth.openLogout();
loginPage.open(); loginPage.open();
loginPage.loginTotp("test-user@localhost", "password", totp.generate(totpSecret)); loginPage.login("test-user@localhost", "password");
loginTotpPage.login(totp.generate(totpSecret));
Assert.assertEquals(RequestType.AUTH_RESPONSE, appPage.getRequestType()); Assert.assertEquals(RequestType.AUTH_RESPONSE, appPage.getRequestType());
} }
@ -146,7 +151,7 @@ public class RequiredActionTotpSetupTest {
Assert.assertFalse(totpPage.isCurrent()); Assert.assertFalse(totpPage.isCurrent());
// Login with one-time password // Login with one-time password
loginPage.loginTotp("setupTotp2", "password2", totp.generate(totpCode)); loginTotpPage.login(totp.generate(totpCode));
// Open account page // Open account page
accountTotpPage.open(); accountTotpPage.open();

13
testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
View file

@ -73,19 +73,6 @@ public class LoginPage extends AbstractPage {
cancelButton.click(); cancelButton.click();
} }
public void loginTotp(String username, String password, String code) {
usernameInput.clear();
usernameInput.sendKeys(username);
passwordInput.clear();
passwordInput.sendKeys(password);
totp.clear();
totp.sendKeys(code);
submitButton.click();
}
public String getError() { public String getError() {
return loginErrorMessage != null ? loginErrorMessage.getText() : null; return loginErrorMessage != null ? loginErrorMessage.getText() : null;
} }