OPHYK-175 Read user details from CAS attributes

Opetushallitus · Oct 8, 2024 · d010c91 · d010c91
1 parent 37af8bf
commit d010c91
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -110,7 +110,7 @@
         <dependency>
             <groupId>fi.vm.sade.java-utils</groupId>
             <artifactId>opintopolku-user-details-service</artifactId>
-            <version>0.2.0-SNAPSHOT</version>
+            <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>fi.vm.sade.java-utils</groupId>

diff --git a/...in/java/fi/vm/sade/varda/rekisterointi/configuration/UserDetailsServiceConfiguration.java b/...in/java/fi/vm/sade/varda/rekisterointi/configuration/UserDetailsServiceConfiguration.java
diff --git a/...java/fi/vm/sade/varda/rekisterointi/configuration/VirkailijaWebSecurityConfiguration.java b/...java/fi/vm/sade/varda/rekisterointi/configuration/VirkailijaWebSecurityConfiguration.java
@@ -1,6 +1,7 @@
 package fi.vm.sade.varda.rekisterointi.configuration;
 
 import fi.vm.sade.java_utils.security.OpintopolkuCasAuthenticationFilter;
+import fi.vm.sade.javautils.kayttooikeusclient.OphUserDetailsServiceImpl;
 import fi.vm.sade.properties.OphProperties;
 import org.jasig.cas.client.session.SingleSignOutFilter;
 import org.jasig.cas.client.validation.Cas20ProxyTicketValidator;
@@ -36,11 +37,9 @@ public class VirkailijaWebSecurityConfiguration extends WebSecurityConfigurerAda
     private static final String VIRKAILIJA_PATH_CLOB = "/virkailija/**";
 
     private final OphProperties ophProperties;
-    private final UserDetailsService userDetailsService;
 
-    VirkailijaWebSecurityConfiguration(OphProperties ophProperties, UserDetailsService userDetailsService) {
+    VirkailijaWebSecurityConfiguration(OphProperties ophProperties) {
         this.ophProperties = ophProperties;
-        this.userDetailsService = userDetailsService;
     }
 
     @Override
@@ -91,7 +90,7 @@ public AuthenticationEntryPoint virkailijaAuthenticationEntryPoint() {
     @Bean
     public AuthenticationProvider virkailijaAuthenticationProvider() {
         CasAuthenticationProvider casAuthenticationProvider = new CasAuthenticationProvider();
-        casAuthenticationProvider.setUserDetailsService(userDetailsService);
+        casAuthenticationProvider.setAuthenticationUserDetailsService(new OphUserDetailsServiceImpl());
         casAuthenticationProvider.setServiceProperties(serviceProperties());
         casAuthenticationProvider.setTicketValidator(ticketValidator());
         casAuthenticationProvider.setKey("varda-rekisterointi");