Change the endpoint

fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java

 package at.tuwien.config;
 
-import at.tuwien.service.AuthenticationService;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
@@ -107,6 +106,13 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
         return new HttpClient(multiThreadedHttpConnectionManager());
     }
 
+    @Bean
+    public SAMLAuthenticationProvider samlAuthenticationProvider() {
+        final SAMLAuthenticationProvider samlAuthenticationProvider = new SAMLAuthenticationProvider();
+        samlAuthenticationProvider.setForcePrincipalAsString(false);
+        return samlAuthenticationProvider;
+    }
+
     @Bean
     public WebSSOProfileConsumer webSSOprofileConsumer() {
         return new WebSSOProfileConsumerImpl();
@@ -347,11 +353,6 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
         return new JKSKeyManager(storeFile, samlKeystorePassword, passwords, samlKeystoreAlias);
     }
 
-    @Bean
-    public SAMLAuthenticationProvider samlAuthenticationProvider() {
-        return new AuthenticationService();
-    }
-
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
         auth.authenticationProvider(samlAuthenticationProvider());

fda-authentication-service/rest-service/src/main/java/at/tuwien/endpoints/AuthenticationEndpoint.java

@@ -6,16 +6,16 @@ import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
 @Log4j2
-@RestController("/api/auth")
+@RestController
 @CrossOrigin(origins = "*")
 public class AuthenticationEndpoint {
 
-    @GetMapping("/")
+    @GetMapping("/api/auth")
     public String index() {
         return "Index";
     }
 
-    @GetMapping("/info")
+    @GetMapping("/api/auth/info")
     public ResponseEntity<Object> info(Authentication authentication) {
         return ResponseEntity.ok(authentication.getName());
     }

fda-authentication-service/rest-service/src/main/java/at/tuwien/endpoints/TestEndpoint.java

-package at.tuwien.endpoints;
-
-import lombok.extern.log4j.Log4j2;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Log4j2
-@RestController("/api/test")
-@CrossOrigin(origins = "*")
-public class TestEndpoint {
-
-    @GetMapping("/")
-    public String index() {
-        final Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        log.debug("auth {}", auth);
-        log.debug("auth principal {}", auth.getPrincipal());
-        return "hello";
-    }
-
-}
\ No newline at end of file

fda-authentication-service/services/src/main/java/at/tuwien/service/AuthenticationService.java

-package at.tuwien.service;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.providers.ExpiringUsernameAuthenticationToken;
-import org.springframework.security.saml.SAMLAuthenticationProvider;
-import org.springframework.security.saml.SAMLCredential;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-@Service
-public class AuthenticationService extends SAMLAuthenticationProvider {
-
-    @Override
-    public Collection<? extends GrantedAuthority> getEntitlements(SAMLCredential credential, Object userDetail) {
-        if (userDetail instanceof ExpiringUsernameAuthenticationToken) {
-            return new ArrayList<>(((ExpiringUsernameAuthenticationToken) userDetail)
-                    .getAuthorities());
-        } else {
-            return Collections.emptyList();
-        }
-    }
-}
\ No newline at end of file