AtlasOfLivingAustralia/ala-infrastructure#669 - pass flag for data re…

…source only
AtlasOfLivingAustralia · Aug 4, 2020 · 2ecab32 · 2ecab32
1 parent f558dc4
commit 2ecab32
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/grails-app/controllers/au/org/ala/collectory/DataController.groovy b/grails-app/controllers/au/org/ala/collectory/DataController.groovy
@@ -191,8 +191,7 @@ class DataController {
         if (!keyCheck?.valid) {
             return false
         }
-        keyCheck.validApiKey = apiKey
-        return keyCheck
+        return true
     }
 
     /**
@@ -333,12 +332,17 @@ class DataController {
         } else {
             def urlForm = params.entity
             def clazz = capitalise(urlForm)
-            def keyCheck = checkApiKey()
             if (params.pg) {
                 // return specified entity
                 addContentLocation "/ws/${urlForm}/${params.pg.uid}"
                 def eTag = (params.pg.uid + ":" + params.pg.lastUpdated).encodeAsMD5()
-                def entityInJson = crudService."read${clazz}"(params.pg, keyCheck && keyCheck.validApiKey?:null)
+                def entityInJson
+                if (clazz == 'DataResource') {
+                    def keyCheck = checkApiKey()
+                    entityInJson = crudService."read${clazz}"(params.pg, keyCheck)
+                } else {
+                    entityInJson = crudService."read${clazz}"(params.pg)
+                }
                 entityInJson = metadataService.convertAnyLocalPaths(entityInJson)
                 response.setContentType("application/json")
                 response.setCharacterEncoding("UTF-8")