From 7618e661369057add7b17da18b8bb70fc825d081 Mon Sep 17 00:00:00 2001
From: Vlastimil Elias <velias@redhat.com>
Date: Fri, 9 Jul 2021 15:48:07 +0200
Subject: [PATCH] [KEYCLOAK-18541] separate template for IDP review page

---
 .../forms/login/freemarker/Templates.java     |  3 ++-
 ...dcFirstBrokerLoginWithUserProfileTest.java |  2 +-
 .../base/login/idp-review-user-profile.ftl    | 23 +++++++++++++++++++
 .../login/messages/messages_en.properties     |  1 +
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 themes/src/main/resources/theme/base/login/idp-review-user-profile.ftl

diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/Templates.java b/services/src/main/java/org/keycloak/forms/login/freemarker/Templates.java
index b8c6b2c9c0..40e307b082 100755
--- a/services/src/main/java/org/keycloak/forms/login/freemarker/Templates.java
+++ b/services/src/main/java/org/keycloak/forms/login/freemarker/Templates.java
@@ -75,8 +75,9 @@ public class Templates {
             case SAML_POST_FORM:
                 return "saml-post-form.ftl";
             case UPDATE_USER_PROFILE:
-            case IDP_REVIEW_USER_PROFILE:
                 return "update-user-profile.ftl";
+            case IDP_REVIEW_USER_PROFILE:
+                return "idp-review-user-profile.ftl";
             default:
                 throw new IllegalArgumentException();
         }
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginWithUserProfileTest.java
index db4e04e624..ae21b616b8 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginWithUserProfileTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginWithUserProfileTest.java
@@ -92,7 +92,7 @@ public class KcOidcFirstBrokerLoginWithUserProfileTest extends KcOidcFirstBroker
         updateAccountInformationPage.assertCurrent();
         
         //assert fields location in form
-        String htmlFormId = "kc-update-profile-form";
+        String htmlFormId = "kc-idp-review-profile-form";
         Assert.assertTrue(
             driver.findElement(
                 By.cssSelector("form#"+htmlFormId+" > div:nth-child(1) > div:nth-child(2) > input#lastName")
diff --git a/themes/src/main/resources/theme/base/login/idp-review-user-profile.ftl b/themes/src/main/resources/theme/base/login/idp-review-user-profile.ftl
new file mode 100644
index 0000000000..1b70aeccb9
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/idp-review-user-profile.ftl
@@ -0,0 +1,23 @@
+<#import "template.ftl" as layout>
+<#import "user-profile-commons.ftl" as userProfileCommons>
+<@layout.registrationLayout displayMessage=messagesPerField.exists('global') displayRequiredFields=true; section>
+    <#if section = "header">
+        ${msg("loginIdpReviewProfileTitle")}
+    <#elseif section = "form">
+        <form id="kc-idp-review-profile-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
+
+            <@userProfileCommons.userProfileFormFields/>
+
+            <div class="${properties.kcFormGroupClass!}">
+                <div id="kc-form-options" class="${properties.kcFormOptionsClass!}">
+                    <div class="${properties.kcFormOptionsWrapperClass!}">
+                    </div>
+                </div>
+
+                <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
+                    <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doSubmit")}" />
+                </div>
+            </div>
+        </form>
+    </#if>
+</@layout.registrationLayout>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/messages/messages_en.properties b/themes/src/main/resources/theme/base/login/messages/messages_en.properties
index fabb89ad59..f09fc2d9f6 100755
--- a/themes/src/main/resources/theme/base/login/messages/messages_en.properties
+++ b/themes/src/main/resources/theme/base/login/messages/messages_en.properties
@@ -31,6 +31,7 @@ realmChoice=Realm
 unknownUser=Unknown user
 loginTotpTitle=Mobile Authenticator Setup
 loginProfileTitle=Update Account Information
+loginIdpReviewProfileTitle=Update Account Information
 loginTimeout=Your login attempt timed out.  Login will start from the beginning.
 oauthGrantTitle=Grant Access to {0}
 oauthGrantTitleHtml={0}