Final adjustments

Signed-off-by: Peter Zaoral <[email protected]>

js/apps/admin-ui/cypress/e2e/clients_test.spec.ts

@@ -115,7 +115,7 @@ describe("Clients test", () => {
       );
     });
 
-    it("Should check temporary admin service existence", () => {
+    it("Should check temporary admin service label (non)existence", () => {
       commonPage.sidebar().goToRealm("master");
       commonPage.sidebar().goToClients();
       commonPage
@@ -125,6 +125,12 @@ describe("Clients test", () => {
       commonPage
         .tableUtils()
         .checkTemporaryAdminLabelExists("temporary-admin-label");
+
+      commonPage.tableToolbarUtils().searchItem("admin-cli", false);
+      commonPage.tableUtils().checkRowItemExists("admin-cli");
+      commonPage
+        .tableUtils()
+        .checkTemporaryAdminLabelExists("temporary-admin-label", false);
     });
 
     it("Should list client scopes", () => {

js/apps/admin-ui/cypress/support/pages/admin-ui/components/TablePage.ts

@@ -148,13 +148,13 @@ export default class TablePage extends CommonElements {
     return this;
   }
 
-  checkTemporaryAdminLabelExists(labelId: string) {
+  checkTemporaryAdminLabelExists(labelId: string, exist = true) {
     cy.get(
       (this.#tableInModal ? ".pf-v5-c-modal-box.pf-m-md " : "") +
         this.#tableRowItem,
     )
       .find(`#${labelId}`)
-      .should("exist");
+      .should((!exist ? "not." : "") + "exist");
     return this;
   }
 

js/apps/admin-ui/src/Banners.tsx

@@ -7,7 +7,7 @@ const WarnBanner = (msg: string) => {
   const { t } = useTranslation();
 
   return (
-    <Banner screenReaderText={t(msg)} isSticky>
+    <Banner screenReaderText={t(msg)} variant="gold" isSticky>
       <Flex spaceItems={{ default: "spaceItemsSm" }}>
         <FlexItem>
           <ExclamationTriangleIcon />

rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/BruteForceUsersResource.java

@@ -29,8 +29,6 @@
 import org.keycloak.services.resources.admin.permissions.UserPermissionEvaluator;
 import org.keycloak.utils.SearchQueryUtils;
 
-import static org.keycloak.services.managers.ApplianceBootstrap.TEMP_ADMIN_ATTR_NAME;
-
 public class BruteForceUsersResource {
     private static final Logger logger = Logger.getLogger(BruteForceUsersResource.class);
     private static final String SEARCH_ID_PARAMETER = "id:";
@@ -169,7 +167,6 @@ private Stream<BruteUser> toRepresentation(RealmModel realm, UserPermissionEvalu
                     ModelToRepresentation.toBriefRepresentation(user) :
                     ModelToRepresentation.toRepresentation(session, realm, user);
             userRep.setAccess(usersEvaluator.getAccess(user));
-            ModelToRepresentation.addAttributeToBriefRep(user, userRep, TEMP_ADMIN_ATTR_NAME);
             return userRep;
         }).map(this::getBruteForceStatus);
     }

server-spi-private/src/main/java/org/keycloak/models/Constants.java

@@ -184,4 +184,7 @@ public final class Constants {
 
     //attribute name used to mark a client as realm client
     public static final String REALM_CLIENT = "realm_client";
+
+    //attribute name used to mark a temporary admin user/service account as temporary
+    public static final String TEMP_ADMIN_ATTR_NAME = "temporary_admin";
 }

server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java

@@ -68,6 +68,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import static org.keycloak.models.light.LightweightUserAdapter.isLightweightUser;
+import static org.keycloak.models.Constants.TEMP_ADMIN_ATTR_NAME;
 
 /**
  * @author <a href="mailto:[email protected]">Bill Burke</a>
@@ -265,6 +266,7 @@ public static UserRepresentation toBriefRepresentation(UserModel user) {
         rep.setEnabled(user.isEnabled());
         rep.setEmailVerified(user.isEmailVerified());
         rep.setFederationLink(user.getFederationLink());
+        addAttributeToBriefRep(user, rep, TEMP_ADMIN_ATTR_NAME);
 
         return rep;
     }

services/src/main/java/org/keycloak/events/log/TemporaryAdminAccountEventListenerProvider.java

@@ -11,7 +11,7 @@
 import org.keycloak.models.RealmProvider;
 import org.keycloak.models.UserModel;
 
-import static org.keycloak.services.managers.ApplianceBootstrap.TEMP_ADMIN_ATTR_NAME;
+import static org.keycloak.models.Constants.TEMP_ADMIN_ATTR_NAME;
 
 public class TemporaryAdminAccountEventListenerProvider implements EventListenerProvider {
 

services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java

@@ -37,6 +37,8 @@
 import org.keycloak.userprofile.UserProfileProvider;
 import org.keycloak.utils.StringUtil;
 
+import static org.keycloak.models.Constants.TEMP_ADMIN_ATTR_NAME;
+
 /**
  * @author <a href="mailto:[email protected]">Bill Burke</a>
  * @version $Revision: 1 $
@@ -46,7 +48,6 @@ public class ApplianceBootstrap {
     public static final String DEFAULT_TEMP_ADMIN_USERNAME = "temp-admin";
     public static final String DEFAULT_TEMP_ADMIN_SERVICE = "temp-admin";
     public static final int DEFAULT_TEMP_ADMIN_EXPIRATION = 120;
-    public static final String TEMP_ADMIN_ATTR_NAME = "temporary_admin";
 
     private final KeycloakSession session;
 

services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java

@@ -68,7 +68,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.keycloak.services.managers.ApplianceBootstrap.TEMP_ADMIN_ATTR_NAME;
+import static org.keycloak.models.Constants.TEMP_ADMIN_ATTR_NAME;
 
 /**
  * @author <a href="mailto:[email protected]">Bill Burke</a>