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

Author: chrisala

build.gradle

@@ -71,10 +71,15 @@ dependencies {
     implementation "org.grails.plugins:async"
     implementation "org.grails.plugins:scaffolding"
     implementation "org.grails.plugins:gsp"
-    implementation 'commons-io:commons-io:2.6'
+    implementation 'commons-io:commons-io:2.14.0'
     implementation "org.grails.plugins:ala-auth:$alaSecurityLibsVersion"
     implementation "org.grails.plugins:ala-ws-security-plugin:$alaSecurityLibsVersion"
+    implementation "org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion"
     implementation "au.org.ala:userdetails-service-client:$alaSecurityLibsVersion"
+    implementation "org.codehaus.groovy.modules.http-builder:http-builder:0.7.1"
+    implementation "org.apache.httpcomponents:httpcore:4.4.13"
+    implementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    implementation "org.apache.httpcomponents:httpmime:4.2.1"
 
     console "org.grails:grails-console"
     profile "org.grails.profiles:web-plugin"

grails-app/conf/application.yml

@@ -29,12 +29,13 @@ spring:
 
 disableCAS: true
 
-security:
-    cas:
-        appServerName: 'n/a'
+
 management:
     endpoints:
         enabled-by-default: false
+
+lists.baseURL : https://lists-ws.test.ala.org.au/
+
 ---
 grails:
     mime:
@@ -94,6 +95,18 @@ userProfile:
 ---
 environments:
     test:
+        security:
+            cas:
+                appServerName: 'n/a'
+            oidc:
+                enabled: true
+                discoveryUri: 'http://localhost:8080'
+            jwt:
+                enabled: false
+
+        grails:
+            serverURL: "http://localhost:8080"
+
         server:
             port: "8087"
         spring:

grails-app/services/au/org/ala/ecodata/forms/ActivityFormService.groovy

@@ -1,7 +1,6 @@
 package au.org.ala.ecodata.forms
 
 import org.grails.web.json.JSONArray
-import org.grails.web.json.JSONElement
 import org.grails.web.json.JSONObject
 
 /**
@@ -11,7 +10,7 @@ class ActivityFormService {
 
     static final String ACTIVITY_FORM_PATH = '/activityForm'
     static final String ACTIVITY_FORM_SEARCH_PATH = '/activityForm/search'
-    def webService
+    def ecpWebService
     def grailsApplication
 
     /**
@@ -33,7 +32,7 @@ class ActivityFormService {
         if (includeScoreInformation) {
             url += '&includeScoreInformation='+Boolean.toString(includeScoreInformation)
         }
-        Map result = webService.getJson(url)
+        Map result = ecpWebService.getJson(url)
         if (!result || result.error) {
             result = null
         }
@@ -74,7 +73,7 @@ class ActivityFormService {
     Map searchActivityForms(Map criteria) {
         String url = grailsApplication.config.getProperty('ecodata.service.url') +
                 ACTIVITY_FORM_SEARCH_PATH
-        Map result = webService.doPost(url, criteria)
+        Map result = ecpWebService.doPost(url, criteria)
         if (!result || result.error) {
             result = null
         }