New version saml-idp

README.md

@@ -8,7 +8,7 @@ An IdP for OpenConext. A user can create and manage his own identity. Authentica
 
 ### [System Requirements](#system-requirements)
 
-- Java 8
+- Java 11
 - Maven 3
 - MongoDB 3.4.x
 - Yarn 1.x

myconext-server/pom.xml

@@ -37,6 +37,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.openconext</groupId>
+            <artifactId>saml-idp</artifactId>
+            <version>0.0.6-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -45,11 +50,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.openconext</groupId>
-            <artifactId>saml-idp</artifactId>
-            <version>0.0.5-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>

myconext-server/src/main/java/myconext/manage/ServiceProviderHolder.java

@@ -3,6 +3,7 @@
 import myconext.model.SamlAuthenticationRequest;
 import myconext.model.ServiceProvider;
 
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Optional;
 
@@ -13,11 +14,11 @@ public interface ServiceProviderHolder {
     ServiceProviderResolver getServiceProviderResolver() ;
 
     default String getServiceName(HttpServletRequest request, SamlAuthenticationRequest samlAuthenticationRequest) {
-        String lang = cookieByName(request, "lang").map(cookie -> cookie.getValue()).orElse("en");
-        Optional<ServiceProvider> optionalServiceProvider = getServiceProviderResolver().resolve(samlAuthenticationRequest.getRequesterEntityId());
-        String serviceName = optionalServiceProvider.map(serviceProvider -> lang.equals("en") ? serviceProvider.getName() : serviceProvider.getNameNl())
-                .orElse(samlAuthenticationRequest.getRequesterEntityId());
-        return serviceName;
+        String lang = cookieByName(request, "lang").map(Cookie::getValue).orElse("en");
+        String requesterEntityId = samlAuthenticationRequest.getRequesterEntityId();
+        Optional<ServiceProvider> optionalServiceProvider = getServiceProviderResolver().resolve(requesterEntityId);
+        return optionalServiceProvider.map(serviceProvider -> lang.equals("en") ? serviceProvider.getName() : serviceProvider.getNameNl())
+                .orElse(requesterEntityId);
     }