From a20a26c49bea1e3196fcca896d4e706f298916ab Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 2 Jun 2023 16:38:57 -0700
Subject: [PATCH] SHIBUI-2568/2571

Merging changes to develop
---
 .../admin/ui/configuration/SpringSecurityConfig.java         | 5 +++++
 .../net/unicon/shibui/pac4j/Pac4jSpringSecurityConfig.java   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/SpringSecurityConfig.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/SpringSecurityConfig.java
index a0b58ff01..76b3299af 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/SpringSecurityConfig.java
+++ b/backend/src/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
index 777fec504..a1bc022ca 100644
--- 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