Dev duk ecodata adaptive changes #977
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
temi
requested changes
Jun 26, 2024
| @@ -25,6 +25,7 @@ class ApiKeyInterceptor { | |||
| } | |||
|
|
|||
| boolean before() { | |||
| return true | |||
| @@ -45,3 +45,4 @@ out | |||
| /grails-app/assets/vendor/ | |||
| /node_modules/ | |||
| /grails-app/assets/dist/ | |||
| /package-lock.json | |||
| @@ -5,7 +5,7 @@ import org.apache.http.HttpStatus | |||
|
|
|||
| import java.text.SimpleDateFormat; | |||
|
|
|||
| @au.ala.org.ws.security.RequireApiKey(scopes=["ecodata/read"]) | |||
| // @au.ala.org.ws.security.RequireApiKey(scopes=["ecodata/read"]) | |||
| properties.url = "sftp:https://upload.ala.org.au:" + dataProviderName + '/' + dataResourceId | ||
|
|
||
| //properties.url = "sftp:https://upload.ala.org.au:" + dataProviderName + '/' + dataResourceId | ||
| String url = grailsApplication.config.getProperty('ecodata.forCollectory.exportURL') ?: grailsApplication.config.getProperty('grails.serverURL')+"/ws/record/csvProject?id=" |
There was a problem hiding this comment.
Basically, we want to have it exactly as before i.e.
properties.url = grailsApplication.config.getProperty('ecodata.forCollectory.exportURL') + dataProviderName + '/' + dataResourceId
And application.groovy should have our default value "sftp:https://...". If you want a different url/code, then use a flag. And the default flag value should resolve to our url. The code should run as before without any configuration change. And you can make config change, to run it the way you want.
| @@ -266,11 +266,13 @@ class PermissionService { | |||
| Map rec=[:] | |||
| rec.userId = it.userId | |||
| rec.role = it.accessLevel?.toString() | |||
| rec.displayName = "" // work around, when the following call to authService fails | |||
There was a problem hiding this comment.
remove. should be added in biocollect
| out.put(it.userId,rec) | ||
|
|
||
| } | ||
|
|
||
| def userList = authService.getUserDetailsById(userIds) | ||
| log.info("--> getMembersForProjectPerPage: userList for UserIds: "+userIds+":"+ userList ) |
| @@ -1,11 +1,23 @@ | |||
| { | |||
| "name": "ecodata", | |||
| "version": "4.0", | |||
| "version": "6.14.8", | |||
There was a problem hiding this comment.
does not correspond with ecodata version.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains 4 commits we'd like to share information about
Parameterize url for collectory access when using biocache ingest
(We will not use sftp: server)
workaround for displayName in PermissionsService
Reinhardt committed 2 weeks ago
adaptions for compiling locally
Reinhardt committed 2 weeks ago
Commits on Jun 10, 2024
security checks eliminated - for testing reasons only
Reinhardt committed last week
Commits on Jun 13, 2024
parameterize url for collectory access when using biocache ingest
wenzina188 committed last week