Apply suggestions from code review

Co-authored-by: Quentin Gliech <[email protected]>

Author: mcalinghee

crates/data-model/src/upstream_oauth2/provider.rs

@@ -355,11 +355,11 @@ impl ImportAction {
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
 #[serde(rename_all = "lowercase")]
 pub enum OnConflict {
-    /// Fails the sso login on claim conflict
+    /// Fails the upstream OAuth 2.0 login
     #[default]
     Fail,
 
-    /// Adds the oauth identity link, regardless of whether there is an existing
+    /// Adds the upstream account link, regardless of whether there is an existing
     /// link or not
     Add,
 }

docs/reference/configuration.md

@@ -757,8 +757,8 @@ upstream_oauth2:
 
           # How to handle when localpart already exists.
           # Possible values are (default: fail):
-          # - `add` : Adds the oauth identity link to the existing user, regardless of whether there is an existing link or not.
-          # - `fail` : Fails the sso login.
+          # - `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.
           #on_conflict: fail
 
         # The display name is the user's display name.

templates/pages/upstream_oauth2/login_link.html

@@ -1,6 +1,5 @@
 {#
-Copyright 2024 New Vector Ltd.
-Copyright 2022-2024 The Matrix.org Foundation C.I.C.
+Copyright 2025 New Vector Ltd.
 
 SPDX-License-Identifier: AGPL-3.0-only
 Please see LICENSE in the repository root for full details.

translations/en.json

@@ -698,7 +698,7 @@
         "@action": {
           "context": "pages/upstream_oauth2/login_link.html:28:28-70"
         },
-        "description": "An account exists for the username : %(username)s, it will be linked to this new provider",
+        "description": "An account exists for this username (%(username)s), it will be linked to this upstream account.",
         "@description": {
           "context": "pages/upstream_oauth2/login_link.html:22:7-85"
         },