diff --git a/build.gradle b/build.gradle index 469bb7bf..3cdf25d0 100644 --- a/build.gradle +++ b/build.gradle @@ -114,7 +114,7 @@ dependencies { implementation "org.grails.plugins:audit-logging:4.0.3" implementation 'dk.glasius:external-config:3.1.1' implementation "org.grails.plugins:ala-admin-plugin:2.3.0" - implementation 'au.org.ala.plugins:openapi:1.1.0' + implementation 'au.org.ala.plugins:openapi:1.3.0' console "org.grails:grails-console" profile "org.grails.profiles:web" diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml index 95adee0b..6a7e4efc 100644 --- a/grails-app/conf/application.yml +++ b/grails-app/conf/application.yml @@ -192,7 +192,7 @@ security: enabled: false oidc: enabled: true - discovery-uri: 'https://auth-test.ala.org.au/cas/oidc/.well-known' + discoveryUri: 'change me' clientId: 'change me' secret: 'change me' allowUnsignedIdTokens: true @@ -264,6 +264,7 @@ dataResource: contentTypesList: - "authoritative" - "behaviour" + - "citizen science" - "commercial uses" - "common names" - "conservation management" @@ -448,7 +449,7 @@ environments: openapi: title: Collectory REST services description: REST services for interacting with the collectory webapp - terms: https://www.ala.org.au/terms + terms: https://www.ala.org.au/terms-of-use contact: name: Support email: support@ala.org.au diff --git a/grails-app/controllers/au/org/ala/collectory/DataController.groovy b/grails-app/controllers/au/org/ala/collectory/DataController.groovy index 6074ba25..efb1a87d 100644 --- a/grails-app/controllers/au/org/ala/collectory/DataController.groovy +++ b/grails-app/controllers/au/org/ala/collectory/DataController.groovy @@ -270,9 +270,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -352,9 +352,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -477,9 +477,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -577,9 +577,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -653,9 +653,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -734,9 +734,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -927,9 +927,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -1082,9 +1082,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -1193,9 +1193,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -1511,9 +1511,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ), @ApiResponse( @@ -1526,9 +1526,9 @@ class DataController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], diff --git a/grails-app/controllers/au/org/ala/collectory/GbifController.groovy b/grails-app/controllers/au/org/ala/collectory/GbifController.groovy index 2d91f06d..fcb87569 100644 --- a/grails-app/controllers/au/org/ala/collectory/GbifController.groovy +++ b/grails-app/controllers/au/org/ala/collectory/GbifController.groovy @@ -181,9 +181,9 @@ class GbifController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], diff --git a/grails-app/controllers/au/org/ala/collectory/IptController.groovy b/grails-app/controllers/au/org/ala/collectory/IptController.groovy index 34c670a9..e69ff503 100644 --- a/grails-app/controllers/au/org/ala/collectory/IptController.groovy +++ b/grails-app/controllers/au/org/ala/collectory/IptController.groovy @@ -118,9 +118,9 @@ class IptController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -226,4 +226,4 @@ class IptController { csvWriter.flush() } } -} \ No newline at end of file +} diff --git a/grails-app/controllers/au/org/ala/collectory/LicenceController.groovy b/grails-app/controllers/au/org/ala/collectory/LicenceController.groovy index 7519fc09..5527553b 100644 --- a/grails-app/controllers/au/org/ala/collectory/LicenceController.groovy +++ b/grails-app/controllers/au/org/ala/collectory/LicenceController.groovy @@ -37,9 +37,9 @@ class LicenceController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], diff --git a/grails-app/controllers/au/org/ala/collectory/LookupController.groovy b/grails-app/controllers/au/org/ala/collectory/LookupController.groovy index bce08e5e..6c1c02a1 100644 --- a/grails-app/controllers/au/org/ala/collectory/LookupController.groovy +++ b/grails-app/controllers/au/org/ala/collectory/LookupController.groovy @@ -71,9 +71,9 @@ class LookupController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -210,9 +210,9 @@ class LookupController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ], @@ -393,9 +393,9 @@ class LookupController { ) ], headers = [ - @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "String")), - @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "String")) + @Header(name = 'Access-Control-Allow-Headers', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Methods', description = "CORS header", schema = @Schema(type = "string")), + @Header(name = 'Access-Control-Allow-Origin', description = "CORS header", schema = @Schema(type = "string")) ] ) ],