Skip to content

Conversation

@chrisknoll
Copy link
Collaborator

This PR changes application.properties to application.yaml, re-organizes a few authentication-related properties. and adds documentaion about how to references external configuration in VSCode and Tomcat.

- Converted application.properties to application.yaml
- Consolidated security auth configuration under security.auth
- Updated code references to renamed properties.
- Updated Readme.md with updated property names.
@chrisknoll
Copy link
Collaborator Author

FYI @p-hoffmann

@chrisknoll
Copy link
Collaborator Author

Actually @p-hoffmann , if you could take a look at how these changes are going to impact our docker builds, I'd appreciate it, I have very little experience with docker.

@p-hoffmann
Copy link
Member

I've made the changes to the Docker build in the p-hoffmann/extconfig branch. Feel free to merge it into your branch.

I also made a few other small adjustments, e.g. re-adding oauth2-oidc-sdk 11.13 as it's required for OpenID Connect.

…/external-config

# Conflicts:
#	pom.xml
#	src/main/java/org/ohdsi/webapi/security/SSOController.java
#	src/main/java/org/ohdsi/webapi/user/importer/UserImportController.java
#	src/main/java/org/ohdsi/webapi/user/importer/service/UserImportServiceImpl.java
#	src/main/resources/application.properties
#	src/test/resources/application-test.properties
@chrisknoll
Copy link
Collaborator Author

Ok, i merged from webapi-3.0 and resolved conflicts (I'm 90% sure my conflict fixed it) hwoever, we see errors in the Authentication and Integration tests....this could be related to the external config refactor in that we moved some of the security configuration in the properties/yaml file to a slightly different structure (things fall under security.auth now).

Do you see a source of the issue?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants