[SYNCOPE-1545] Minor fixes
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AuthModuleWizardBuilder.java b/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AuthModuleWizardBuilder.java
index da50eda..e4103e6 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AuthModuleWizardBuilder.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AuthModuleWizardBuilder.java
@@ -181,8 +181,7 @@
this.authModuleConfClass = authModuleConfClass;
- PropertyModel<GoogleMfaAuthModuleConf.LDAP> beanPanelModel =
- new PropertyModel<>(authModule.getConf(), "ldap");
+ PropertyModel<GoogleMfaAuthModuleConf.LDAP> beanPanelModel = new PropertyModel<>(authModule, "conf.ldap");
AjaxCheckBoxPanel enable = new AjaxCheckBoxPanel("enable", "enableLDAP", new IModel<Boolean>() {
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 ceba2db..b929fb6 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
@@ -104,10 +104,14 @@
@Configuration(proxyBeanMethods = false)
public class WAContext {
+ public static final String CUSTOM_GOOGLE_AUTHENTICATOR_ACCOUNT_REGISTRY =
+ "customGoogleAuthenticatorAccountRegistry";
+
private static String version(final ConfigurableApplicationContext ctx) {
return ctx.getEnvironment().getProperty("version");
}
+ @ConditionalOnMissingBean
@Bean
public OpenAPI casSwaggerOpenApi(final ConfigurableApplicationContext ctx) {
return new OpenAPI().
@@ -244,7 +248,7 @@
return plan -> plan.registerAuditTrailManager(new WAAuditTrailManager(restClient));
}
- @ConditionalOnMissingBean(name = "syncopeWaEventRepositoryFilter")
+ @ConditionalOnMissingBean(name = "syncopeWAEventRepositoryFilter")
@Bean
public CasEventRepositoryFilter syncopeWAEventRepositoryFilter() {
return CasEventRepositoryFilter.noOp();
@@ -273,6 +277,7 @@
restClient, casProperties.getAuthn().getMfa().getGauth().getCore().getTimeStepSize());
}
+ @ConditionalOnMissingBean(name = CUSTOM_GOOGLE_AUTHENTICATOR_ACCOUNT_REGISTRY)
@RefreshScope(proxyMode = ScopedProxyMode.DEFAULT)
@Bean
public OneTimeTokenCredentialRepository googleAuthenticatorAccountRegistry(
