use match

odelcroi · sandhose · odelcroi · commit c4565bee03a4 · 2025-07-17T10:44:55.000+02:00
Co-authored-by: Quentin Gliech &lt;quenting@element.io&gt;
diff --git a/crates/config/src/sections/upstream_oauth2.rs b/crates/config/src/sections/upstream_oauth2.rs
@@ -111,8 +111,10 @@ impl ConfigurationSection for UpstreamOAuth2Config {
                 }
             }
 
-            if !provider.claims_imports.localpart.on_conflict.is_default()
-                && !matches!(
+            if matches!(
+                provider.claims_imports.localpart.on_conflict,
+                OnConflict::Add
+            ) && !matches!(
                     provider.claims_imports.localpart.action,
                     ImportAction::Force | ImportAction::Require
                 )

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,10 @@ impl ConfigurationSection for UpstreamOAuth2Config {`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- if !provider.claims_imports.localpart.on_conflict.is_default()`
`115`		`- && !matches!(`
	`114`	`+ if matches!(`
	`115`	`+ provider.claims_imports.localpart.on_conflict,`
	`116`	`+ OnConflict::Add`
	`117`	`+ ) && !matches!(`
`116`	`118`	`provider.claims_imports.localpart.action,`
`117`	`119`	`ImportAction::Force \| ImportAction::Require`
`118`	`120`	`)`