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

OAuth 2: JWT token refresh should preserve user identity displayed in the UI (backport #12818) #12831

Merged
merged 5 commits into from
Nov 29, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 27, 2024

Proposed Changes

Closes #12598

Types of Changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes issue #NNNN)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause an observable behavior change in existing systems)
  • Documentation improvements (corrections, new content, etc)
  • Cosmetic change (whitespace, formatting, etc)
  • Build system and/or CI

This is an automatic backport of pull request #12818 done by [Mergify](https://mergify.com).

(cherry picked from commit 3718fe3)

# Conflicts:
#	deps/rabbitmq_auth_backend_oauth2/src/rabbit_auth_backend_oauth2.erl
Copy link
Author

mergify bot commented Nov 27, 2024

Cherry-pick of 3718fe3 has failed:

On branch mergify/bp/v4.0.x/pr-12818
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit 3718fe3289.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deps/rabbitmq_auth_backend_oauth2/test/jwks_SUITE.erl
	modified:   deps/rabbitmq_auth_backend_oauth2/test/system_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_auth_backend_oauth2/src/rabbit_auth_backend_oauth2.erl

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@michaelklishin
Copy link
Member

can you please resolve these conflicts? You have much more context on the main vs. v4.0.x differences in this plugin.

@michaelklishin
Copy link
Member

@MarcialRosales thank you!

@michaelklishin michaelklishin added this to the 4.0.5 milestone Nov 29, 2024
@michaelklishin michaelklishin merged commit 5b90d1a into v4.0.x Nov 29, 2024
193 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12818 branch November 29, 2024 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants