Merge remote-tracking branch 'origin/dev' into feature/issue1794

Author: chrisala

build.gradle

@@ -201,7 +201,7 @@ dependencies {
     providedCompile "io.methvin:directory-watcher:0.4.0"
 
     if (!Boolean.valueOf(inplace)) {
-        implementation "org.grails.plugins:ecodata-client-plugin:9.0"
+        implementation "org.grails.plugins:ecodata-client-plugin:9.1-SNAPSHOT"
     }
 }
 

gradle.properties

@@ -16,4 +16,4 @@ org.gradle.jvmargs=-Xmx2048M
 seleniumVersion=3.141.59
 seleniumSafariDriverVersion=3.14.0
 snapshotCacheTime=1800
-alaSecurityLibsVersion=7.0.0
+alaSecurityLibsVersion=7.1.0-SNAPSHOT

grails-app/conf/application.groovy

@@ -323,6 +323,7 @@ environments {
         security.oidc.discoveryUri = "http://localhost:${wiremock.port}/cas/oidc/.well-known"
         security.jwt.discoveryUri = "http://localhost:${wiremock.port}/cas/oidc/.well-known"
         bdr.discoveryUri = "http://localhost:${wiremock.port}/cas/oidc/.well-known"
+        bdr.allowUnsignedIdTokens = true
         security.oidc.allowUnsignedIdTokens = true
         security.oidc.clientId="oidcId"
         security.oidc.secret="oidcSecret"

grails-app/views/managementUnit/index.gsp

@@ -112,7 +112,10 @@
 
     $(function () {
         var managementUnit =<fc:modelAsJavascript model="${managementUnit}"/>;
-        var muExtent = <fc:modelAsJavascript model="${managementUnitExtent}" default="null"/>;
+        var muExtent = <fc:modelAsJavascript model="${muExtent}" default="null"/>;
+        if (muExtent) {
+            muExtent.properties = {type:'compound'}; // Borrowing the red compound style for the MU
+        }
         managementUnit.mapFeatures = muExtent;
         var config = _.extend({reportingConfigSelector:'#reporting form'}, fcConfig);
         var managementUnitViewModel = new ManagementUnitPageViewModel(managementUnit, config);

src/main/groovy/au/org/ala/merit/config/BdrTokenConfig.groovy

@@ -30,12 +30,18 @@ class BdrTokenConfig {
     @Value('${bdr.discovery-uri}')
     String discoveryUri
 
+    // To allow mocking of the OIDC configuration for testing, we allow unsigned tokens to be used if the property is set to true. This should not be used in production.
+    @Value('${bdr.allowUnsignedIdTokens:false}')
+    boolean allowUnsignedIdTokens
+
     @Bean
     OidcConfiguration bdrOidcConfiguration(@Qualifier("oidcResourceRetriever") ResourceRetriever jwtResourceRetriever) {
         OidcConfiguration config = new OidcConfiguration()
         config.setClientId(clientId)
         config.setSecret(clientSecret)
         config.setDiscoveryURI(discoveryUri)
+        config.setAllowUnsignedIdTokens(allowUnsignedIdTokens)
+
         config.setResourceRetriever(jwtResourceRetriever)
         config.init()
         return config