fix(oidc): Add missing feature checks.

Author: pixlwave

crates/matrix-sdk/src/client/futures.rs

@@ -1,30 +1,32 @@
+#[cfg(feature = "experimental-oidc")]
+use std::ops::Deref;
 use std::{
     fmt::Debug,
     future::{Future, IntoFuture},
-    ops::Deref,
     pin::Pin,
 };
 
 use cfg_vis::cfg_vis;
 use eyeball::SharedObservable;
 #[cfg(not(target_arch = "wasm32"))]
 use eyeball::Subscriber;
+#[cfg(feature = "experimental-oidc")]
 use mas_oidc_client::{
     error::{
         Error as OidcClientError, ErrorBody as OidcErrorBody, HttpError as OidcHttpError,
         TokenRefreshError, TokenRequestError,
     },
-    requests::authorization_code::AuthorizationValidationData,
     types::errors::ClientErrorCode,
 };
 use ruma::api::{client::error::ErrorKind, error::FromHttpResponseError, OutgoingRequest};
 use tracing::trace;
 
 use super::super::Client;
+#[cfg(feature = "experimental-oidc")]
+use crate::oidc::OidcError;
 use crate::{
     config::RequestConfig,
     error::{HttpError, HttpResult},
-    oidc::OidcError,
     RefreshTokenError, TransmissionProgress,
 };
 
@@ -100,6 +102,7 @@ where
                             // Refreshing access tokens is not supported by this `Session`, ignore.
                             client.broadcast_unknown_token(soft_logout);
                         }
+                        #[cfg(feature = "experimental-oidc")]
                         RefreshTokenError::Oidc(oidc_error) => {
                             let oidc_error = oidc_error.deref();
                             match oidc_error {

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

@@ -14,20 +14,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(feature = "experimental-oidc")]
+use std::ops::Deref;
 #[cfg(feature = "experimental-sliding-sync")]
 use std::sync::RwLock as StdRwLock;
 use std::{
     collections::{btree_map, BTreeMap},
     fmt::{self, Debug},
     future::Future,
-    ops::Deref,
     pin::Pin,
     sync::{Arc, Mutex as StdMutex},
 };
 
 use dashmap::DashMap;
 use eyeball::{Observable, SharedObservable, Subscriber};
 use futures_core::Stream;
+#[cfg(feature = "experimental-oidc")]
 use mas_oidc_client::{
     error::{
         Error as OidcClientError, ErrorBody as OidcErrorBody, HttpError as OidcHttpError,
@@ -42,6 +44,8 @@ use matrix_sdk_base::{
     SyncOutsideWasm,
 };
 use matrix_sdk_common::instant::Instant;
+#[cfg(feature = "experimental-oidc")]
+use ruma::api::client::error::ErrorKind;
 #[cfg(feature = "appservice")]
 use ruma::TransactionId;
 use ruma::{
@@ -56,7 +60,6 @@ use ruma::{
                 get_capabilities::{self, Capabilities},
                 get_supported_versions,
             },
-            error::ErrorKind,
             filter::{create_filter::v3::Request as FilterUploadRequest, FilterDefinition},
             membership::{join_room_by_id, join_room_by_id_or_alias},
             profile::get_profile,
@@ -83,7 +86,7 @@ use url::Url;
 #[cfg(feature = "e2e-encryption")]
 use crate::encryption::Encryption;
 #[cfg(feature = "experimental-oidc")]
-use crate::oidc::Oidc;
+use crate::oidc::{Oidc, OidcError};
 use crate::{
     authentication::AuthData,
     config::RequestConfig,
@@ -94,7 +97,6 @@ use crate::{
     http_client::HttpClient,
     matrix_auth::MatrixAuth,
     notification_settings::NotificationSettings,
-    oidc::OidcError,
     sync::{RoomUpdate, SyncResponse},
     Account, AuthApi, AuthSession, Error, Media, RefreshTokenError, Result, Room,
     TransmissionProgress,
@@ -434,7 +436,12 @@ impl Client {
         if let Some(discovered_server) = &self.inner.authentication_server_info {
             return Some(discovered_server);
         };
-        self.inner.auth_data.get().and_then(|d| d.as_oidc().map(|o| &o.issuer_info))
+
+        match self.inner.auth_data.get()? {
+            AuthData::Matrix(_) => None,
+            #[cfg(feature = "experimental-oidc")]
+            AuthData::Oidc(o) => Some(&o.issuer_info),
+        }
     }
 
     /// The sliding sync proxy that is trusted by the homeserver.
@@ -1346,6 +1353,7 @@ impl Client {
                         // Refreshing access tokens is not supported by this `Session`, ignore.
                         self.broadcast_unknown_token(soft_logout);
                     }
+                    #[cfg(feature = "experimental-oidc")]
                     RefreshTokenError::Oidc(oidc_error) => {
                         let oidc_error = oidc_error.deref();
                         match oidc_error {

crates/matrix-sdk/src/oidc/data_serde.rs

@@ -17,7 +17,7 @@ use serde::{de, ser::SerializeStruct, Deserialize, Serialize};
 use super::SessionTokens;
 
 impl Serialize for SessionTokens {
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: serde::Serializer,
     {

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

@@ -741,7 +741,7 @@ impl Oidc {
         // Get the user ID.
         let whoami_res = self.client.whoami().await.map_err(crate::Error::from)?;
 
-        let session = matrix_sdk_base::SessionMeta {
+        let session = SessionMeta {
             user_id: whoami_res.user_id,
             device_id: whoami_res.device_id.ok_or(OidcError::MissingDeviceId)?,
         };