Details
diff --git a/forms/common-themes/src/main/resources/theme/account/base/messages/messages.properties b/forms/common-themes/src/main/resources/theme/account/base/messages/messages.properties
index 9dfa90a..6feedf5 100755
--- a/forms/common-themes/src/main/resources/theme/account/base/messages/messages.properties
+++ b/forms/common-themes/src/main/resources/theme/account/base/messages/messages.properties
@@ -1,4 +1,4 @@
-authenticatorCode=One-time-password
+authenticatorCode=One-time code
email=Email
errorHeader=Error!
firstName=First name
@@ -23,8 +23,8 @@ invalidTotp=Invalid authenticator code
readOnlyUser=You can't update your account as it is read only
readOnlyPassword=You can't update your password as your account is read only
-successTotp=Google authenticator configured.
-successTotpRemoved=Google authenticator removed.
+successTotp=Mobile authenticator configured.
+successTotpRemoved=Mobile authenticator removed.
accountUpdated=Your account has been updated
accountPasswordUpdated=Your password has been updated
diff --git a/forms/common-themes/src/main/resources/theme/account/base/totp.ftl b/forms/common-themes/src/main/resources/theme/account/base/totp.ftl
index d05dd8b..d480337 100755
--- a/forms/common-themes/src/main/resources/theme/account/base/totp.ftl
+++ b/forms/common-themes/src/main/resources/theme/account/base/totp.ftl
@@ -12,25 +12,32 @@
</thead>
<tbody>
<tr>
- <td class="provider"><span class="social googleplus">FreeOTP</span></td>
+ <td class="provider">Mobile</td>
<td class="action">
- <a id="remove-google" href="${url.totpRemoveUrl}"><i class="pficon pficon-delete"></i></a>
+ <a id="remove-mobile" href="${url.totpRemoveUrl}"><i class="pficon pficon-delete"></i></a>
</td>
</tr>
</tbody>
</table>
<#else>
- <h2>Google Authenticator Setup</h2>
+ <h2>Authenticator</h2>
<hr/>
<ol>
- <li>Download the <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP app</a> in your device.</li>
- <li>Create an account in FreeOTP and scan the barcode or type in the provided key below.<br/>
+ <li>
+ Install <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP</a> or
+ <a href="http://code.google.com/p/google-authenticator/" target="_blank">Google Authenticator</a>
+ on your mobile
+ </li>
+ <li>
+ Open the application and scan the barcode or enter the key<br/>
<img src="${totp.totpSecretQrCodeUrl}" alt="Figure: Barcode"><br/>
<span class="code">${totp.totpSecretEncoded}</span>
</li>
- <li>Enter the one-time-password provided by FreeOTP below and click Submit to finish the setup.</li>
+ <li>
+ Enter the one-time code provided by the application and click Submit to finish the setup.
+ </li>
</ol>
<hr/>
diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl
index 4848255..d71536c 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl
@@ -30,13 +30,16 @@
<#elseif section = "info" >
<ol id="kc-totp-settings">
<li>
- <p>${rb.loginTotpStep1_1} <a href="https://fedorahosted.org/freeotp/" target="_blank">${rb.loginTotpStep1_2}</a> ${rb.loginTotpStep1_3}</p>
+ <p>${rb.loginTotpStep1}</p>
</li>
<li>
<p>${rb.loginTotpStep2}</p>
<img src="${totp.totpSecretQrCodeUrl}" alt="Figure: Barcode"><br/>
<span class="code">${totp.totpSecretEncoded}</span>
</li>
+ <li>
+ <p>${rb.loginTotpStep3}</p>
+ </li>
</ol>
</#if>
</@layout.registrationLayout>
diff --git a/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties b/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties
index ff0e6ad..6b12161 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties
+++ b/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties
@@ -26,7 +26,7 @@ submit=Submit
yes=Yes
no=No
-authenticatorCode=One-time-password
+authenticatorCode=One-time code
clientCertificate=Client Certificate
invalidUser=Invalid username or password.
@@ -47,8 +47,8 @@ invalidPasswordExisting=Invalid existing password
invalidPasswordConfirm=Password confirmation doesn't match
invalidTotp=Invalid authenticator code
-successTotp=FreeOTP authenticator configured.
-successTotpRemoved=FreeOTP authenticator removed.
+successTotp=Mobile authenticator configured.
+successTotpRemoved=Mobile authenticator removed.
usernameExists=Username already exists
emailExists=Email already exists
@@ -60,13 +60,11 @@ loginOauthTitle=Temporary access.
loginOauthTitleHtml=Temporary access requested. Login to grant access.
loginForgot=Forgot
-loginTotpTitle=FreeOTP Authenticator Setup
-loginTotpStep1_1=Download the
-loginTotpStep1_2=FreeOTP Authenticator app
-loginTotpStep1_3=in your device.
-loginTotpStep2=Create an account in FreeOTP and scan the barcode or type in the provided key below.
-loginTotpStep3=Enter the one-time-password provided by FreeOTP below and click Submit to finish the setup.
-loginTotpOneTime=One-time-password
+loginTotpTitle=Mobile Authenticator Setup
+loginTotpStep1=Install <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP</a> or <a href="http://code.google.com/p/google-authenticator/" target="_blank">Google Authenticator</a> on your mobile
+loginTotpStep2=Open the application and scan the barcode or enter the key
+loginTotpStep3=Enter the one-time code provided by the application and click Submit to finish the setup
+loginTotpOneTime=One-time code
loginProfileTitle=Update Account Information
loginProfileWarning=Your account is not enabled because you need to update your account information.
@@ -91,7 +89,7 @@ errorTitle=We're sorry...
errorTitleHtml=We're <strong>sorry</strong> ...
errorGenericMsg=Something happened and we could not process your request.
actionWarningHeader=Your account is not enabled.
-actionTotpWarning=You need to set up the FreeOTP Authenticator to activate your account.
+actionTotpWarning=You need to set up Mobile Authenticator to activate your account.
actionProfileWarning=You need to update your user profile to activate your account.
actionPasswordWarning=You need to change your password to activate your account.
actionEmailWarning=You need to verify your email address to activate your account.
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
index cffdda8..a3329d8 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
@@ -348,7 +348,7 @@ public class AccountTest {
totpPage.configure(totp.generate(totpPage.getTotpSecret()));
- Assert.assertEquals("Google authenticator configured.", profilePage.getSuccess());
+ Assert.assertEquals("Mobile authenticator configured.", profilePage.getSuccess());
events.expectAccount(EventType.UPDATE_TOTP).assertEvent();
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java
index 99716a2..da59926 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java
@@ -44,7 +44,7 @@ public class AccountTotpPage extends AbstractAccountPage {
@FindBy(css = "button[type=\"submit\"]")
private WebElement submitButton;
- @FindBy(id = "remove-google")
+ @FindBy(id = "remove-mobile")
private WebElement removeLink;
public void configure(String totp) {
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java
index edb8cc5..4f6a5ab 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java
@@ -48,7 +48,7 @@ public class LoginConfigTotpPage extends AbstractPage {
}
public boolean isCurrent() {
- return driver.getTitle().equals("FreeOTP Authenticator Setup");
+ return driver.getTitle().equals("Mobile Authenticator Setup");
}
public void open() {
