From a0808ad224f3902f5a8b2d08a60044cb13ae83d1 Mon Sep 17 00:00:00 2001 From: vrockai Date: Thu, 10 Oct 2013 13:59:12 +0200 Subject: [PATCH 1/3] KEYCLOAK-84 add totp remove button functionality --- forms/src/main/java/org/keycloak/forms/UrlBean.java | 4 ++++ .../META-INF/resources/forms/theme/default/totp.ftl | 4 +++- .../org/keycloak/services/resources/AccountService.java | 8 ++++++++ .../java/org/keycloak/services/resources/flows/Urls.java | 4 ++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/forms/src/main/java/org/keycloak/forms/UrlBean.java b/forms/src/main/java/org/keycloak/forms/UrlBean.java index fdb11feec360..cb82aaa6bada 100644 --- a/forms/src/main/java/org/keycloak/forms/UrlBean.java +++ b/forms/src/main/java/org/keycloak/forms/UrlBean.java @@ -120,6 +120,10 @@ public String getTotpUrl() { return Urls.accountTotpPage(baseURI, realm.getId()).toString(); } + public String getTotpRemoveUrl() { + return Urls.accountTotpRemove(baseURI, realm.getId()).toString(); + } + public String getEmailVerificationUrl() { return Urls.accountEmailVerification(baseURI, realm.getId()).toString(); } diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/totp.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/totp.ftl index 63de6ef30f92..57274c25a5f8 100755 --- a/forms/src/main/resources/META-INF/resources/forms/theme/default/totp.ftl +++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/totp.ftl @@ -22,7 +22,9 @@ Google Connected as john@google.com - Remove Google + + Remove Google + diff --git a/services/src/main/java/org/keycloak/services/resources/AccountService.java b/services/src/main/java/org/keycloak/services/resources/AccountService.java index b78d9edc4ec8..f853bfe37215 100755 --- a/services/src/main/java/org/keycloak/services/resources/AccountService.java +++ b/services/src/main/java/org/keycloak/services/resources/AccountService.java @@ -164,6 +164,14 @@ private AccessCodeEntry getAccessCodeEntry(RequiredAction requiredAction) { return accessCodeEntry; } + @Path("totp-remove") + @GET + public Response processTotpRemove() { + UserModel user = getUserFromAuthManager(); + user.setTotp(false); + return Flows.forms(realm, request, uriInfo).setUser(user).forwardToTotp(); + } + @Path("totp") @POST @Consumes(MediaType.APPLICATION_FORM_URLENCODED) diff --git a/services/src/main/java/org/keycloak/services/resources/flows/Urls.java b/services/src/main/java/org/keycloak/services/resources/flows/Urls.java index 1da6a61ef360..b6a86a2cd4b0 100755 --- a/services/src/main/java/org/keycloak/services/resources/flows/Urls.java +++ b/services/src/main/java/org/keycloak/services/resources/flows/Urls.java @@ -55,6 +55,10 @@ public static URI accountTotpPage(URI baseUri, String realmId) { return accountBase(baseUri).path(AccountService.class, "totpPage").build(realmId); } + public static URI accountTotpRemove(URI baseUri, String realmId) { + return accountBase(baseUri).path(AccountService.class, "processTotpRemove").build(realmId); + } + public static URI accountEmailVerification(URI baseUri, String realmId) { return accountBase(baseUri).path(AccountService.class, "emailVerification").build(realmId); } From 23f2fb9125d5c9445ec101909e2e72666b47f141 Mon Sep 17 00:00:00 2001 From: vrockai Date: Fri, 11 Oct 2013 12:37:03 +0200 Subject: [PATCH 2/3] KEYCLOAK-84 added totp test and better form feedback --- .../org/keycloak/service/FormServiceImpl.java | 8 +- .../forms/theme/default/css/header.css | 1 + .../forms/theme/default/template-login.ftl | 3 +- .../forms/theme/default/template-main.ftl | 12 ++- .../resources/forms/theme/default/totp.ftl | 10 ++- .../org/keycloak/forms/messages.properties | 3 + .../services/resources/AccountService.java | 6 +- .../actions/RequiredActionTotpSetupTest.java | 73 ++++++++++++++++++- .../testsuite/pages/AccountTotpPage.java | 9 ++- .../keycloak/testsuite/pages/LoginPage.java | 16 ++++ 10 files changed, 122 insertions(+), 19 deletions(-) diff --git a/forms/src/main/java/org/keycloak/service/FormServiceImpl.java b/forms/src/main/java/org/keycloak/service/FormServiceImpl.java index 1cd60fa13a68..27c2df1bd8bb 100644 --- a/forms/src/main/java/org/keycloak/service/FormServiceImpl.java +++ b/forms/src/main/java/org/keycloak/service/FormServiceImpl.java @@ -81,6 +81,10 @@ public String process(String pageId, FormServiceDataBean dataBean){ Map attributes = new HashMap(); + if (dataBean.getError() != null){ + attributes.put("message", new ErrorBean(dataBean.getError(), dataBean.getErrorType())); + } + RealmBean realm = new RealmBean(dataBean.getRealm()); attributes.put("template", new TemplateBean(realm, dataBean.getContextPath())); @@ -145,10 +149,6 @@ public void exec(Map attributes, FormServiceDataBean dataBean) { private class CommandPassword implements Command { public void exec(Map attributes, FormServiceDataBean dataBean) { - if (dataBean.getError() != null){ - attributes.put("message", new ErrorBean(dataBean.getError(), dataBean.getErrorType())); - } - RealmBean realm = new RealmBean(dataBean.getRealm()); attributes.put("realm", realm); diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/css/header.css b/forms/src/main/resources/META-INF/resources/forms/theme/default/css/header.css index c3b1bd7b1d42..04e3340ab329 100644 --- a/forms/src/main/resources/META-INF/resources/forms/theme/default/css/header.css +++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/css/header.css @@ -60,6 +60,7 @@ body { } .header.rcue .navbar { margin-bottom: 0; + z-index:auto; } .header.rcue .navbar.primary { font-size: 13px; diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl index d8cca1f1c7f8..ac7e4961f490 100644 --- a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl +++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl @@ -35,7 +35,8 @@ <#if error?has_content> -