From bdffeb6ef5b18e78ff3d60a8c3068a0d3e193a6b Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 28 Nov 2025 11:57:46 +0100 Subject: [PATCH] Document the new conflict options --- docs/reference/configuration.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/reference/configuration.md b/docs/reference/configuration.md index f614791dd..d18e5a44d 100644 --- a/docs/reference/configuration.md +++ b/docs/reference/configuration.md @@ -780,8 +780,10 @@ upstream_oauth2: # How to handle when localpart already exists. # Possible values are (default: fail): - # - `add` : Adds the upstream account link to the existing user, regardless of whether there is an existing link or not. # - `fail` : Fails the upstream OAuth 2.0 login. + # - `add` : Adds the upstream account link to the existing user, regardless of whether there is an existing link or not. + # - `replace` : Replace any existing upstream OAuth 2.0 identity link for this provider on the matching user. + # - `set` : Adds the upstream account link *only* if there is no existing link for this provider on the matching user. #on_conflict: fail # The display name is the user's display name.