refactor(sdk): Add constructor for AuthCtx

Allows to have stricter visibility for the fields and put less code in
ClientBuilder.

Signed-off-by: Kévin Commaille <[email protected]>

Author: zecakeh

crates/matrix-sdk/src/authentication/mod.rs

@@ -66,14 +66,14 @@ pub(crate) type ReloadSessionCallback =
 /// All the data relative to authentication, and that must be shared between a
 /// client and all its children.
 pub(crate) struct AuthCtx {
-    pub(crate) oauth: OAuthCtx,
+    oauth: OAuthCtx,
 
     /// Whether to try to refresh the access token automatically when an
     /// `M_UNKNOWN_TOKEN` error is encountered.
     pub(crate) handle_refresh_tokens: bool,
 
     /// Lock making sure we're only doing one token refresh at a time.
-    pub(crate) refresh_token_lock: Arc<AsyncMutex<Result<(), RefreshTokenError>>>,
+    refresh_token_lock: Arc<AsyncMutex<Result<(), RefreshTokenError>>>,
 
     /// Session change publisher. Allows the subscriber to handle changes to the
     /// session such as logging out when the access token is invalid or
@@ -84,7 +84,7 @@ pub(crate) struct AuthCtx {
     pub(crate) auth_data: OnceCell<AuthData>,
 
     /// The current session tokens.
-    pub(crate) tokens: OnceCell<Mutex<SessionTokens>>,
+    tokens: OnceCell<Mutex<SessionTokens>>,
 
     /// A callback called whenever we need an absolute source of truth for the
     /// current session tokens.
@@ -103,6 +103,20 @@ pub(crate) struct AuthCtx {
 }
 
 impl AuthCtx {
+    /// Construct a new `AuthCtx` with the given settings.
+    pub(crate) fn new(handle_refresh_tokens: bool, allow_insecure_oauth: bool) -> Self {
+        Self {
+            handle_refresh_tokens,
+            refresh_token_lock: Arc::new(AsyncMutex::new(Ok(()))),
+            session_change_sender: broadcast::Sender::new(1),
+            auth_data: OnceCell::default(),
+            tokens: OnceCell::default(),
+            reload_session_callback: OnceCell::default(),
+            save_session_callback: OnceCell::default(),
+            oauth: OAuthCtx::new(allow_insecure_oauth),
+        }
+    }
+
     /// The current session tokens.
     pub(crate) fn session_tokens(&self) -> Option<SessionTokens> {
         Some(self.tokens.get()?.lock().clone())

crates/matrix-sdk/src/client/builder/mod.rs

@@ -36,7 +36,9 @@ use ruma::{
     api::{MatrixVersion, SupportedVersions, error::FromHttpResponseError},
 };
 use thiserror::Error;
-use tokio::sync::{Mutex, OnceCell, broadcast};
+#[cfg(feature = "experimental-search")]
+use tokio::sync::Mutex;
+use tokio::sync::OnceCell;
 use tracing::{Span, debug, field::debug, instrument};
 
 use super::{Client, ClientInner};
@@ -50,7 +52,7 @@ use crate::search_index::SearchIndex;
 use crate::search_index::SearchIndexStoreKind;
 use crate::{
     HttpError, IdParseError,
-    authentication::{AuthCtx, oauth::OAuthCtx},
+    authentication::AuthCtx,
     client::caches::CachedValue::{Cached, NotSet},
     config::RequestConfig,
     error::RumaApiError,
@@ -578,17 +580,7 @@ impl ClientBuilder {
         };
 
         let allow_insecure_oauth = homeserver.scheme() == "http";
-
-        let auth_ctx = Arc::new(AuthCtx {
-            handle_refresh_tokens: self.handle_refresh_tokens,
-            refresh_token_lock: Arc::new(Mutex::new(Ok(()))),
-            session_change_sender: broadcast::Sender::new(1),
-            auth_data: OnceCell::default(),
-            tokens: OnceCell::default(),
-            reload_session_callback: OnceCell::default(),
-            save_session_callback: OnceCell::default(),
-            oauth: OAuthCtx::new(allow_insecure_oauth),
-        });
+        let auth_ctx = Arc::new(AuthCtx::new(self.handle_refresh_tokens, allow_insecure_oauth));
 
         // Enable the send queue by default.
         let send_queue = Arc::new(SendQueueData::new(true));