diff --git a/bindings/matrix-sdk-ffi/src/authentication_service.rs b/bindings/matrix-sdk-ffi/src/authentication_service.rs
index 41800b26b..62e8daf06 100644
--- a/bindings/matrix-sdk-ffi/src/authentication_service.rs
+++ b/bindings/matrix-sdk-ffi/src/authentication_service.rs
@@ -454,7 +454,7 @@ impl AuthenticationService {
             return Ok(());
         };
 
-        let oidc_metadata = self.oidc_metadata(configuration)?;
+        let oidc_metadata: VerifiedClientMetadata = configuration.try_into()?;
 
         if self.load_client_registration(oidc, issuer.clone(), oidc_metadata.clone()).await {
             tracing::info!("OIDC configuration loaded from disk.");
@@ -539,41 +539,6 @@ impl AuthenticationService {
         true
     }
 
-    /// Creates and verifies OIDC client metadata for the supplied OIDC
-    /// configuration.
-    fn oidc_metadata(
-        &self,
-        configuration: &OidcConfiguration,
-    ) -> Result<VerifiedClientMetadata, AuthenticationError> {
-        let redirect_uri = Url::parse(&configuration.redirect_uri)
-            .map_err(|_| AuthenticationError::OidcCallbackUrlInvalid)?;
-        let client_name =
-            configuration.client_name.as_ref().map(|n| Localized::new(n.to_owned(), []));
-        let client_uri = configuration.client_uri.localized_url()?;
-        let logo_uri = configuration.logo_uri.localized_url()?;
-        let policy_uri = configuration.policy_uri.localized_url()?;
-        let tos_uri = configuration.tos_uri.localized_url()?;
-        let contacts = configuration.contacts.clone();
-
-        ClientMetadata {
-            application_type: Some(ApplicationType::Native),
-            redirect_uris: Some(vec![redirect_uri]),
-            grant_types: Some(vec![GrantType::RefreshToken, GrantType::AuthorizationCode]),
-            // A native client shouldn't use authentication as the credentials could be intercepted.
-            token_endpoint_auth_method: Some(OAuthClientAuthenticationMethod::None),
-            // The server should display the following fields when getting the user's consent.
-            client_name,
-            contacts,
-            client_uri,
-            logo_uri,
-            policy_uri,
-            tos_uri,
-            ..Default::default()
-        }
-        .validate()
-        .map_err(|_| AuthenticationError::OidcMetadataInvalid)
-    }
-
     fn oidc_static_registrations(&self) -> HashMap<Url, ClientId> {
         let registrations = self
             .oidc_configuration
@@ -658,6 +623,43 @@ impl AuthenticationService {
     }
 }
 
+impl TryInto<VerifiedClientMetadata> for &OidcConfiguration {
+    type Error = AuthenticationError;
+
+    fn try_into(self) -> Result<VerifiedClientMetadata, Self::Error> {
+        let redirect_uri = Url::parse(&self.redirect_uri)
+            .map_err(|_| AuthenticationError::OidcCallbackUrlInvalid)?;
+        let client_name = self.client_name.as_ref().map(|n| Localized::new(n.to_owned(), []));
+        let client_uri = self.client_uri.localized_url()?;
+        let logo_uri = self.logo_uri.localized_url()?;
+        let policy_uri = self.policy_uri.localized_url()?;
+        let tos_uri = self.tos_uri.localized_url()?;
+        let contacts = self.contacts.clone();
+
+        ClientMetadata {
+            application_type: Some(ApplicationType::Native),
+            redirect_uris: Some(vec![redirect_uri]),
+            grant_types: Some(vec![
+                GrantType::RefreshToken,
+                GrantType::AuthorizationCode,
+                GrantType::DeviceCode,
+            ]),
+            // A native client shouldn't use authentication as the credentials could be intercepted.
+            token_endpoint_auth_method: Some(OAuthClientAuthenticationMethod::None),
+            // The server should display the following fields when getting the user's consent.
+            client_name,
+            contacts,
+            client_uri,
+            logo_uri,
+            policy_uri,
+            tos_uri,
+            ..Default::default()
+        }
+        .validate()
+        .map_err(|_| AuthenticationError::OidcMetadataInvalid)
+    }
+}
+
 trait OptionExt {
     /// Convenience method to convert a string to a URL and returns it as a
     /// Localized URL. No localization is actually performed.