Added token module

src/config/auxiliary/mod.rs

@@ -2,6 +2,7 @@ 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,4 +1,3 @@
 pub mod config;
 pub mod contact;
 pub mod token;
-pub mod user;

src/token/mod.rs

@@ -4,12 +4,6 @@ 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)]
@@ -21,5 +15,9 @@ pub struct LoginResult {
     pub issued_at: i64,
 }
 
+// Make alias for LoginResult for Login
+
 // Alias for LoginResult
-pub type Login = LoginResult;
+// Will be deprecated at some point
+// type Login = LoginResult
+type Login = LoginResult;

src/user/mod.rs

@@ -1,89 +0,0 @@
-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,
-    pub username: String,
-    pub passphrase: String,
-    #[serde(with = "time::serde::rfc3339::option")]
-    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>,
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-pub struct UserLoginHistory {
-    pub id: uuid::Uuid,
-    #[serde(with = "time::serde::rfc3339::option")]
-    pub login_time: Option<time::OffsetDateTime>,
-    pub user_id: uuid::Uuid,
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-pub struct ServiceUserLoginHistory {
-    pub id: uuid::Uuid,
-    #[serde(with = "time::serde::rfc3339::option")]
-    pub login_time: Option<time::OffsetDateTime>,
-    pub service_user_id: uuid::Uuid,
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-pub struct UserProfile {
-    pub user_id: uuid::Uuid,
-    pub phone_number: String,
-    pub username: String,
-    pub firstname: String,
-    pub lastname: String,
-    pub created: Option<time::OffsetDateTime>,
-    pub last_login: Option<time::OffsetDateTime>,
-}
-
-pub fn init_user_profile(usr: &User) -> UserProfile {
-    UserProfile {
-        user_id: usr.id,
-        phone_number: usr.phone_number.clone(),
-        username: usr.username.clone(),
-        firstname: usr.firstname.clone(),
-        lastname: usr.lastname.clone(),
-        created: usr.created,
-        last_login: usr.last_login,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_init_user_profile() {
-        let usr = super::User {
-            id: uuid::Uuid::new_v4(),
-            phone_number: String::from("+12308438462"),
-            username: String::from("Cowboy99"),
-            password: String::from("238n7cyr2q89d3xhe2"),
-            firstname: String::from("BillyBob"),
-            lastname: String::from("Jones"),
-            created: Some(time::OffsetDateTime::now_utc()),
-            last_login: Some(time::OffsetDateTime::now_utc()),
-            ..Default::default()
-        };
-
-        let profile = super::init_user_profile(&usr);
-        assert_eq!(usr.phone_number, profile.phone_number, "Phone numbers are not equal");
-    }
-}