parameterize office id from the client #590
Merged
Conversation
This file contains hidden or 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
added to the existing username/password login though it'll just get replaced by #574 once this is done, will update to allow setting the organizationid header need to add to the settings options a place where we can change the office id without having to logout also need to populate swagger with a default organization header
6 tasks
…thout having to logout
… made when user is not logged in
MikeNeilson
reviewed
Dec 4, 2025
Collaborator
MikeNeilson
left a comment
MikeNeilson
left a comment
There was a problem hiding this comment.
Looks reasonable so far.
Would prefer the new DAOs were in line with recent PRs to the main project. Or even wait for and expand on them especially for the user management.
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/dao/datasource/DirectUserPreparer.java
Outdated
Show resolved
Hide resolved
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/res/OpenDcsResource.java
Outdated
Show resolved
Hide resolved
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/dao/OpenDcsDatabaseFactory.java
Outdated
Show resolved
Hide resolved
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/dao/datasource/SessionTimeZonePreparer.java
Outdated
Show resolved
Hide resolved
opendcs-web-client/src/main/webapp/WEB-INF/common/modals/organizations.jspf
Outdated
Show resolved
Hide resolved
Co-authored-by: Mike Neilson <[email protected]>
…client_office_id # Conflicts: # opendcs-rest-api/src/main/java/org/opendcs/odcsapi/res/OpenDcsResource.java # opendcs-rest-api/src/main/java/org/opendcs/odcsapi/res/PlatformResources.java # opendcs-rest-api/src/main/java/org/opendcs/odcsapi/sec/AuthorizationCheck.java # opendcs-rest-api/src/main/java/org/opendcs/odcsapi/sec/basicauth/BasicAuthCheck.java # opendcs-rest-api/src/main/java/org/opendcs/odcsapi/sec/basicauth/BasicAuthResource.java # opendcs-rest-api/src/main/java/org/opendcs/odcsapi/sec/openid/OidcAuthCheck.java
MikeNeilson
reviewed
Dec 8, 2025
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/dao/datasource/DirectUserPreparer.java
Outdated
Show resolved
Hide resolved
…client_office_id # Conflicts: # opendcs-rest-api/src/main/java/org/opendcs/odcsapi/sec/cwms/CwmsAuthorizationDAO.java
MikeNeilson
reviewed
Dec 9, 2025
Collaborator
MikeNeilson
left a comment
MikeNeilson
left a comment
There was a problem hiding this comment.
Seems like it's coming together.
Unfortunate most of the role dao's will get replaced when we implement the identity providers systems but such are transitions.
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/sec/OrganizationResource.java
Outdated
Show resolved
Hide resolved
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/sec/OrganizationResource.java
Show resolved
Hide resolved
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/dao/cwms/CwmsOrganizationDao.java
Outdated
Show resolved
Hide resolved
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/dao/cwms/CwmsOrganizationDao.java
Outdated
Show resolved
Hide resolved
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/dao/OpenDcsDatabaseFactory.java
Outdated
Show resolved
Hide resolved
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/dao/OrganizationDao.java
Outdated
Show resolved
Hide resolved
MikeNeilson
reviewed
Dec 9, 2025
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/beans/ApiOrganization.java
Show resolved
Hide resolved
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/dao/cwms/CwmsOrganizationDao.java
Outdated
Show resolved
Hide resolved
MikeNeilson
reviewed
Dec 9, 2025
opendcs-integration-test/src/test/java/org/opendcs/odcsapi/sec/AuthorizationTestIT.java
Show resolved
Hide resolved
opendcs-rest-api/src/main/java/org/opendcs/odcsapi/dao/cwms/CwmsOrganizationDao.java
Outdated
Show resolved
Hide resolved
MikeNeilson
reviewed
Dec 10, 2025
opendcs-integration-test/src/test/java/org/opendcs/odcsapi/fixtures/DatabaseSetupExtension.java
Show resolved
Hide resolved
…msOrganizationDao.java Co-authored-by: Mike Neilson <[email protected]>
MikeNeilson
requested changes
Dec 10, 2025
Collaborator
MikeNeilson
left a comment
MikeNeilson
left a comment
There was a problem hiding this comment.
Looks good. A few things not ideal, but we knew that would happen.
At least the first two items in the sonar issues report need to be addressed.
The whole window vs globalThis is i mean maybe we should now, but I'm not as worried at the moment.
|
MikeNeilson
approved these changes
Dec 10, 2025
Collaborator
MikeNeilson
left a comment
MikeNeilson
left a comment
There was a problem hiding this comment.
Login page for OpenDCS-Postgres has an empty select instead of nothing. But we can live with that for now.
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.
Problem Description
Fixes #464
Solution
Allowing the client to set the office id for data retrievals.
how you tested the change
In Progress
Where the following done:
(Formerly called regression tests.)