Address more PR comments.

Remove check for Consent prompt.

MAS supports it but isn't currently exposing that in it's well-known.

Author: pixlwave

bindings/matrix-sdk-ffi/src/authentication_service.rs

@@ -360,17 +360,8 @@ impl AuthenticationService {
             self.configure_oidc(&oidc, authentication_server, oidc_configuration).await?;
 
             let mut data_builder = oidc.login(redirect_url, None)?;
-
-            if let Ok(provider_metadata) = oidc.provider_metadata().await {
-                if provider_metadata
-                    .prompt_values_supported
-                    .as_ref()
-                    .is_some_and(|p| p.contains(&Prompt::Consent))
-                {
-                    data_builder = data_builder.prompt(vec![Prompt::Consent]);
-                }
-            }
-
+            // TODO: Add a check for the Consent prompt when MAS is updated.
+            data_builder = data_builder.prompt(vec![Prompt::Consent]);
             let data = data_builder.build().await?;
 
             Ok(Arc::new(OidcAuthenticationData { url: data.url, state: data.state }))

bindings/matrix-sdk-ffi/src/client.rs

@@ -425,7 +425,7 @@ impl Client {
     }
 
     pub fn account_url(&self) -> Option<String> {
-        self.inner.oidc().account_management_url().unwrap_or(None).map(|url| url.to_string())
+        self.inner.oidc().account_management_url().ok().flatten().map(|url| url.to_string())
     }
 
     pub fn user_id(&self) -> Result<String, ClientError> {
@@ -891,8 +891,8 @@ pub struct Session {
     // FFI-only fields (for now)
     /// The URL for the homeserver used for this session.
     pub homeserver_url: String,
-    /// Additional data for this session session if OpenID Connect was used
-    /// for authentication.
+    /// Additional data for this session if OpenID Connect was used for
+    /// authentication.
     pub oidc_data: Option<String>,
     /// The URL for the sliding sync proxy used for this session.
     pub sliding_sync_proxy: Option<String>,

bindings/matrix-sdk-ffi/src/client_builder.rs

@@ -32,6 +32,7 @@ pub struct ClientBuilder {
     sliding_sync_proxy: Option<String>,
     proxy: Option<String>,
     disable_ssl_verification: bool,
+    disable_automatic_token_refresh: bool,
     inner: MatrixClientBuilder,
 }
 
@@ -103,6 +104,12 @@ impl ClientBuilder {
         Arc::new(builder)
     }
 
+    pub fn disable_automatic_token_refresh(self: Arc<Self>) -> Arc<Self> {
+        let mut builder = unwrap_or_clone_arc(self);
+        builder.disable_automatic_token_refresh = true;
+        Arc::new(builder)
+    }
+
     pub fn build(self: Arc<Self>) -> Result<Arc<Client>, ClientError> {
         Ok(self.build_inner()?)
     }
@@ -157,6 +164,10 @@ impl ClientBuilder {
             inner_builder = inner_builder.disable_ssl_verification();
         }
 
+        if !builder.disable_automatic_token_refresh {
+            inner_builder = inner_builder.handle_refresh_tokens();
+        }
+
         if let Some(user_agent) = builder.user_agent {
             inner_builder = inner_builder.user_agent(user_agent);
         }
@@ -208,7 +219,8 @@ impl Default for ClientBuilder {
             sliding_sync_proxy: None,
             proxy: None,
             disable_ssl_verification: false,
-            inner: MatrixClient::builder().handle_refresh_tokens(),
+            disable_automatic_token_refresh: false,
+            inner: MatrixClient::builder(),
         }
     }
 }