From 8683ca4d13718a775a60e3922a6286cd9edc4efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Wed, 19 Mar 2025 10:23:47 +0100
Subject: [PATCH] refactor(oauth): Re-export ClientID from the oauth module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since it is now used everywhere, there is no reason to reexport it from
the registrations module.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
---
 bindings/matrix-sdk-ffi/src/authentication.rs               | 4 ++--
 bindings/matrix-sdk-ffi/src/client.rs                       | 2 +-
 crates/matrix-sdk/src/authentication/oauth/mod.rs           | 6 +++---
 crates/matrix-sdk/src/authentication/oauth/registrations.rs | 2 +-
 crates/matrix-sdk/src/test_utils/client.rs                  | 3 +--
 examples/oidc_cli/src/main.rs                               | 3 +--
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/bindings/matrix-sdk-ffi/src/authentication.rs b/bindings/matrix-sdk-ffi/src/authentication.rs
index 307f0469e..ed5e4b617 100644
--- a/bindings/matrix-sdk-ffi/src/authentication.rs
+++ b/bindings/matrix-sdk-ffi/src/authentication.rs
@@ -9,8 +9,8 @@ use matrix_sdk::{
     authentication::oauth::{
         error::OAuthAuthorizationCodeError,
         registration::{ApplicationType, ClientMetadata, Localized, OAuthGrantType},
-        registrations::{ClientId, OidcRegistrations, OidcRegistrationsError},
-        OAuthError as SdkOAuthError,
+        registrations::{OidcRegistrations, OidcRegistrationsError},
+        ClientId, OAuthError as SdkOAuthError,
     },
     Error,
 };
diff --git a/bindings/matrix-sdk-ffi/src/client.rs b/bindings/matrix-sdk-ffi/src/client.rs
index 66cff5398..fce7f111c 100644
--- a/bindings/matrix-sdk-ffi/src/client.rs
+++ b/bindings/matrix-sdk-ffi/src/client.rs
@@ -8,7 +8,7 @@ use anyhow::{anyhow, Context as _};
 use async_compat::get_runtime_handle;
 use matrix_sdk::{
     authentication::oauth::{
-        registrations::ClientId, AccountManagementActionFull, OAuthAuthorizationData, OAuthSession,
+        AccountManagementActionFull, ClientId, OAuthAuthorizationData, OAuthSession,
     },
     event_cache::EventCacheError,
     media::{
diff --git a/crates/matrix-sdk/src/authentication/oauth/mod.rs b/crates/matrix-sdk/src/authentication/oauth/mod.rs
index d6bdb7484..fd87500a1 100644
--- a/crates/matrix-sdk/src/authentication/oauth/mod.rs
+++ b/crates/matrix-sdk/src/authentication/oauth/mod.rs
@@ -144,11 +144,11 @@ use error::{
 #[cfg(feature = "e2e-encryption")]
 use matrix_sdk_base::crypto::types::qr_login::QrCodeData;
 use matrix_sdk_base::{once_cell::sync::OnceCell, SessionMeta};
-pub use oauth2::CsrfToken;
 use oauth2::{
     basic::BasicClient as OAuthClient, AccessToken, PkceCodeVerifier, RedirectUrl, RefreshToken,
     RevocationUrl, Scope, StandardErrorResponse, StandardRevocableToken, TokenResponse, TokenUrl,
 };
+pub use oauth2::{ClientId, CsrfToken};
 use ruma::{
     api::client::discovery::{
         get_authentication_issuer,
@@ -186,7 +186,7 @@ use self::{
     oidc_discovery::discover,
     qrcode::LoginWithQrCode,
     registration::{register_client, ClientMetadata, ClientRegistrationResponse},
-    registrations::{ClientId, OidcRegistrations},
+    registrations::OidcRegistrations,
 };
 pub use self::{
     account_management_url::AccountManagementActionFull,
@@ -764,7 +764,7 @@ impl OAuth {
     ///
     /// ```no_run
     /// use matrix_sdk::{Client, ServerName};
-    /// use matrix_sdk::authentication::oauth::registrations::ClientId;
+    /// # use matrix_sdk::authentication::oauth::ClientId;
     /// # use matrix_sdk::authentication::oauth::registration::ClientMetadata;
     /// # use ruma::serde::Raw;
     /// # let client_metadata = unimplemented!();
diff --git a/crates/matrix-sdk/src/authentication/oauth/registrations.rs b/crates/matrix-sdk/src/authentication/oauth/registrations.rs
index c4ef37367..26d1b70f3 100644
--- a/crates/matrix-sdk/src/authentication/oauth/registrations.rs
+++ b/crates/matrix-sdk/src/authentication/oauth/registrations.rs
@@ -28,7 +28,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-pub use oauth2::ClientId;
+use oauth2::ClientId;
 use ruma::serde::Raw;
 use serde::{Deserialize, Serialize};
 use url::Url;
diff --git a/crates/matrix-sdk/src/test_utils/client.rs b/crates/matrix-sdk/src/test_utils/client.rs
index c8417522d..1f5d258af 100644
--- a/crates/matrix-sdk/src/test_utils/client.rs
+++ b/crates/matrix-sdk/src/test_utils/client.rs
@@ -180,8 +180,7 @@ pub mod oauth {
     use crate::{
         authentication::oauth::{
             registration::{ApplicationType, ClientMetadata, Localized, OAuthGrantType},
-            registrations::ClientId,
-            OAuthSession, UserSession,
+            ClientId, OAuthSession, UserSession,
         },
         SessionTokens,
     };
diff --git a/examples/oidc_cli/src/main.rs b/examples/oidc_cli/src/main.rs
index 48b0ee7c3..50e8021a1 100644
--- a/examples/oidc_cli/src/main.rs
+++ b/examples/oidc_cli/src/main.rs
@@ -24,8 +24,7 @@ use futures_util::StreamExt;
 use matrix_sdk::{
     authentication::oauth::{
         registration::{ApplicationType, ClientMetadata, Localized, OAuthGrantType},
-        registrations::ClientId,
-        AccountManagementActionFull, AuthorizationCode, AuthorizationResponse, CsrfToken,
+        AccountManagementActionFull, AuthorizationCode, AuthorizationResponse, ClientId, CsrfToken,
         OAuthAuthorizationData, OAuthSession, UserSession,
     },
     config::SyncSettings,