cargo fmt

Reviewed-on: phoenix/textsender-models#7

src/config/auxiliary/mod.rs

@@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct TwilioConfig {
-    // #[serde(skip_serializing_if = "init::is_uuid_nil")]
     #[serde(alias = "auth_id")]
     pub account_sid: uuid::Uuid,
     #[serde(skip_serializing_if = "String::is_empty")]

src/lib.rs

@@ -1,3 +1,4 @@
 pub mod config;
 pub mod contact;
 pub mod token;
+pub mod user;

src/token/mod.rs

@@ -4,6 +4,12 @@ use serde::{Deserialize, Serialize};
 pub struct Claims {
     pub user_id: uuid::Uuid,
     pub role: String,
+    #[serde(alias = "iss")]
+    pub issued: String,
+    #[serde(alias = "exp")]
+    pub expired: i64,
+    #[serde(alias = "iat")]
+    pub issued_at: i64,
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
@@ -15,9 +21,5 @@ pub struct LoginResult {
     pub issued_at: i64,
 }
 
-// Make alias for LoginResult for Login
-
 // Alias for LoginResult
-// Will be deprecated at some point
-// type Login = LoginResult
-type Login = LoginResult;
+pub type Login = LoginResult;

src/user/mod.rs

@@ -0,0 +1,29 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct User {
+    pub id: uuid::Uuid,
+    pub phone_number: String,
+    pub username: String,
+    pub password: String,
+    // Firstname is a pointer
+    pub firstname: String,
+    // Lastname is a pointer
+    pub lastname: String,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub created: Option<time::OffsetDateTime>,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub last_login: Option<time::OffsetDateTime>,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct ServiceUser {
+    pub id: uuid::Uuid,
+    // TODO: Remove the omitempty tags at a later point
+    pub username: String,
+    pub passphrase: String,
+    pub created: Option<time::OffsetDateTime>,
+    // When serializing to json, if empty do not populate
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub last_login: Option<time::OffsetDateTime>,
+}