Skip to content

fix: retain existing RegistrationAccessTokenSignature when PATCHing an OAuth2 Client #4094

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.

Sign up for GitHub

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

Open
OMBradF wants to merge 2 commits into
base: master
Choose a base branch
from
+28 −0
Open

fix: retain existing RegistrationAccessTokenSignature when PATCHing an OAuth2 Client #4094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc2d90
fix: retain existing RegistrationAccessTokenSignature when PATCHing a…
OMBradF Apr 22, 2026
9afd4f2
fix: test patch preserves registration access token
OMBradF Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions client/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,10 @@ func (h *Handler) patchOAuth2Client(w http.ResponseWriter, r *http.Request) {

oldSecret := client.Secret

// RegistrationAccessTokenSignature is lost when the client is marshalled to JSON
// Store it prior to the patch and re-add it later
oldRegistrationAccessTokenSig := client.RegistrationAccessTokenSignature

client, err = jsonx.ApplyJSONPatch(patchJSON, client, "/id")
if err != nil {
h.r.Writer().WriteError(w, r, err)
Expand All @@ -462,6 +466,9 @@ func (h *Handler) patchOAuth2Client(w http.ResponseWriter, r *http.Request) {
client.Secret = ""
}

// Re-add the registration access token signature before updating the client in DB
client.RegistrationAccessTokenSignature = oldRegistrationAccessTokenSig

if err := h.updateClient(r.Context(), client, h.r.ClientValidator().Validate); err != nil {
h.r.Writer().WriteError(w, r, err)
return
Expand Down
21 changes: 21 additions & 0 deletions client/sdk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,27 @@ func TestClientSDK(t *testing.T) {
assertx.EqualAsJSONExcept(t, expected, result, nil)
})

t.Run("case=patch preserves registration access token", func(t *testing.T) {
created, _, err := c.OAuth2API.CreateOAuth2Client(context.Background()).OAuth2Client(createTestClient("")).Execute()
require.NoError(t, err)
require.NotNil(t, created.RegistrationAccessToken)
originalRAT := *created.RegistrationAccessToken

_, _, err = c.OAuth2API.PatchOAuth2Client(context.Background(), *created.ClientId).
JsonPatch([]hydra.JsonPatch{{Op: "replace", Path: "/client_uri", Value: "http://foo.bar"}}).Execute()
require.NoError(t, err)

dynURL := publicServer.URL + client.DynClientsHandlerPath + "/" + *created.ClientId

req, err := http.NewRequest(http.MethodGet, dynURL, nil)
require.NoError(t, err)
req.Header.Set("Authorization", "Bearer "+originalRAT)
res, err := http.DefaultClient.Do(req)
require.NoError(t, err)
_ = res.Body.Close()
assert.Equal(t, http.StatusOK, res.StatusCode, "registration access token must still be valid after admin PATCH")
})

t.Run("case=patch client illegally", func(t *testing.T) {
op := "replace"
path := "/id"
Expand Down
Loading