This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
commit d658efdd6207c4619ff02d92bc6898d9c684072e Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Fri May 9 09:34:49 2025 +0200 Aligning with latest CAS updates --- .../main/java/org/apache/syncope/wa/starter/config/WAContext.java | 7 ++++--- .../wa/starter/gauth/WAGoogleMfaAuthCredentialRepository.java | 4 ++-- .../apache/syncope/wa/starter/events/WAEventRepositoryTest.java | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/wa/starter/src/main/java/org/apache/syncope/wa/starter/config/WAContext.java b/wa/starter/src/main/java/org/apache/syncope/wa/starter/config/WAContext.java index 77a8240a4a..60a58e1c4b 100644 --- a/wa/starter/src/main/java/org/apache/syncope/wa/starter/config/WAContext.java +++ b/wa/starter/src/main/java/org/apache/syncope/wa/starter/config/WAContext.java @@ -19,7 +19,6 @@ package org.apache.syncope.wa.starter.config; import com.github.benmanes.caffeine.cache.Cache; -import com.warrenstrange.googleauth.IGoogleAuthenticator; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; import io.swagger.v3.oas.models.info.Info; @@ -71,6 +70,7 @@ import org.apereo.cas.authentication.MultifactorAuthenticationProvider; import org.apereo.cas.authentication.surrogate.SurrogateAuthenticationService; import org.apereo.cas.configuration.CasConfigurationProperties; import org.apereo.cas.configuration.model.support.mfa.gauth.LdapGoogleAuthenticatorMultifactorProperties; +import org.apereo.cas.gauth.CasGoogleAuthenticator; import org.apereo.cas.gauth.credential.LdapGoogleAuthenticatorTokenCredentialRepository; import org.apereo.cas.oidc.jwks.generator.OidcJsonWebKeystoreGeneratorService; import org.apereo.cas.otp.repository.credentials.OneTimeTokenCredentialRepository; @@ -210,7 +210,7 @@ public class WAContext { return new RegisteredServiceMapper( Optional.ofNullable(casProperties.getAuthn().getPac4j().getCore().getName()). - orElseGet(DelegatedClientAuthenticationHandler.class::getSimpleName), + orElseGet(DelegatedClientAuthenticationHandler.class::getSimpleName), authenticationEventExecutionPlan, multifactorAuthenticationProviders, authMappers, @@ -310,7 +310,8 @@ public class WAContext { final CipherExecutor<String, String> googleAuthenticatorAccountCipherExecutor, @Qualifier("googleAuthenticatorScratchCodesCipherExecutor") final CipherExecutor<Number, Number> googleAuthenticatorScratchCodesCipherExecutor, - final IGoogleAuthenticator googleAuthenticatorInstance, + @Qualifier(CasGoogleAuthenticator.BEAN_NAME) + final CasGoogleAuthenticator googleAuthenticatorInstance, final WARestClient waRestClient) { /* diff --git a/wa/starter/src/main/java/org/apache/syncope/wa/starter/gauth/WAGoogleMfaAuthCredentialRepository.java b/wa/starter/src/main/java/org/apache/syncope/wa/starter/gauth/WAGoogleMfaAuthCredentialRepository.java index fbfcb77ae7..0e3f7d172c 100644 --- a/wa/starter/src/main/java/org/apache/syncope/wa/starter/gauth/WAGoogleMfaAuthCredentialRepository.java +++ b/wa/starter/src/main/java/org/apache/syncope/wa/starter/gauth/WAGoogleMfaAuthCredentialRepository.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.wa.starter.gauth; -import com.warrenstrange.googleauth.IGoogleAuthenticator; import java.time.OffsetDateTime; import java.util.Collection; import java.util.List; @@ -29,6 +28,7 @@ import org.apache.syncope.common.lib.wa.GoogleMfaAuthAccount; import org.apache.syncope.common.rest.api.service.wa.GoogleMfaAuthAccountService; import org.apache.syncope.wa.bootstrap.WARestClient; import org.apereo.cas.authentication.OneTimeTokenAccount; +import org.apereo.cas.gauth.CasGoogleAuthenticator; import org.apereo.cas.gauth.credential.BaseGoogleAuthenticatorTokenCredentialRepository; import org.apereo.cas.gauth.credential.GoogleAuthenticatorAccount; import org.apereo.cas.util.crypto.CipherExecutor; @@ -42,7 +42,7 @@ public class WAGoogleMfaAuthCredentialRepository extends BaseGoogleAuthenticator protected final WARestClient waRestClient; public WAGoogleMfaAuthCredentialRepository( - final WARestClient waRestClient, final IGoogleAuthenticator googleAuthenticator) { + final WARestClient waRestClient, final CasGoogleAuthenticator googleAuthenticator) { super(CipherExecutor.noOpOfStringToString(), CipherExecutor.noOpOfNumberToNumber(), googleAuthenticator); this.waRestClient = waRestClient; diff --git a/wa/starter/src/test/java/org/apache/syncope/wa/starter/events/WAEventRepositoryTest.java b/wa/starter/src/test/java/org/apache/syncope/wa/starter/events/WAEventRepositoryTest.java index 428a31776d..6f308dd420 100644 --- a/wa/starter/src/test/java/org/apache/syncope/wa/starter/events/WAEventRepositoryTest.java +++ b/wa/starter/src/test/java/org/apache/syncope/wa/starter/events/WAEventRepositoryTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.time.Instant; import java.util.Map; import org.apache.syncope.common.lib.to.AuditEventTO; import org.apache.syncope.common.rest.api.service.AuditService; @@ -48,7 +49,7 @@ public class WAEventRepositoryTest extends AbstractTest { @Test public void saveInternal() { - CasEvent event = new CasEvent(1L, "Auth", "principalId", "creationTime", Map.of("timestamp", "1")); + CasEvent event = new CasEvent(1L, "Auth", "principalId", Instant.now(), Map.of("timestamp", "1")); WAEventRepository eventRepository = new WAEventRepository(CasEventRepositoryFilter.noOp(), getWaRestClient()); eventRepository.saveInternal(event);
