libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Pass the UserId to the function that runs the inner function in the server as it was losing its value when defined globally for Wildfly and Quarkus

Browse source
This commit is contained in:
Daniel Gozalo 2022-01-28 13:30:01 +01:00 committed by Marek Posolda
parent df7ddbf9b3
commit dc814b85c7
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/rar/AbstractRARParserTest.java
View file

@ -88,7 +88,7 @@ public abstract class AbstractRARParserTest extends AbstractTestRealmKeycloakTes
* @return the {@link AuthorizationRequestContextHolder} local testsuite representation of the Authorization Request Context * @return the {@link AuthorizationRequestContextHolder} local testsuite representation of the Authorization Request Context
* with all the parsed authorization_detail objects. * with all the parsed authorization_detail objects.
*/ */
protected AuthorizationRequestContextHolder fetchAuthorizationRequestContextHolder() { protected AuthorizationRequestContextHolder fetchAuthorizationRequestContextHolder(String userId) {
AuthorizationRequestContextHolder authorizationRequestContextHolder = testingClient.server("test").fetch(session -> { AuthorizationRequestContextHolder authorizationRequestContextHolder = testingClient.server("test").fetch(session -> {
final RealmModel realm = session.realms().getRealmByName("test"); final RealmModel realm = session.realms().getRealmByName("test");
final UserModel user = session.users().getUserById(realm, userId); final UserModel user = session.users().getUserById(realm, userId);

9
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/rar/DynamicScopesRARParseTest.java
View file

@ -46,7 +46,6 @@ import static org.junit.Assert.assertEquals;
public class DynamicScopesRARParseTest extends AbstractRARParserTest { public class DynamicScopesRARParseTest extends AbstractRARParserTest {
@Test @Test
@Ignore("ignored until we figure out why it fails on Quarkus and Wildfly")
public void generatedAuthorizationRequestsShouldMatchDefaultScopes() { public void generatedAuthorizationRequestsShouldMatchDefaultScopes() {
ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app");
List<ClientScopeRepresentation> defScopes = testApp.getDefaultClientScopes(); List<ClientScopeRepresentation> defScopes = testApp.getDefaultClientScopes();
@ -56,7 +55,7 @@ public class DynamicScopesRARParseTest extends AbstractRARParserTest {
events.expectLogin() events.expectLogin()
.user(userId) .user(userId)
.assertEvent(); .assertEvent();
AuthorizationRequestContextHolder contextHolder = fetchAuthorizationRequestContextHolder(); AuthorizationRequestContextHolder contextHolder = fetchAuthorizationRequestContextHolder(userId);
List<AuthorizationRequestContextHolder.AuthorizationRequestHolder> authorizationRequestHolders = contextHolder.getAuthorizationRequestHolders().stream() List<AuthorizationRequestContextHolder.AuthorizationRequestHolder> authorizationRequestHolders = contextHolder.getAuthorizationRequestHolders().stream()
.filter(authorizationRequestHolder -> authorizationRequestHolder.getSource().equals(AuthorizationRequestSource.SCOPE)) .filter(authorizationRequestHolder -> authorizationRequestHolder.getSource().equals(AuthorizationRequestSource.SCOPE))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -73,7 +72,6 @@ public class DynamicScopesRARParseTest extends AbstractRARParserTest {
} }
@Test @Test
@Ignore("ignored until we figure out why it fails on Quarkus and Wildfly")
public void generatedAuthorizationRequestsShouldMatchRequestedAndDefaultScopes() { public void generatedAuthorizationRequestsShouldMatchRequestedAndDefaultScopes() {
Response response = createScope("static-scope", false); Response response = createScope("static-scope", false);
String scopeId = ApiUtil.getCreatedId(response); String scopeId = ApiUtil.getCreatedId(response);
@ -93,7 +91,7 @@ public class DynamicScopesRARParseTest extends AbstractRARParserTest {
.user(userId) .user(userId)
.assertEvent(); .assertEvent();
AuthorizationRequestContextHolder contextHolder = fetchAuthorizationRequestContextHolder(); AuthorizationRequestContextHolder contextHolder = fetchAuthorizationRequestContextHolder(userId);
List<AuthorizationRequestContextHolder.AuthorizationRequestHolder> authorizationRequestHolders = contextHolder.getAuthorizationRequestHolders().stream() List<AuthorizationRequestContextHolder.AuthorizationRequestHolder> authorizationRequestHolders = contextHolder.getAuthorizationRequestHolders().stream()
.filter(authorizationRequestHolder -> authorizationRequestHolder.getSource().equals(AuthorizationRequestSource.SCOPE)) .filter(authorizationRequestHolder -> authorizationRequestHolder.getSource().equals(AuthorizationRequestSource.SCOPE))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -112,7 +110,6 @@ public class DynamicScopesRARParseTest extends AbstractRARParserTest {
} }
@Test @Test
@Ignore("ignored until we figure out why it fails on Quarkus and Wildfly")
public void generatedAuthorizationRequestsShouldMatchRequestedDynamicAndDefaultScopes() { public void generatedAuthorizationRequestsShouldMatchRequestedDynamicAndDefaultScopes() {
Response response = createScope("dynamic-scope", true); Response response = createScope("dynamic-scope", true);
String scopeId = ApiUtil.getCreatedId(response); String scopeId = ApiUtil.getCreatedId(response);
@ -132,7 +129,7 @@ public class DynamicScopesRARParseTest extends AbstractRARParserTest {
.user(userId) .user(userId)
.assertEvent(); .assertEvent();
AuthorizationRequestContextHolder contextHolder = fetchAuthorizationRequestContextHolder(); AuthorizationRequestContextHolder contextHolder = fetchAuthorizationRequestContextHolder(userId);
List<AuthorizationRequestContextHolder.AuthorizationRequestHolder> authorizationRequestHolders = contextHolder.getAuthorizationRequestHolders().stream() List<AuthorizationRequestContextHolder.AuthorizationRequestHolder> authorizationRequestHolders = contextHolder.getAuthorizationRequestHolders().stream()
.filter(authorizationRequestHolder -> authorizationRequestHolder.getSource().equals(AuthorizationRequestSource.SCOPE)) .filter(authorizationRequestHolder -> authorizationRequestHolder.getSource().equals(AuthorizationRequestSource.SCOPE))
.collect(Collectors.toList()); .collect(Collectors.toList());