Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CBG-3883 Restore 3.1 handling for admin_channels, admin_roles #6768

Merged
merged 1 commit into from
Apr 11, 2024

Conversation

adamcfraser
Copy link
Collaborator

@adamcfraser adamcfraser commented Apr 10, 2024

Omitting default collection admin_channels, admin_roles on a PUT /db/_user should not remove those channels - callers must explicitly specify an empty array.

Handling for named collections is unchanged - if scopes/collection is specified in collection_access, contents are treated as a replace.

Added tests for interaction with JWT channel updates.

CBG-3883

Integration Tests

Omitting default collection admin_channels, admin_roles on a PUT /db/_user should not remove those channels - callers must explicitly specify an empty array.

Handling for named collections is unchanged - if scopes/collection is specified in collection_access, contents are treated as a replace.

Added tests for interaction with JWT channel updates.
Comment on lines +1310 to +1311
require.NoError(t, restTester.SetAdminParty(false))
defer restTester.Close()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would swap the order of these tests, but I think the default config for RestTester is GuestEnabled: false and this isn't needed at all.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Going to leave this as-is for this PR as it follows pattern used by other OIDC tests, agree it could be updated across the board.

@adamcfraser adamcfraser changed the title Restore 3.1 handling for admin_channels, admin_roles CBG-3883 Restore 3.1 handling for admin_channels, admin_roles Apr 10, 2024
@adamcfraser
Copy link
Collaborator Author

Failing CI tests pass locally, are unrelated to changes in this PR.

@adamcfraser adamcfraser merged commit 655fae6 into main Apr 11, 2024
28 of 30 checks passed
@adamcfraser adamcfraser deleted the CBG-3883 branch April 11, 2024 03:16
Copy link
Member

@bbrks bbrks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

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