KEYCLOAK-2436

Account exists page shows to primary buttons

testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java

@@ -321,7 +321,7 @@ public abstract class AbstractFirstBrokerLoginTest extends AbstractIdentityProvi
         Assert.assertEquals("pedroigor", this.loginPage.getUsername());
         Assert.assertFalse(this.loginPage.isUsernameInputEnabled());
 
-        Assert.assertEquals("Authenticate as pedroigor to link your account with " + getProviderId(), this.loginPage.getSuccessMessage());
+        Assert.assertEquals("Authenticate as pedroigor to link your account with " + getProviderId(), this.loginPage.getInfoMessage());
 
         try {
             this.loginPage.findSocialButton(getProviderId());

testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCFirstBrokerLoginTest.java

@@ -116,7 +116,7 @@ public class OIDCFirstBrokerLoginTest extends AbstractFirstBrokerLoginTest {
 
         // assert reauthentication with login page. On login page is link to kc-saml-idp-basic as user has it linked already
         Assert.assertEquals("Log in to " + APP_REALM_ID, this.driver.getTitle());
-        Assert.assertEquals("Authenticate as pedroigor to link your account with " + getProviderId(), this.loginPage.getSuccessMessage());
+        Assert.assertEquals("Authenticate as pedroigor to link your account with " + getProviderId(), this.loginPage.getInfoMessage());
 
         try {
             this.loginPage.findSocialButton(getProviderId());

testsuite/integration/src/test/java/org/keycloak/testsuite/broker/PostBrokerFlowTest.java

@@ -265,7 +265,7 @@ public class PostBrokerFlowTest extends AbstractIdentityProviderTest {
 
         // assert reauthentication with login page. On login page is link to kc-saml-idp-basic as user has it linked already
         Assert.assertEquals("Log in to " + APP_REALM_ID, this.driver.getTitle());
-        Assert.assertEquals("Authenticate as test-user to link your account with " + getProviderId(), this.loginPage.getSuccessMessage());
+        Assert.assertEquals("Authenticate as test-user to link your account with " + getProviderId(), this.loginPage.getInfoMessage());
 
         // reauthenticate with SAML broker. OTP authentication is required as well
         this.loginPage.clickSocial("kc-saml-idp-basic");

testsuite/integration/src/test/java/org/keycloak/testsuite/pages/IdpConfirmLinkPage.java

@@ -31,7 +31,7 @@ public class IdpConfirmLinkPage extends AbstractPage {
     @FindBy(id = "linkAccount")
     private WebElement linkAccountButton;
 
-    @FindBy(className = "instruction")
+    @FindBy(className = "alert-error")
     private WebElement message;
 
     @Override

testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginPage.java

@@ -64,7 +64,11 @@ public class LoginPage extends AbstractPage {
     private WebElement loginWarningMessage;
 
     @FindBy(className = "alert-success")
-    private WebElement emailSuccessMessage;
+    private WebElement loginSuccessMessage;
+
+
+    @FindBy(className = "alert-info")
+    private WebElement loginInfoMessage;
 
 
     @FindBy(id = "kc-current-locale-link")
@@ -124,7 +128,10 @@ public class LoginPage extends AbstractPage {
     }
 
     public String getSuccessMessage() {
-        return emailSuccessMessage != null ? emailSuccessMessage.getText() : null;
+        return loginSuccessMessage != null ? loginSuccessMessage.getText() : null;
+    }
+    public String getInfoMessage() {
+        return loginInfoMessage != null ? loginInfoMessage.getText() : null;
     }
 
 

themes/src/main/resources/theme/base/login/login-idp-link-confirm.ftl

@@ -1,21 +1,13 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout displayMessage=false; section>
+<@layout.registrationLayout; section>
     <#if section = "title">
         ${msg("confirmLinkIdpTitle")}
     <#elseif section = "header">
          ${msg("confirmLinkIdpTitle")}
     <#elseif section = "form">
-        <div id="kc-error-message">
-            <p class="instruction">${message.summary}</p>
-        </div>
-
         <form id="kc-register-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
-
-                <div id="kc-form-buttons" class="${properties.kcFormGroupClass!}">
-                    <button type="submit" class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" name="submitAction" id="updateProfile" value="updateProfile">${msg("confirmLinkIdpReviewProfile")}</button>
-                    <button type="submit" class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" name="submitAction" id="linkAccount" value="linkAccount">${msg("confirmLinkIdpContinue", idpAlias)}</button>
-                </div>
-
+            <button type="submit" class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonLargeClass!}" name="submitAction" id="updateProfile" value="updateProfile">${msg("confirmLinkIdpReviewProfile")}</button>
+            <button type="submit" class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonLargeClass!}" name="submitAction" id="linkAccount" value="linkAccount">${msg("confirmLinkIdpContinue", idpAlias)}</button>
         </form>
     </#if>
 </@layout.registrationLayout>

themes/src/main/resources/theme/base/login/messages/messages_en.properties

@@ -143,8 +143,8 @@ federatedIdentityExistsMessage=User with {0} {1} already exists. Please login to
 confirmLinkIdpTitle=Account already exists
 federatedIdentityConfirmLinkMessage=User with {0} {1} already exists. How do you want to continue?
 federatedIdentityConfirmReauthenticateMessage=Authenticate as {0} to link your account with {1}
-confirmLinkIdpReviewProfile=Review profile info
-confirmLinkIdpContinue=Link {0} with existing account
+confirmLinkIdpReviewProfile=Review profile
+confirmLinkIdpContinue=Add to existing account
 
 configureTotpMessage=You need to set up Mobile Authenticator to activate your account.
 updateProfileMessage=You need to update your user profile to activate your account.