Merge pull request #463 from AtlasOfLivingAustralia/species-list-auth

update species-list authentication

Author: adam-collins

grails-app/assets/javascripts/spApp/controller/createSpeciesListCtrl.js

@@ -156,7 +156,7 @@
                 $scope.addNewSpecies = function () {
                     ListsService.createList($scope.newListName, $scope.newListDescription, $scope.matchedGuids(), $scope.makePrivate, $scope.newListType.id).then(function (resp) {
                         if (resp.status >= 200 && resp.status < 300) {
-                            var json = JSON.parse(resp.data.text);
+                            var json = resp.data;
                             var druid = json.druid;
 
                             LoggerService.log("Create", "createSpeciesList", {

grails-app/assets/javascripts/spApp/service/listsService.js

@@ -38,7 +38,7 @@
                     if ($SH.userId) {
                         params += "&user=" + $SH.userId
                     }
-                    return $http.get(this.url() + "/ws/speciesList" + params, _httpDescription('list')).then(function (response) {
+                    return $http.get($SH.baseUrl + "/portal/speciesList" + params, _httpDescription('list')).then(function (response) {
                         if (response.data.lists) {
                             return response.data.lists;
                         } else {
@@ -63,7 +63,7 @@
                 },
                 items: function (listId, params) {
                     params = params || {};
-                    return $http.get(this.url() + "/ws/speciesListItems/" + listId, _httpDescription('items', {
+                    return $http.get($SH.baseUrl + "/portal/speciesListItems/" + listId, _httpDescription('items', {
                         params: params,
                         withCredentials: true
                     })).then(function (response) {
@@ -118,4 +118,4 @@
 
             return scope;
         }])
-}(angular));
+}(angular));

grails-app/controllers/au/org/ala/spatial/portal/PortalController.groovy

@@ -376,28 +376,67 @@ class PortalController {
 
             def url = grailsApplication.config.lists.url
 
-            def header = [:]
-            if (Holders.config.security.oidc.enabled) {
-                header.put("userId", userId)
-                header.put("X-ALA-userId", userId)
-                header.put("apiKey", grailsApplication.config.api_key)
-                //header.put('Cookie', 'ALA-Auth=' + URLEncoder.encode(authService.email, 'UTF-8'))
+            def r = webService.post("${url}/ws/speciesList/", json)
+
+            if (r == null) {
+                def status = response.setStatus(HttpURLConnection.HTTP_INTERNAL_ERROR)
+                r = [status: status, error: 'Unknown error when creating list']
+            }
+
+            def status = r.statusCode
+            if (r.statusCode < 200 || r.statusCode > 300) {
+                r = [error: r.resp  ]
             }
 
-            def r = hubWebService.urlResponse(HttpPost.METHOD_NAME, "${url}/ws/speciesList/", null, header,
-                    new StringRequestEntity((json as JSON).toString()), true)
+            render status: status, r.resp as JSON
+        }
+    }
+
+    def speciesListItems() {
+        def userId = getValidUserId(params)
+
+        if (!userId) {
+            notAuthorised()
+        } else {
+            def url = grailsApplication.config.lists.url
+
+            def r = webService.get("${url}/ws/speciesListItems/" + params.id, [:], org.apache.http.entity.ContentType.APPLICATION_JSON, false, true, [:])
 
             if (r == null) {
                 def status = response.setStatus(HttpURLConnection.HTTP_INTERNAL_ERROR)
-                r = [status: status, error: 'Unknown error when creating list']
+                r = [status: status, error: 'Unknown error when fetching list']
+            }
+
+            def status = r.statusCode
+            if (r.statusCode < 200 || r.statusCode > 300) {
+                r = [error: r.resp  ]
+            }
+
+            render status: status, r.resp as JSON
+        }
+    }
+
+    def speciesList() {
+        def userId = getValidUserId(params)
+
+        if (!userId) {
+            notAuthorised()
+        } else {
+            def url = grailsApplication.config.lists.url
+
+            def r = webService.get("${url}/ws/speciesList", [user: params.user ? userId : null, max: params.max], org.apache.http.entity.ContentType.APPLICATION_JSON, false, true, [:])
+
+            if (r == null) {
+                def status = response.setStatus(HttpURLConnection.HTTP_INTERNAL_ERROR)
+                r = [status: status, error: 'Unknown error when fetching list']
             }
 
             def status = r.statusCode
             if (r.statusCode < 200 || r.statusCode > 300) {
-                r = [error: r.text  ]
+                r = [error: r.resp  ]
             }
 
-            render status: status, r as JSON
+            render status: status, r.resp as JSON
         }
     }
 
@@ -421,7 +460,6 @@ class PortalController {
                     json.fq[0] = json.q
                     json.q = tmp
                 } else if (json?.wkt || json?.qc) {
-                    log.error(getWkt(json?.wkt))
                     json.fq = [json.q]
                     json.q = '*:*'
                 } else {