Fixes

apache · Aug 3, 2023 · ef20176 · ef20176
1 parent 854593e
commit ef20176
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...c/main/java/org/apache/syncope/core/provisioning/java/data/AuthProfileDataBinderImpl.java b/...c/main/java/org/apache/syncope/core/provisioning/java/data/AuthProfileDataBinderImpl.java
@@ -40,6 +40,7 @@ public AuthProfileTO getAuthProfileTO(final AuthProfile authProfile) {
         authProfileTO.getGoogleMfaAuthTokens().addAll(authProfile.getGoogleMfaAuthTokens());
         authProfileTO.getGoogleMfaAuthAccounts().addAll(authProfile.getGoogleMfaAuthAccounts());
         authProfileTO.getU2FRegisteredDevices().addAll(authProfile.getU2FRegisteredDevices());
+        authProfileTO.getMfaTrustedDevices().addAll(authProfile.getMfaTrustedDevices());
         authProfileTO.getWebAuthnDeviceCredentials().addAll(authProfile.getWebAuthnDeviceCredentials());
         return authProfileTO;
     }
@@ -57,6 +58,7 @@ public AuthProfile update(final AuthProfile authProfile, final AuthProfileTO aut
         authProfile.setGoogleMfaAuthTokens(authProfileTO.getGoogleMfaAuthTokens());
         authProfile.setGoogleMfaAuthAccounts(authProfileTO.getGoogleMfaAuthAccounts());
         authProfile.setU2FRegisteredDevices(authProfileTO.getU2FRegisteredDevices());
+        authProfile.setMfaTrustedDevices(authProfileTO.getMfaTrustedDevices());
         authProfile.setWebAuthnDeviceCredentials(authProfileTO.getWebAuthnDeviceCredentials());
         return authProfile;
     }

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
@@ -330,7 +330,7 @@ public OneTimeTokenCredentialRepository googleAuthenticatorAccountRegistry(
     }
 
     @RefreshScope(proxyMode = ScopedProxyMode.DEFAULT)
-    @Bean
+    @Bean(name = MultifactorAuthenticationTrustStorage.BEAN_NAME)
     public MultifactorAuthenticationTrustStorage mfaTrustStorage(
             final CasConfigurationProperties casProperties,
             @Qualifier("mfaTrustRecordKeyGenerator")