Merge branch 'develop'

Author: JorgenHeinsoo

pom.xml

@@ -6,7 +6,7 @@
     <groupId>ee.ria.tara</groupId>
     <artifactId>tara-server</artifactId>
     <packaging>war</packaging>
-    <version>1.4.12</version>
+    <version>1.4.13</version>
 
     <properties>
         <cas.version>5.3.9</cas.version>

src/main/java/ee/ria/sso/config/TaraOidcConfiguration.java

@@ -161,7 +161,7 @@ public class TaraOidcConfiguration {
     @Qualifier("consentApprovalViewResolver")
     private ConsentApprovalViewResolver consentApprovalViewResolver;
 
-    @Autowired
+    @Autowired(required=false)
     private EidasConfigurationProvider eidasConfigurationProvider;
 
     @Bean
@@ -278,8 +278,12 @@ private ExpirationPolicy oAuthCodeExpirationPolicy() {
     }
 
     private List<String> determineSupportedScopes(List<String> oidcScopes) {
-        return Stream.of(oidcScopes, eidasConfigurationProvider.getAllowedEidasCountryScopeAttributes())
+        return Stream.of(oidcScopes, getAllowedEidasCountryScopeAttributes())
                 .flatMap(Collection::stream)
                 .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
     }
+
+    private List<String> getAllowedEidasCountryScopeAttributes() {
+        return eidasConfigurationProvider == null ? Collections.emptyList() : eidasConfigurationProvider.getAllowedEidasCountryScopeAttributes();
+    }
 }

src/main/java/ee/ria/sso/oidc/OidcAuthorizeRequestValidationServletFilter.java

@@ -34,6 +34,8 @@
 public class OidcAuthorizeRequestValidationServletFilter implements Filter {
 
     private final OidcAuthorizeRequestValidator oidcAuthorizeRequestValidator;
+
+
     private final EidasConfigurationProvider eidasConfigurationProvider;
 
     @Override
@@ -90,7 +92,10 @@ private void saveOidcRequestParametersToSession(final HttpServletRequest request
         String[] scopeElements = getScopeElements(request);
         List<TaraScope> scopes = parseScopes(scopeElements);
         session.setAttribute(Constants.TARA_OIDC_SESSION_SCOPES, scopes);
-        session.setAttribute(Constants.TARA_OIDC_SESSION_SCOPE_EIDAS_COUNTRY, parseScopeEidasCountry(scopeElements).orElse(null));
+
+        if (eidasConfigurationProvider != null) {
+            session.setAttribute(Constants.TARA_OIDC_SESSION_SCOPE_EIDAS_COUNTRY, parseScopeEidasCountry(scopeElements).orElse(null));
+        }
 
         session.setAttribute(Constants.TARA_OIDC_SESSION_CLIENT_ID,
                 request.getParameter(OidcAuthorizeRequestParameter.CLIENT_ID.getParameterKey())