API: Use DeviceId

fractal-matrix-api/src/backend/register.rs

@@ -61,7 +61,7 @@ pub fn guest(bk: &Backend, server: &str) -> Result<(), Error> {
                 data.lock().unwrap().user_id = uid.clone();
                 data.lock().unwrap().access_token = tk.clone();
                 data.lock().unwrap().since = None;
-                tx.send(BKResponse::Token(uid, tk, dev))  // TODO: Use UserId
+                tx.send(BKResponse::Token(uid, tk, dev))  // TODO: Use UserId and DeviceId
                     .expect_log("Connection closed");
                 tx.send(BKResponse::Rooms(vec![], None))
                     .expect_log("Connection closed");
@@ -133,7 +133,7 @@ pub fn login(bk: &Backend, user: String, password: String, server: &str) -> Resu
                     data.lock().unwrap().user_id = uid.clone();
                     data.lock().unwrap().access_token = tk.clone();
                     data.lock().unwrap().since = None;
-                    tx.send(BKResponse::Token(uid, tk, dev))  // TODO: Use UserId
+                    tx.send(BKResponse::Token(uid, tk, dev))  // TODO: Use UserId and DeviceId
                         .expect_log("Connection closed");
                 }
             }

fractal-matrix-api/src/lib.rs

@@ -13,6 +13,7 @@ mod serde;
 pub mod types;
 
 pub mod prelude {
+    pub use ruma_identifiers::DeviceId;
     pub use ruma_identifiers::RoomAliasId;
     pub use ruma_identifiers::RoomId;
     pub use ruma_identifiers::UserId;

fractal-matrix-api/src/r0/account/login.rs

@@ -3,6 +3,7 @@ use crate::r0::AccessToken;
 use reqwest::Client;
 use reqwest::Error;
 use reqwest::Request;
+use ruma_identifiers::DeviceId;
 use ruma_identifiers::UserId;
 use serde::{Deserialize, Serialize};
 use url::Url;
@@ -14,7 +15,7 @@ pub struct Body {
     #[serde(flatten)]
     pub auth: Auth,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub device_id: Option<String>,
+    pub device_id: Option<DeviceId>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub initial_device_display_name: Option<String>,
 }
@@ -32,7 +33,7 @@ pub enum Auth {
 pub struct Response {
     pub access_token: Option<AccessToken>,
     pub user_id: Option<UserId>,
-    pub device_id: Option<String>,
+    pub device_id: Option<DeviceId>,
 }
 
 pub fn request(base: Url, body: &Body) -> Result<Request, Error> {

fractal-matrix-api/src/r0/account/register.rs

@@ -3,6 +3,7 @@ use crate::r0::AccessToken;
 use reqwest::Client;
 use reqwest::Error;
 use reqwest::Request;
+use ruma_identifiers::DeviceId;
 use ruma_identifiers::UserId;
 use serde::{Deserialize, Serialize};
 use std::ops::Not;
@@ -45,7 +46,7 @@ pub struct Body {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub username: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub device_id: Option<String>,
+    pub device_id: Option<DeviceId>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub initial_device_display_name: Option<String>,
     #[serde(skip_serializing_if = "Not::not")]
@@ -56,7 +57,7 @@ pub struct Body {
 pub struct Response {
     pub user_id: UserId,
     pub access_token: Option<AccessToken>,
-    pub device_id: Option<String>,
+    pub device_id: Option<DeviceId>,
 }
 
 pub fn request(base: Url, params: &Parameters, body: &Body) -> Result<Request, Error> {