Skip to content
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

breaking: Update Keycloak to version 26 #54

Merged
merged 1 commit into from
Dec 12, 2024
Merged

breaking: Update Keycloak to version 26 #54

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
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
</licenses>

<properties>
<keycloak.version>25.0.6</keycloak.version>
<keycloak.version>26.0.7</keycloak.version>
<keycloak.client.version>26.0.3</keycloak.client.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -48,7 +49,7 @@
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<version>${keycloak.version}</version>
<version>${keycloak.client.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ltanov/keycloak/multitenancy/authentication/authenticators/LoginWithSsoAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void authenticate(AuthenticationFlowContext context) {
public void action(AuthenticationFlowContext context) {
MultivaluedMap<String, String> formData = context.getHttpRequest().getDecodedFormParameters();
var ssoId = formData.getFirst("sso-id");
var identityProviderModel = context.getRealm().getIdentityProvidersStream()
var identityProviderModel = context.getSession().identityProviders().getAllStream()
.filter(idp -> idp.getAlias().equals(ssoId))
.filter(IdentityProviderModel::isEnabled)
.filter(not(IdentityProviderModel::isLinkOnly))
Expand Down
7 changes: 3 additions & 4 deletions ...dev/sultanov/keycloak/multitenancy/authentication/requiredactions/SelectActiveTenant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import dev.sultanov.keycloak.multitenancy.model.TenantProvider;
import dev.sultanov.keycloak.multitenancy.util.Constants;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;
import java.util.List;
import java.util.Optional;
import lombok.extern.jbosslog.JBossLog;
Expand Down Expand Up @@ -48,7 +47,7 @@ public void evaluateTriggers(RequiredActionContext context) {
@Override
public void requiredActionChallenge(RequiredActionContext context) {
var tenantMemberships = getFilteredTenantMemberships(context);
if (tenantMemberships.size() == 0) {
if (tenantMemberships.isEmpty()) {
context.success();
} else if (tenantMemberships.size() == 1) {
log.debugf("User is a member of a single tenant, setting active tenant automatically");
Expand Down Expand Up @@ -120,7 +119,7 @@ private List<TenantMembershipModel> getFilteredTenantMemberships(RequiredActionC
var tenantMembershipModels = tenantMembershipsStream.filter(
membership -> idpTenantsConfig.get().getAccessibleTenantIds().contains(membership.getTenant().getId()))
.toList();
if (tenantMembershipModels.size() == 0) {
if (tenantMembershipModels.isEmpty()) {
throw new AuthenticationFlowException("User does not have access to any of IDP tenants", AuthenticationFlowError.ACCESS_DENIED);
}
return tenantMembershipModels;
Expand All @@ -137,7 +136,7 @@ private List<TenantMembershipModel> getFilteredTenantMemberships(RequiredActionC
*/
private Optional<IdentityProviderTenantsConfig> getIdentityProviderTenantsConfig(RequiredActionContext context) {
return getSessionNote(context, IDENTITY_PROVIDER_SESSION_NOTE)
.map(context.getRealm()::getIdentityProviderByAlias)
.map(context.getSession().identityProviders()::getByAlias)
.map(IdentityProviderTenantsConfig::of);
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/theme-resources/templates/create-tenant.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
${kcSanitize(msg("createTenantHeader"))?no_esc}
<#elseif section = "form">
<form class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">

<div class="${properties.kcFormGroupClass!}">
<p>${msg("createTenantInfo")}</p>
</div>
<div class="${properties.kcFormGroupClass!}">
<div class="${properties.kcLabelWrapperClass!}">
<label for="tenantName" class="${properties.kcLabelClass!}">${msg("tenantName")}</label>
Expand All @@ -29,7 +31,5 @@
</div>
</div>
</form>
<#elseif section = "info" >
${msg("createTenantInfo")}
</#if>
</@layout.registrationLayout>
6 changes: 3 additions & 3 deletions src/main/resources/theme-resources/templates/login-with-sso.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<#elseif section = "form">
<form class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
<div class="${properties.kcFormGroupClass!}">

<p>${msg("ssoInfo")}</p>
</div>
<div class="${properties.kcFormGroupClass!}">
<div class="${properties.kcLabelWrapperClass!}">
<label for="sso-id" class="${properties.kcLabelClass!}">${msg("ssoLabel")}</label>
</div>
Expand All @@ -27,7 +29,5 @@
</div>
</div>
</form>
<#elseif section = "info" >
${msg("ssoInfo")}
</#if>
</@layout.registrationLayout>
44 changes: 26 additions & 18 deletions src/main/resources/theme-resources/templates/review-invitations.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,34 @@
<#if section = "header">
${kcSanitize(msg("reviewInvitationsHeader"))?no_esc}
<#elseif section = "form">
<form class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
<div class="${properties.kcFormGroupClass!}">
<div class="${properties.kcFormOptionsClass!}">
<div class="${properties.kcFormOptionsWrapperClass!}">
<#list data.tenants as tenant>
<div class="checkbox">
<label class="${properties.kcLabelClass!}">
<input id="tenant-${tenant.id}" name="tenants" type="checkbox" value="${tenant.id}" checked> ${tenant.name}
</label>
<div id="kc-form">
<div id="kc-form-wrapper">
<form class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">

<div class="${properties.kcFormGroupClass!}">
<p>${msg("reviewInvitationsInfo")}</p>
</div>
<div class="${properties.kcFormGroupClass!}">
<div class="${properties.kcFormOptionsClass!}">
<div class="${properties.kcFormOptionsWrapperClass!}">
<#list data.tenants as tenant>
<div class="checkbox">
<label class="${properties.kcLabelClass!}">
<input id="tenant-${tenant.id}" name="tenants" type="checkbox" value="${tenant.id}" checked> ${tenant.name}
</label>
</div>
</#list>
</div>
</#list>
</div>
</div>
<div class="${properties.kcFormGroupClass!}">
<div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
<input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}"
name="accept" id="kc-accept" type="submit" value="${msg("doAccept")}"/>
</div>
</div>
</div>
<div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
<input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}"
name="accept" id="kc-accept" type="submit" value="${msg("doAccept")}"/>
</div>
</form>
</div>
</form>
<#elseif section = "info" >
${msg("reviewInvitationsInfo")}
</div>
</#if>
</@layout.registrationLayout>
7 changes: 5 additions & 2 deletions src/main/resources/theme-resources/templates/select-tenant.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
${kcSanitize(msg("selectTenantHeader"))?no_esc}
<#elseif section = "form">
<form class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
<div class="${properties.kcFormGroupClass!}">
<p>${msg("selectTenantInfo")}</p>
</div>
<div class="${properties.kcFormGroupClass!}">
<label class="${properties.kcLabelWrapperClass!}">
<select class="${properties.kcInputClass!}" name="tenant" required>
Expand All @@ -12,13 +15,13 @@
</#list>
</select>
</label>
</div>
<div class="${properties.kcFormGroupClass!}">
<div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
<input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}"
name="accept" id="kc-accept" type="submit" value="${msg("doLogIn")}"/>
</div>
</div>
</form>
<#elseif section = "info" >
${msg("selectTenantInfo")}
</#if>
</@layout.registrationLayout>
2 changes: 1 addition & 1 deletion src/test/java/dev/sultanov/keycloak/multitenancy/support/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class BaseIntegrationTest {
private static final Integer MAILHOG_HTTP_PORT = 8025;

private static final Network network = Network.newNetwork();
private static final KeycloakContainer keycloak = new KeycloakContainer("quay.io/keycloak/keycloak:25.0.1")
private static final KeycloakContainer keycloak = new KeycloakContainer("quay.io/keycloak/keycloak:26.0.7")
.withRealmImportFiles("/realm-export.json", "/idp-realm-export.json")
.withProviderClassesFrom("target/classes")
.withNetwork(network)
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/dev/sultanov/keycloak/multitenancy/support/browser/SelectTenantPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public class SelectTenantPage extends AbstractPage {
}

public List<String> availableOptions() {
return page.getByRole(AriaRole.OPTION).allTextContents();
return page.locator("select[name='tenant']").locator("option").allTextContents();
}

public SelectTenantPage select(String tenantName) {
page.getByRole(AriaRole.COMBOBOX).selectOption(new SelectOption().setLabel(tenantName));
page.locator("select[name='tenant']").selectOption(new SelectOption().setLabel(tenantName));
return this;
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/idp-realm-export.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"oauth2DeviceCodeLifespan" : 600,
"oauth2DevicePollingInterval" : 5,
"enabled" : true,
"sslRequired" : "external",
"sslRequired" : "none",
"registrationAllowed" : false,
"registrationEmailAsUsername" : true,
"rememberMe" : false,
Expand Down Expand Up @@ -511,7 +511,7 @@
"protocol" : "openid-connect",
"attributes" : { },
"authenticationFlowBindingOverrides" : { },
"fullScopeAllowed" : false,
"fullScopeAllowed" : true,
"nodeReRegistrationTimeout" : 0,
"defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
"optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/realm-export.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"oauth2DeviceCodeLifespan": 600,
"oauth2DevicePollingInterval": 5,
"enabled": true,
"sslRequired": "external",
"sslRequired": "none",
"registrationAllowed": true,
"registrationEmailAsUsername": true,
"rememberMe": false,
Expand Down
Loading