Compare commits

..

2 commits

Author SHA1 Message Date
1c7f7e7e54 Provide SCIM2 client capabilities behing an experimental Feature Profile
Some checks failed
Keycloak CI / AuroraDB IT (push) Has been cancelled
Keycloak CI / Store IT (push) Has been cancelled
Keycloak CI / Store Model Tests (push) Has been cancelled
Keycloak CI / Clustering IT (push) Has been cancelled
Keycloak CI / FIPS UT (push) Has been cancelled
Keycloak CI / Forms IT (push) Has been cancelled
Keycloak CI / WebAuthn IT (push) Has been cancelled
Keycloak CI / SSSD (push) Has been cancelled
Keycloak CI / Test Framework (push) Has been cancelled
Keycloak CI / Base IT (new) (push) Has been cancelled
Keycloak CI / Status Check - Keycloak CI (push) Has been cancelled
CodeQL / CodeQL Java (push) Has been cancelled
CodeQL / CodeQL JavaScript (push) Has been cancelled
CodeQL / CodeQL TypeScript (push) Has been cancelled
CodeQL / Status Check - CodeQL (push) Has been cancelled
Keycloak Documentation / Build (push) Has been cancelled
Keycloak Documentation / External links check (push) Has been cancelled
Keycloak Documentation / Status Check - Keycloak Documentation (push) Has been cancelled
Keycloak JavaScript CI / Build Keycloak (push) Has been cancelled
Keycloak JavaScript CI / Admin Client (push) Has been cancelled
Keycloak JavaScript CI / UI Shared (push) Has been cancelled
Keycloak JavaScript CI / Account UI (push) Has been cancelled
Keycloak JavaScript CI / Admin UI (push) Has been cancelled
Keycloak JavaScript CI / Account UI E2E (push) Has been cancelled
Keycloak JavaScript CI / Generate Test Seed (push) Has been cancelled
Keycloak JavaScript CI / Admin UI E2E (push) Has been cancelled
Keycloak JavaScript CI / Status Check - Keycloak JavaScript CI (push) Has been cancelled
Keycloak Operator CI / Test remote (push) Has been cancelled
Keycloak Operator CI / Test OLM installation (push) Has been cancelled
Keycloak Operator CI / Status Check - Keycloak Operator CI (push) Has been cancelled
Closes #1234

Signed-off-by: Alex Morel <amorel@codelutin.com>
2024-11-07 11:15:18 +01:00
Achim Rolle
83065b85a2
Fix credential_type in update/remove credential email template
Closes #34687

Signed-off-by: Achim Rolle <achim.rolle@aoe.com>
Signed-off-by: rmartinc <rmartinc@redhat.com>
Co-authored-by: rmartinc <rmartinc@redhat.com>
2024-11-07 10:13:53 +00:00
7 changed files with 115 additions and 57 deletions

View file

@ -58,6 +58,12 @@ public class EventBean {
return details; return details;
} }
public String getDetail(String name) {
return event.getDetails() != null
? event.getDetails().get(name)
: null;
}
public static class DetailBean { public static class DetailBean {
private Map.Entry<String, String> entry; private Map.Entry<String, String> entry;

View file

@ -19,17 +19,21 @@
package org.keycloak.testsuite.actions; package org.keycloak.testsuite.actions;
import java.util.List; import jakarta.mail.internet.MimeMessage;
import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.jboss.arquillian.graphene.page.Page; import org.jboss.arquillian.graphene.page.Page;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.keycloak.authentication.requiredactions.DeleteCredentialAction; import org.keycloak.authentication.requiredactions.DeleteCredentialAction;
import org.keycloak.events.Details; import org.keycloak.events.Details;
import org.keycloak.events.Errors; import org.keycloak.events.Errors;
import org.keycloak.events.EventType; import org.keycloak.events.EventType;
import org.keycloak.events.email.EmailEventListenerProviderFactory;
import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.models.credential.OTPCredentialModel;
import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.models.credential.PasswordCredentialModel;
import org.keycloak.models.utils.TimeBasedOTP; import org.keycloak.models.utils.TimeBasedOTP;
@ -41,6 +45,9 @@ import org.keycloak.testsuite.pages.DeleteCredentialPage;
import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.ErrorPage;
import org.keycloak.testsuite.pages.LoginConfigTotpPage; import org.keycloak.testsuite.pages.LoginConfigTotpPage;
import org.keycloak.testsuite.pages.LoginTotpPage; import org.keycloak.testsuite.pages.LoginTotpPage;
import org.keycloak.testsuite.updaters.RealmAttributeUpdater;
import org.keycloak.testsuite.util.GreenMailRule;
import org.keycloak.testsuite.util.MailUtils;
import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.UserBuilder;
/** /**
@ -48,6 +55,9 @@ import org.keycloak.testsuite.util.UserBuilder;
*/ */
public class AppInitiatedActionDeleteCredentialTest extends AbstractAppInitiatedActionTest { public class AppInitiatedActionDeleteCredentialTest extends AbstractAppInitiatedActionTest {
@Rule
public GreenMailRule greenMail = new GreenMailRule();
@Override @Override
protected String getAiaAction() { protected String getAiaAction() {
return DeleteCredentialAction.PROVIDER_ID; return DeleteCredentialAction.PROVIDER_ID;
@ -76,9 +86,11 @@ public class AppInitiatedActionDeleteCredentialTest extends AbstractAppInitiated
@Before @Before
public void beforeTest() { public void beforeTest() {
ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost");
UserRepresentation user = UserBuilder.create() UserRepresentation user = UserBuilder.create()
.username("john") .username("john")
.email("john@email.cz") .email("test-user@localhost")
.emailVerified(true)
.firstName("John") .firstName("John")
.lastName("Bar") .lastName("Bar")
.enabled(true) .enabled(true)
@ -92,6 +104,10 @@ public class AppInitiatedActionDeleteCredentialTest extends AbstractAppInitiated
@Test @Test
public void removeOtpSuccess() throws Exception { public void removeOtpSuccess() throws Exception {
try (RealmAttributeUpdater updater = new RealmAttributeUpdater(testRealm())
.addEventsListener(EmailEventListenerProviderFactory.ID)
.update()) {
String credentialId = getCredentialIdByType(OTPCredentialModel.TYPE); String credentialId = getCredentialIdByType(OTPCredentialModel.TYPE);
oauth.kcAction(getKcActionParamForDeleteCredential(credentialId)); oauth.kcAction(getKcActionParamForDeleteCredential(credentialId));
@ -119,6 +135,17 @@ public class AppInitiatedActionDeleteCredentialTest extends AbstractAppInitiated
.detail(Details.CREDENTIAL_ID, credentialId) .detail(Details.CREDENTIAL_ID, credentialId)
.detail(Details.CUSTOM_REQUIRED_ACTION, DeleteCredentialAction.PROVIDER_ID) .detail(Details.CUSTOM_REQUIRED_ACTION, DeleteCredentialAction.PROVIDER_ID)
.assertEvent(); .assertEvent();
MimeMessage[] receivedMessages = greenMail.getReceivedMessages();
Assert.assertEquals(2, receivedMessages.length);
Assert.assertEquals("Remove OTP", receivedMessages[0].getSubject());
Assert.assertEquals("Remove credential", receivedMessages[1].getSubject());
MatcherAssert.assertThat(MailUtils.getBody(receivedMessages[1]).getText(),
Matchers.startsWith("Credential otp was removed from your account"));
MatcherAssert.assertThat(MailUtils.getBody(receivedMessages[1]).getHtml(),
Matchers.containsString("Credential otp was removed from your account"));
}
} }
@Test @Test

View file

@ -16,6 +16,9 @@
*/ */
package org.keycloak.testsuite.actions; package org.keycloak.testsuite.actions;
import jakarta.mail.internet.MimeMessage;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.jboss.arquillian.drone.api.annotation.Drone; import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.graphene.page.Page; import org.jboss.arquillian.graphene.page.Page;
import org.junit.After; import org.junit.After;
@ -26,6 +29,7 @@ import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.cookie.CookieType; import org.keycloak.cookie.CookieType;
import org.keycloak.events.Details; import org.keycloak.events.Details;
import org.keycloak.events.EventType; import org.keycloak.events.EventType;
import org.keycloak.events.email.EmailEventListenerProviderFactory;
import org.keycloak.models.RealmModel; import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel; import org.keycloak.models.UserModel;
import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.models.credential.PasswordCredentialModel;
@ -35,7 +39,10 @@ import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation;
import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.admin.ApiUtil;
import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage;
import org.keycloak.testsuite.updaters.RealmAttributeUpdater;
import org.keycloak.testsuite.updaters.UserAttributeUpdater;
import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.GreenMailRule;
import org.keycloak.testsuite.util.MailUtils;
import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.OAuthClient;
import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.testsuite.util.SecondBrowser;
import org.openqa.selenium.Cookie; import org.openqa.selenium.Cookie;
@ -81,6 +88,13 @@ public class AppInitiatedActionResetPasswordTest extends AbstractAppInitiatedAct
@Test @Test
public void resetPassword() throws Exception { public void resetPassword() throws Exception {
try (RealmAttributeUpdater realmUpdater = new RealmAttributeUpdater(testRealm())
.addEventsListener(EmailEventListenerProviderFactory.ID)
.update();
UserAttributeUpdater userUpdater = new UserAttributeUpdater(ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"))
.setEmailVerified(true)
.update()) {
loginPage.open(); loginPage.open();
loginPage.login("test-user@localhost", "password"); loginPage.login("test-user@localhost", "password");
@ -110,6 +124,16 @@ public class AppInitiatedActionResetPasswordTest extends AbstractAppInitiatedAct
events.expectRequiredAction(EventType.UPDATE_PASSWORD).assertEvent(); events.expectRequiredAction(EventType.UPDATE_PASSWORD).assertEvent();
events.expectRequiredAction(EventType.UPDATE_CREDENTIAL).detail(Details.CREDENTIAL_TYPE, PasswordCredentialModel.TYPE).assertEvent(); events.expectRequiredAction(EventType.UPDATE_CREDENTIAL).detail(Details.CREDENTIAL_TYPE, PasswordCredentialModel.TYPE).assertEvent();
MimeMessage[] receivedMessages = greenMail.getReceivedMessages();
Assert.assertEquals(2, receivedMessages.length);
Assert.assertEquals("Update password", receivedMessages[0].getSubject());
Assert.assertEquals("Update credential", receivedMessages[1].getSubject());
MatcherAssert.assertThat(MailUtils.getBody(receivedMessages[1]).getText(),
Matchers.startsWith("Your password credential was changed"));
MatcherAssert.assertThat(MailUtils.getBody(receivedMessages[1]).getHtml(),
Matchers.containsString("Your password credential was changed"));
assertKcActionStatus(SUCCESS); assertKcActionStatus(SUCCESS);
EventRepresentation loginEvent = events.expectLogin().assertEvent(); EventRepresentation loginEvent = events.expectLogin().assertEvent();
@ -124,6 +148,7 @@ public class AppInitiatedActionResetPasswordTest extends AbstractAppInitiatedAct
events.expectLogin().assertEvent(); events.expectLogin().assertEvent();
} }
}
@Test @Test
public void resetPasswordRequiresReAuth() throws Exception { public void resetPasswordRequiresReAuth() throws Exception {

View file

@ -1,4 +1,4 @@
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.emailLayout> <@layout.emailLayout>
${kcSanitize(msg("eventRemoveCredentialBodyHtml", event.details.credential_type!"unknown", event.date, event.ipAddress))?no_esc} ${kcSanitize(msg("eventRemoveCredentialBodyHtml", event.getDetail("credential_type")!"unknown", event.date, event.ipAddress))?no_esc}
</@layout.emailLayout> </@layout.emailLayout>

View file

@ -1,4 +1,4 @@
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.emailLayout> <@layout.emailLayout>
${kcSanitize(msg("eventUpdateCredentialBodyHtml", event.details.credential_type!"unknown", event.date, event.ipAddress))?no_esc} ${kcSanitize(msg("eventUpdateCredentialBodyHtml", event.getDetail("credential_type")!"unknown", event.date, event.ipAddress))?no_esc}
</@layout.emailLayout> </@layout.emailLayout>

View file

@ -1,2 +1,2 @@
<#ftl output_format="plainText"> <#ftl output_format="plainText">
${msg("eventRemoveCredentialBody", event.details.credential_type!"unknown", event.date, event.ipAddress)} ${msg("eventRemoveCredentialBody", event.getDetail("credential_type")!"unknown", event.date, event.ipAddress)}

View file

@ -1,2 +1,2 @@
<#ftl output_format="plainText"> <#ftl output_format="plainText">
${msg("eventUpdateCredentialBody", event.details.credential_type!"unknown", event.date, event.ipAddress)} ${msg("eventUpdateCredentialBody", event.getDetail("credential_type")!"unknown", event.date, event.ipAddress)}