Skip to content

Commit

Permalink
update openapi
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Collins committed Jan 11, 2024
1 parent af9a699 commit 502a801
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 55 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions grails-app/conf/application.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -264,6 +264,7 @@ dataResource:
contentTypesList:
- "authoritative"
- "behaviour"
- "citizen science"
- "commercial uses"
- "common names"
- "conservation management"
Expand Down Expand Up @@ -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: [email protected]
Expand Down
66 changes: 33 additions & 33 deletions grails-app/controllers/au/org/ala/collectory/DataController.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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(
Expand All @@ -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"))
]
)
],
Expand Down
6 changes: 3 additions & 3 deletions grails-app/controllers/au/org/ala/collectory/GbifController.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
]
)
],
Expand Down
8 changes: 4 additions & 4 deletions grails-app/controllers/au/org/ala/collectory/IptController.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -226,4 +226,4 @@ class IptController {
csvWriter.flush()
}
}
}
}
6 changes: 3 additions & 3 deletions grails-app/controllers/au/org/ala/collectory/LicenceController.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
]
)
],
Expand Down
18 changes: 9 additions & 9 deletions grails-app/controllers/au/org/ala/collectory/LookupController.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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"))
]
)
],
Expand Down Expand Up @@ -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"))
]
)
],
Expand Down

0 comments on commit 502a801

Please sign in to comment.