SHIBUI-2568/2571

Merging changes to develop
TIER · Jun 2, 2023 · a20a26c · a20a26c
1 parent 07ca894
commit a20a26c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.../main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/SpringSecurityConfig.java b/.../main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/SpringSecurityConfig.java
@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.configuration;
 
+import edu.internet2.tier.shibboleth.admin.ui.domain.BeaconConfiguration;
 import edu.internet2.tier.shibboleth.admin.ui.security.DefaultAuditorAware;
 import edu.internet2.tier.shibboleth.admin.ui.security.model.Role;
 import edu.internet2.tier.shibboleth.admin.ui.security.model.User;
@@ -65,6 +66,10 @@ public class SpringSecurityConfig {
     @Autowired
     private UserService userService;
 
+    public SpringSecurityConfig() {
+        BeaconConfiguration.setAuthMechanisms("default");
+    }
+
     private UserDetailsService adminUserService() {
         if (defaultPassword != null && !"".equals(defaultPassword)) {
             User adminUser = userRepository.findByUsername(rootUser).orElseGet(() ->{

diff --git a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jSpringSecurityConfig.java b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jSpringSecurityConfig.java
@@ -2,6 +2,7 @@
 
 import edu.internet2.tier.shibboleth.admin.ui.configuration.EmailConfiguration;
 import edu.internet2.tier.shibboleth.admin.ui.configuration.SpringSecurityConfig;
+import edu.internet2.tier.shibboleth.admin.ui.domain.BeaconConfiguration;
 import edu.internet2.tier.shibboleth.admin.ui.security.service.IGroupService;
 import edu.internet2.tier.shibboleth.admin.ui.security.service.IRolesService;
 import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService;
@@ -58,6 +59,7 @@ public Pac4jSpringSecurityConfig(final Config config, UserService userService,
         this.emailService = emailService;
         this.groupService = groupService;
         this.pac4jConfigurationProperties = pac4jConfigurationProperties;
+        BeaconConfiguration.setAuthMechanisms("Pac4J - SAML2 provider");
     }
 
     @Bean