update graphql, translation and correct clippy

Author: mcalinghee

crates/config/src/sections/upstream_oauth2.rs

@@ -112,7 +112,12 @@ impl ConfigurationSection for UpstreamOAuth2Config {
             }
 
             if provider.claims_imports.localpart.on_conflict.is_some()
-                && !provider.claims_imports.localpart.on_conflict.unwrap().is_fail()
+                && !provider
+                    .claims_imports
+                    .localpart
+                    .on_conflict
+                    .unwrap()
+                    .is_fail()
                 && !matches!(
                     provider.claims_imports.localpart.action,
                     ImportAction::Force | ImportAction::Require
@@ -212,8 +217,8 @@ pub enum OnConflict {
 }
 
 impl OnConflict {
-    const fn is_fail(&self) -> bool {
-        matches!(self, OnConflict::Fail)
+    const fn is_fail(self) -> bool {
+        matches!(&self, OnConflict::Fail)
     }
 }
 
@@ -246,7 +251,7 @@ pub struct LocalpartImportPreference {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub template: Option<String>,
 
-    /// How to handle conflicts on the claim, default value is `Fail``
+    /// How to handle conflicts on the claim, default value is `Fail`
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub on_conflict: Option<OnConflict>,
 }

crates/handlers/src/upstream_oauth2/link.rs

@@ -516,7 +516,7 @@ pub(crate) async fn get(
                             let ctx = ErrorContext::new()
                                 .with_code("Localpart not available")
                                 .with_description(format!(
-                                    r"Localpart is not available on this homeserver"
+                                    r"Localpart {localpart:?} is not available on this homeserver"
                                 ))
                                 .with_language(&locale);
 
@@ -652,19 +652,20 @@ pub(crate) async fn post(
         (None, None, FormData::Link) => {
             // User already exists, but it is not linked, neither logged in
             // Proceed by associating the link to the user and log in the user
-            // Upstream_session is used to re-render the username as it is the only source of truth
-            
+            // Upstream_session is used to re-render the username as it is the only source
+            // of truth
+
             let id_token = upstream_session.id_token().map(Jwt::try_from).transpose()?;
 
             let provider = repo
                 .upstream_oauth_provider()
                 .lookup(link.provider_id)
                 .await?
                 .ok_or(RouteError::ProviderNotFound(link.provider_id))?;
-            
+
             // Let's import the username from the localpart claim
             let env = environment();
-            
+
             let mut context = AttributeMappingContext::new();
             if let Some(id_token) = id_token {
                 let (_, payload) = id_token.into_parts();
@@ -677,18 +678,17 @@ pub(crate) async fn post(
                 context = context.with_userinfo_claims(userinfo.clone());
             }
             let context = context.build();
-            
-            
+
             //Claims import must be `require` or `force` at this stage
             let template = provider
                 .claims_imports
                 .localpart
                 .template
                 .as_deref()
                 .unwrap_or(DEFAULT_LOCALPART_TEMPLATE);
-        
-            let username =  render_attribute_template(&env, template, &context, true)?;
-            
+
+            let username = render_attribute_template(&env, template, &context, true)?;
+
             let maybe_user = repo.user().find_by_username(&username.unwrap()).await?;
 
             if maybe_user.is_some() {

docs/config.schema.json

@@ -2345,7 +2345,7 @@
           "type": "string"
         },
         "on_conflict": {
-          "description": "How to handle existing users (only for localpart)",
+          "description": "How to handle conflicts on the claim, default value is `Fail`",
           "allOf": [
             {
               "$ref": "#/definitions/OnConflict"
@@ -2388,17 +2388,17 @@
       ]
     },
     "OnConflict": {
-      "description": "How to handle when localpart already exists",
+      "description": "How to handle an existing localpart claim",
       "oneOf": [
         {
-          "description": "Fails the sso login on localpart conflict",
+          "description": "Fails the sso login on conflict",
           "type": "string",
           "enum": [
             "fail"
           ]
         },
         {
-          "description": "Adds the oauth identity link to the existing user, regardless of whether there is an existing link or not",
+          "description": "Adds the oauth identity link, regardless of whether there is an existing link or not",
           "type": "string",
           "enum": [
             "add"