Move user_id and device_id into Identification

Not all callers will need the identification information.

src/lib.rs

@@ -23,7 +23,20 @@
 //! ```
 //!
 //! You can also pass an existing session to the `Client` constructor to restore a previous session
-//! rather than calling `log_in`.
+//! rather than calling `log_in`. This can also be used to create a session for an application service
+//! that does not need to log in, but uses the access_token directly:
+//!
+//! ```no_run
+//! use ruma_client::{Client, Session};
+//!
+//! let work = async {
+//!     let homeserver_url = "https://example.com".parse().unwrap();
+//!     let session = Session{access_token: "as_access_token".to_string(), identification: None};
+//!     let client = Client::https(homeserver_url, Some(session));
+//!
+//!     // make calls to the API
+//! };
+//! ```
 //!
 //! For the standard use case of synchronizing with the homeserver (i.e. getting all the latest
 //! events), use the `Client::sync`:
@@ -121,7 +134,7 @@ pub use ruma_identifiers as identifiers;
 mod error;
 mod session;
 
-pub use self::{error::Error, session::Session};
+pub use self::{error::Error, session::Identification, session::Session};
 
 /// A client for the Matrix client-server API.
 #[derive(Debug)]
@@ -225,8 +238,10 @@ where
 
         let session = Session {
             access_token: response.access_token,
-            device_id: response.device_id,
+            identification: Some(Identification {
-            user_id: response.user_id,
+                device_id: response.device_id,
+                user_id: response.user_id,
+            }),
         };
         *self.0.session.lock().unwrap() = Some(session.clone());
 
@@ -253,8 +268,10 @@ where
 
         let session = Session {
             access_token: response.access_token,
-            device_id: response.device_id,
+            identification: Some(Identification {
-            user_id: response.user_id,
+                device_id: response.device_id,
+                user_id: response.user_id,
+            }),
         };
         *self.0.session.lock().unwrap() = Some(session.clone());
 
@@ -290,8 +307,10 @@ where
 
         let session = Session {
             access_token: response.access_token,
-            device_id: response.device_id,
+            identification: Some(Identification {
-            user_id: response.user_id,
+                device_id: response.device_id,
+                user_id: response.user_id,
+            }),
         };
         *self.0.session.lock().unwrap() = Some(session.clone());
 

src/session.rs

@@ -7,6 +7,14 @@ use ruma_identifiers::UserId;
 pub struct Session {
     /// The access token used for this session.
     pub access_token: String,
+    /// Identification information for a user
+    pub identification: Option<Identification>,
+}
+
+/// The identification information about the associated user account if the session is associated with
+/// a single user account.
+#[derive(Clone, Debug, serde::Deserialize, Eq, Hash, PartialEq, serde::Serialize)]
+pub struct Identification {
     /// The user the access token was issued for.
     pub user_id: UserId,
     /// The ID of the client device
@@ -19,8 +27,7 @@ impl Session {
     pub fn new(access_token: String, user_id: UserId, device_id: String) -> Self {
         Self {
             access_token,
-            user_id,
+            identification: Some(Identification { user_id, device_id }),
-            device_id,
         }
     }
 
@@ -32,13 +39,19 @@ impl Session {
 
     /// Get the ID of the user the session belongs to.
     #[deprecated]
-    pub fn user_id(&self) -> &UserId {
+    pub fn user_id(&self) -> Option<&UserId> {
-        &self.user_id
+        if let Some(identification) = &self.identification {
+            return Some(&identification.user_id);
+        }
+        None
     }
 
     /// Get ID of the device the session belongs to.
     #[deprecated]
-    pub fn device_id(&self) -> &str {
+    pub fn device_id(&self) -> Option<&str> {
-        &self.device_id
+        if let Some(identification) = &self.identification {
+            return Some(&identification.device_id);
+        }
+        None
     }
 }