Skip to content

[v16] Web: fix regression when upserting join token with admin actions#55852

Merged
kimlisa merged 2 commits intobranch/v16from
lisa/v16/fix-join-token-regression
Jun 19, 2025
Merged

[v16] Web: fix regression when upserting join token with admin actions#55852
kimlisa merged 2 commits intobranch/v16from
lisa/v16/fix-join-token-regression

Conversation

@kimlisa
Copy link
Copy Markdown
Contributor

@kimlisa kimlisa commented Jun 17, 2025

backport of #55703

manual b/c conflict with type difference and different api call

changelog: Fixed error when creating or updating join tokens in the web UI when admin action is enabled (second_factor set to webauthn).

✅ tested CRUD with and without admin actions

)

* Web: fix regression when upserting join token with admin actions

* Address review
@kimlisa kimlisa enabled auto-merge June 19, 2025 16:41
@kimlisa kimlisa added this pull request to the merge queue Jun 19, 2025
Merged via the queue into branch/v16 with commit 1b9e435 Jun 19, 2025
38 checks passed
@kimlisa kimlisa deleted the lisa/v16/fix-join-token-regression branch June 19, 2025 17:00
@fheinecke fheinecke mentioned this pull request Jul 2, 2025
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.

3 participants