8000 Refactor and unify RunOnServer modules by vaceksimon · Pull Request #48363 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Refactor and unify RunOnServer modules #48363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stianst merged 1 commit into from
May 6, 2026
Merged

Refactor and unify RunOnServer modules #48363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmDefaultConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import org.keycloak.testframework.remote.runonserver.InjectRunOnServer;
import org.keycloak.testframework.remote.runonserver.RunOnServerClient;
import org.keycloak.tests.utils.admin.AdminEventPaths;
import org.keycloak.tests.utils.runonserver.RunHelpers;
import org.keycloak.testsuite.util.runonserver.RunHelpers;
import org.keycloak.util.JsonSerialization;

import org.apache.commons.io.IOUtils;
Expand Down
2 changes: 1 addition & 1 deletion tests/base/src/test/java/org/keycloak/tests/admin/user/AbstractUserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import org.keycloak.testframework.ui.webdriver.ManagedWebDriver;
import org.keycloak.testframework.util.ApiUtil;
import org.keycloak.tests.utils.admin.AdminEventPaths;
import org.keycloak.tests.utils.runonserver.RunHelpers;
import org.keycloak.testsuite.util.runonserver.RunHelpers;
import org.keycloak.testsuite.util.userprofile.UserProfileUtil;
import org.keycloak.util.JsonSerialization;

Expand Down
2 changes: 1 addition & 1 deletion tests/base/src/test/java/org/keycloak/tests/keys/GeneratedHmacKeyProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.keycloak.testframework.remote.runonserver.InjectRunOnServer;
import org.keycloak.testframework.remote.runonserver.RunOnServerClient;
import org.keycloak.testframework.util.ApiUtil;
import org.keycloak.tests.utils.runonserver.RunHelpers;
import org.keycloak.testsuite.util.runonserver.RunHelpers;

import org.junit.jupiter.api.Test;

Expand Down
5 changes: 5 additions & 0 deletions tests/utils-shared/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
<artifactId>keycloak-test-framework-builders</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak.testframework</groupId>
<artifactId>keycloak-test-framework-remote-providers</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-services</artifactId>
Expand Down
38 changes: 37 additions & 1 deletion ...k/tests/utils/runonserver/RunHelpers.java → ...estsuite/util/runonserver/RunHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
package org.keycloak.tests.utils.runonserver;
package org.keycloak.testsuite.util.runonserver;

import java.util.List;
import java.util.stream.Collectors;

import jakarta.ws.rs.NotFoundException;

import org.keycloak.credential.CredentialModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserSessionModel;
import org.keycloak.models.utils.ModelToRepresentation;
import org.keycloak.representations.idm.ComponentRepresentation;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.testframework.remote.providers.runonserver.FetchOnServer;
import org.keycloak.testframework.remote.providers.runonserver.FetchOnServerWrapper;
import org.keycloak.testframework.remote.providers.runonserver.RunOnServer;

/**
* Created by st on 26.01.17.
Expand Down Expand Up @@ -71,4 +77,34 @@ public Class getResultClass() {
};
}

public static RunOnServer removeUserSession(String realmName, String sessionId) {
return session -> {
RealmModel realm = getRealmByName(session, realmName);

UserSessionModel sessionModel = session.sessions().getUserSession(realm, sessionId);
if (sessionModel == null) {
throw new NotFoundException("Session not found");
}

session.sessions().removeUserSession(realm, sessionModel);
};
}

public static RunOnServer removeUserSessions(String realmName) {
return session -> {
RealmModel realm = getRealmByName(session, realmName);

session.sessions().removeUserSessions(realm);
};
}

private static RealmModel getRealmByName(KeycloakSession session, String realmName) {
RealmProvider realmProvider = session.getProvider(RealmProvider.class);
RealmModel realm = realmProvider.getRealmByName(realmName);
if (realm == null) {
throw new NotFoundException("Realm not found");
}
return realm;
}

}
8 changes: 8 additions & 0 deletions testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,14 @@
<overWrite>false</overWrite>
<outputDirectory>${auth.server.home}/providers</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.keycloak.testframework</groupId>
<artifactId>keycloak-test-framework-remote-providers</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${auth.server.home}/providers</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
Expand Down
5 changes: 5 additions & 0 deletions testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
<type>pom</type>
</dependency>

<dependency>
<groupId>org.keycloak.testframework</groupId>
<artifactId>keycloak-test-framework-remote-providers</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
Expand Down
31 changes: 3 additions & 28 deletions ...estsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@
import org.keycloak.sessions.RootAuthenticationSessionModel;
import org.keycloak.storage.UserStorageProvider;
import org.keycloak.storage.datastore.PeriodicEventInvalidation;
import org.keycloak.testframework.remote.providers.runonserver.FetchOnServer;
import org.keycloak.testframework.remote.providers.runonserver.RunOnServer;
import org.keycloak.testframework.remote.providers.runonserver.SerializationUtil;
import org.keycloak.testsuite.components.amphibian.TestAmphibianProvider;
import org.keycloak.testsuite.events.TestEventsListenerProvider;
import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory;
Expand All @@ -121,9 +124,6 @@
import org.keycloak.testsuite.rest.resource.TestCacheResource;
import org.keycloak.testsuite.rest.resource.TestLDAPResource;
import org.keycloak.testsuite.rest.resource.TestingExportImportResource;
import org.keycloak.testsuite.runonserver.FetchOnServer;
import org.keycloak.testsuite.runonserver.RunOnServer;
import org.keycloak.testsuite.runonserver.SerializationUtil;
import org.keycloak.testsuite.util.FeatureDeployerUtil;
import org.keycloak.timer.TimerProvider;
import org.keycloak.truststore.FileTruststoreProvider;
Expand Down Expand Up @@ -162,31 +162,6 @@ public TestingResourceProvider(KeycloakSession session, TestingResourceProviderF
this.request = session.getContext().getHttpRequest();
}

@POST
@Path("/remove-user-session")
@Produces(MediaType.APPLICATION_JSON)
public Response removeUserSession(@QueryParam("realm") final String name, @QueryParam("session") final String sessionId) {
RealmModel realm = getRealmByName(name);

UserSessionModel sessionModel = session.sessions().getUserSession(realm, sessionId);
if (sessionModel == null) {
throw new NotFoundException("Session not found");
}

session.sessions().removeUserSession(realm, sessionModel);
return Response.noContent().build();
}

@POST
@Path("/remove-user-sessions")
@Produces(MediaType.APPLICATION_JSON)
public Response removeUserSessions(@QueryParam("realm") final String realmName) {
RealmModel realm = getRealmByName(realmName);

session.sessions().removeUserSessions(realm);
return Response.noContent().build();
}

@GET
@Path("/get-last-session-refresh")
@Produces(MediaType.APPLICATION_JSON)
Expand Down
31 changes: 0 additions & 31 deletions ...s/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/FetchOnServer.java
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ...uite-providers/src/main/java/org/keycloak/testsuite/runonserver/FetchOnServerWrapper.java
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions ...ices/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunHelpers.java
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions ...ces/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunOnServer.java
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ...uite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunOnServerException.java
View file
Open in desktop

This file was deleted.

Loading
Loading
0