From 5eb7363ddd97b2077c4814f23221909cc2e96e0c Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Thu, 11 Jan 2024 19:42:10 +0100
Subject: [PATCH] Promote Account Console v3 to default and deprecate v2
 (#25852)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #19663

Signed-off-by: Jon Koops <jonkoops@gmail.com>
Co-authored-by: Martin Bartoš <mabartos@redhat.com>
---
 common/src/main/java/org/keycloak/common/Profile.java     | 4 ++--
 common/src/test/java/org/keycloak/common/ProfileTest.java | 8 ++++----
 js/apps/account-ui/index.html                             | 2 +-
 js/apps/account-ui/pom.xml                                | 4 ++--
 js/apps/account-ui/src/root/Root.tsx                      | 1 +
 .../admin-ui/cypress/support/pages/admin-ui/Masthead.ts   | 4 ++--
 .../java/org/keycloak/it/cli/dist/FeaturesDistTest.java   | 2 +-
 .../java/org/keycloak/testsuite/admin/ServerInfoTest.java | 2 +-
 .../webauthn/account/AbstractWebAuthnAccountTest.java     | 4 ++++
 9 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/common/src/main/java/org/keycloak/common/Profile.java b/common/src/main/java/org/keycloak/common/Profile.java
index bf1e93ae3a..9d937e2a89 100755
--- a/common/src/main/java/org/keycloak/common/Profile.java
+++ b/common/src/main/java/org/keycloak/common/Profile.java
@@ -48,8 +48,8 @@ public class Profile {
         AUTHORIZATION("Authorization Service", Type.DEFAULT),
 
         ACCOUNT_API("Account Management REST API", Type.DEFAULT),
-        ACCOUNT2("Account Management Console 2", Type.DEFAULT, Feature.ACCOUNT_API),
-        ACCOUNT3("Account Management Console 3", Type.PREVIEW, Feature.ACCOUNT_API),
+        ACCOUNT2("Account Management Console 2", Type.DEPRECATED, Feature.ACCOUNT_API),
+        ACCOUNT3("Account Management Console 3", Type.DEFAULT, Feature.ACCOUNT_API),
 
         ADMIN_FINE_GRAINED_AUTHZ("Fine-Grained Admin Permissions", Type.PREVIEW),
 
diff --git a/common/src/test/java/org/keycloak/common/ProfileTest.java b/common/src/test/java/org/keycloak/common/ProfileTest.java
index d488722dd4..c57e5d6b71 100644
--- a/common/src/test/java/org/keycloak/common/ProfileTest.java
+++ b/common/src/test/java/org/keycloak/common/ProfileTest.java
@@ -71,7 +71,7 @@ public class ProfileTest {
             Profile.Feature.TRANSIENT_USERS,
             Profile.Feature.DPOP,
             Profile.Feature.FIPS,
-            Profile.Feature.ACCOUNT3,
+            Profile.Feature.ACCOUNT2,
             Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ,
             Profile.Feature.DYNAMIC_SCOPES,
             Profile.Feature.DOCKER,
@@ -89,7 +89,7 @@ public class ProfileTest {
             disabledFeatures.add(Profile.Feature.KERBEROS);
         }
         assertEquals(profile.getDisabledFeatures(), disabledFeatures);
-        assertEquals(profile.getPreviewFeatures(), Profile.Feature.ACCOUNT3, Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.MULTI_SITE, Profile.Feature.RECOVERY_CODES, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.CLIENT_SECRET_ROTATION, Profile.Feature.UPDATE_EMAIL, Profile.Feature.DPOP);
+        assertEquals(profile.getPreviewFeatures(), Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.MULTI_SITE, Profile.Feature.RECOVERY_CODES, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.CLIENT_SECRET_ROTATION, Profile.Feature.UPDATE_EMAIL, Profile.Feature.DPOP);
     }
 
     @Test
@@ -100,14 +100,14 @@ public class ProfileTest {
         try {
             Profile.configure(new PropertiesProfileConfigResolver(properties));
         } catch (ProfileException e) {
-            Assert.assertEquals("Feature account2 depends on disabled feature account-api", e.getMessage());
+            Assert.assertEquals("Feature account3 depends on disabled feature account-api", e.getMessage());
         }
     }
 
     @Test
     public void checkSuccessIfFeatureDisabledWithDisabledDependencies() {
         Properties properties = new Properties();
-        properties.setProperty("keycloak.profile.feature.account2", "disabled");
+        properties.setProperty("keycloak.profile.feature.account3", "disabled");
         properties.setProperty("keycloak.profile.feature.account_api", "disabled");
         Profile.configure(new PropertiesProfileConfigResolver(properties));
         Assert.assertFalse(Profile.isFeatureEnabled(Profile.Feature.ACCOUNT2));
diff --git a/js/apps/account-ui/index.html b/js/apps/account-ui/index.html
index a1f7738b68..f284617802 100644
--- a/js/apps/account-ui/index.html
+++ b/js/apps/account-ui/index.html
@@ -6,7 +6,7 @@
     <link rel="icon" type="image/svg+xml" href="./favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="Web site to manage keycloak" />
-    <title>Keycloak account console</title>
+    <title>Account Management</title>
     <style>
       body {
         margin: 0;
diff --git a/js/apps/account-ui/pom.xml b/js/apps/account-ui/pom.xml
index 57393ba46d..cb4c5531a7 100644
--- a/js/apps/account-ui/pom.xml
+++ b/js/apps/account-ui/pom.xml
@@ -89,10 +89,10 @@
                             <value xml:space="preserve"><![CDATA[<link rel="icon" type="${properties.favIconType!"image/svg+xml"}" href="${resourceUrl}${properties.favIcon!"/favicon.svg"}" />]]></value>
                         </replacement>
                         <replacement>
-                            <token><![CDATA[<title>Keycloak account console</title>]]></token>
+                            <token><![CDATA[<title>Account Management</title>]]></token>
                             <value xml:space="preserve">
 <![CDATA[
-    <title>${properties.title!"Keycloak account console"}</title>
+    <title>${properties.title!"Account Management"}</title>
     <script type="importmap">
       {
         "imports": {
diff --git a/js/apps/account-ui/src/root/Root.tsx b/js/apps/account-ui/src/root/Root.tsx
index 8d326caca5..d37e482ac2 100644
--- a/js/apps/account-ui/src/root/Root.tsx
+++ b/js/apps/account-ui/src/root/Root.tsx
@@ -23,6 +23,7 @@ const ReferrerLink = () => {
 
   return searchParams.has("referrer_uri") ? (
     <Button
+      data-testid="referrer-link"
       component="a"
       href={searchParams.get("referrer_uri")!.replace("_hash_", "#")}
       variant="link"
diff --git a/js/apps/admin-ui/cypress/support/pages/admin-ui/Masthead.ts b/js/apps/admin-ui/cypress/support/pages/admin-ui/Masthead.ts
index 95c8999c09..d79f4420d0 100644
--- a/js/apps/admin-ui/cypress/support/pages/admin-ui/Masthead.ts
+++ b/js/apps/admin-ui/cypress/support/pages/admin-ui/Masthead.ts
@@ -10,7 +10,7 @@ export default class Masthead extends CommonElements {
   #userDrpDwnKebab = "#user-dropdown-kebab";
   #globalAlerts = "global-alerts";
   #documentationLink = "#link";
-  #backToAdminConsoleLink = "#landingReferrerLink";
+  #backToAdminConsoleLink = "referrer-link";
   #userDrpdwnItem = ".pf-c-dropdown__menu-item";
 
   #getAlertsContainer() {
@@ -70,7 +70,7 @@ export default class Masthead extends CommonElements {
   }
 
   goToAdminConsole() {
-    cy.get(this.#backToAdminConsoleLink).click({ force: true });
+    cy.findByTestId(this.#backToAdminConsoleLink).click({ force: true });
     return this;
   }
 
diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java
index 86c2468c2c..7df322ab8c 100644
--- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java
+++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java
@@ -28,7 +28,7 @@ import static org.keycloak.quarkus.runtime.cli.command.AbstractStartCommand.OPTI
 @LegacyStore
 public class FeaturesDistTest {
 
-    private static final String PREVIEW_FEATURES_EXPECTED_LOG = "Preview features enabled: account3:v1, admin-fine-grained-authz:v1, client-secret-rotation:v1, dpop:v1, multi-site:v1, recovery-codes:v1, scripts:v1, token-exchange:v1, update-email:v1";
+    private static final String PREVIEW_FEATURES_EXPECTED_LOG = "Preview features enabled: admin-fine-grained-authz:v1, client-secret-rotation:v1, dpop:v1, multi-site:v1, recovery-codes:v1, scripts:v1, token-exchange:v1, update-email:v1";
 
     @Test
     public void testEnableOnBuild(KeycloakDistribution dist) {
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java
index 2799d29564..5c2506588d 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java
@@ -56,7 +56,7 @@ public class ServerInfoTest extends AbstractKeycloakTest {
 
         assertNotNull(info.getThemes());
         assertNotNull(info.getThemes().get("account"));
-        Assert.assertNames(info.getThemes().get("account"), "base", "keycloak.v2", "custom-account-provider");
+        Assert.assertNames(info.getThemes().get("account"), "base", "keycloak.v3", "custom-account-provider");
         Assert.assertNames(info.getThemes().get("admin"), "base", "keycloak.v2");
         Assert.assertNames(info.getThemes().get("email"), "base", "keycloak");
         Assert.assertNames(info.getThemes().get("login"), "address", "base", "environment-agnostic", "keycloak");
diff --git a/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/account/AbstractWebAuthnAccountTest.java b/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/account/AbstractWebAuthnAccountTest.java
index 812c2bdaf9..ec85d25927 100644
--- a/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/account/AbstractWebAuthnAccountTest.java
+++ b/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/account/AbstractWebAuthnAccountTest.java
@@ -34,6 +34,7 @@ import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.representations.idm.RequiredActionProviderSimpleRepresentation;
 import org.keycloak.testsuite.AbstractAuthTest;
 import org.keycloak.testsuite.arquillian.annotation.EnableFeature;
+import org.keycloak.testsuite.arquillian.annotation.DisableFeature;
 import org.keycloak.testsuite.page.AbstractPatternFlyAlert;
 import org.keycloak.testsuite.ui.account2.page.SigningInPage;
 import org.keycloak.testsuite.ui.account2.page.utils.SigningInPageUtils;
@@ -56,6 +57,9 @@ import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUI
 import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverFirefox;
 import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad;
 
+// Enable ACCOUNT3 feature once https://github.com/keycloak/keycloak/issues/26080 is resolved
+@EnableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true)
+@DisableFeature(value = Profile.Feature.ACCOUNT3, skipRestart = true)
 public abstract class AbstractWebAuthnAccountTest extends AbstractAuthTest implements UseVirtualAuthenticators {
 
     @Page