Adding more features

.gitea/workflows/pr.yml

@@ -5,10 +5,6 @@ on:
     branches:
       - main
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check:
     name: Check
@@ -17,7 +13,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: cargo check
 
@@ -28,7 +24,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
@@ -40,7 +36,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings

.gitea/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
           components: cargo
 
       - name: Extract Version from Cargo.toml

.gitea/workflows/rust.yml

@@ -5,10 +5,6 @@ on:
     branches:
       - main
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check:
     name: Check
@@ -17,7 +13,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: cargo check
 
@@ -28,7 +24,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: cargo test
 
@@ -39,7 +35,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
@@ -51,7 +47,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings
@@ -63,6 +59,6 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: cargo build

Cargo.toml

@@ -1,20 +1,19 @@
 [package]
 name = "textsender_models"
-version = "0.5.0"
+version = "0.3.4"
 edition = "2024"
-rust-version = "1.96"
+rust-version = "1.95"
 description = "Models used for the textsender project"
 
 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.150" }
+serde_json = { version = "1.0.149" }
-time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] }
+time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] }
-sqlx = { version = "0.9.0", features = ["runtime-tokio", "tls-native-tls", "postgres", "time", "uuid"] }
+uuid = { version = "1.23.1", features = ["v4", "serde"] }
-uuid = { version = "1.23.3", features = ["v4", "serde"] }
 dotenvy = { version = "0.15.7" }
 const_format = { version = "0.2.36" }
 josekit = { version = "0.10.3" }
-utoipa = { version = "5.5.0", features = ["uuid", "time"] }
+utoipa = { version = "5.4.0", features = ["uuid", "time"] }
 
 [features]
 default = ["full"]

src/config/auxiliary/mod.rs

@@ -1,4 +1,6 @@
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct TwilioConfig {
     #[serde(alias = "auth_id")]
     pub account_sid: String,
@@ -19,25 +21,3 @@ impl TwilioConfig {
         println!("Number: {:?}", self.phone_number);
     }
 }
-
-pub fn load_config() -> Result<TwilioConfig, std::io::Error> {
-    let auth_sid_var = crate::envy::environment::get_env("TWILIO_AUTH_SID");
-    let service_sid_var = crate::envy::environment::get_env("TWILIO_SERVICE_SID");
-    let auth_token_var = crate::envy::environment::get_env("TWILIO_AUTH_TOKEN");
-    let phone_number_var = crate::envy::environment::get_env("TWILIO_PHONE_NUMBER");
-
-    if auth_sid_var.value.is_empty()
-        || service_sid_var.value.is_empty()
-        || auth_token_var.value.is_empty()
-        || phone_number_var.value.is_empty()
-    {
-        Err(std::io::Error::other("Config not set"))
-    } else {
-        Ok(TwilioConfig {
-            service_sid: service_sid_var.value,
-            auth_token: auth_token_var.value,
-            account_sid: auth_sid_var.value,
-            phone_number: phone_number_var.value,
-        })
-    }
-}

src/contact/mod.rs

@@ -1,13 +1,16 @@
-#[derive(
+use serde::{Deserialize, Serialize};
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
+
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct Contact {
     #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub id: Option<uuid::Uuid>,
+    // empty?
     #[serde(skip_serializing_if = "Option::is_none")]
     pub firstname: Option<String>,
+    // empty?
     #[serde(skip_serializing_if = "Option::is_none")]
     pub lastname: Option<String>,
+    // empty?
     #[serde(skip_serializing_if = "Option::is_none")]
     pub nickname: Option<String>,
     pub phone_number: String,

src/envy/environment.rs

@@ -1,4 +1,4 @@
-pub fn get_db_url() -> crate::envy::EnvVar {
+pub async fn get_db_url() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::DB_URL;
     let value = std::env::var(key).expect(key);
@@ -6,7 +6,7 @@ pub fn get_db_url() -> crate::envy::EnvVar {
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_secret_main_key() -> crate::envy::EnvVar {
+pub async fn get_secret_main_key() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::SECRET_MAIN_KEY;
     let value = std::env::var(key).expect(key);
@@ -14,7 +14,7 @@ pub fn get_secret_main_key() -> crate::envy::EnvVar {
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_service_passphrase() -> crate::envy::EnvVar {
+pub async fn get_service_passphrase() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::SERVICE_PASSPHRASE;
     let value = std::env::var(key).expect(key);
@@ -22,7 +22,7 @@ pub fn get_service_passphrase() -> crate::envy::EnvVar {
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_secret_key() -> crate::envy::EnvVar {
+pub async fn get_secret_key() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::SECRET_KEY;
     let value = std::env::var(key).expect(key);
@@ -30,7 +30,7 @@ pub fn get_secret_key() -> crate::envy::EnvVar {
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_root_directory() -> crate::envy::EnvVar {
+pub async fn get_root_directory() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::ROOT_DIRECTORY;
     let value = std::env::var(key).expect(key);
@@ -38,7 +38,7 @@ pub fn get_root_directory() -> crate::envy::EnvVar {
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_app_base_api_url() -> crate::envy::EnvVar {
+pub async fn get_app_base_api_url() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::TEXTSENDER_BASE_API_URL;
     let value = std::env::var(key).expect(key);
@@ -46,7 +46,7 @@ pub fn get_app_base_api_url() -> crate::envy::EnvVar {
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_app_auth_base_api_url() -> crate::envy::EnvVar {
+pub async fn get_app_auth_base_api_url() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::TEXTSENDER_AUTH_BASE_API_URL;
     let value = std::env::var(key).expect(key);
@@ -54,7 +54,7 @@ pub fn get_app_auth_base_api_url() -> crate::envy::EnvVar {
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_app_env() -> crate::envy::EnvVar {
+pub async fn get_app_env() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::APP_ENV;
     let value = std::env::var(key).expect(key);
@@ -62,14 +62,14 @@ pub fn get_app_env() -> crate::envy::EnvVar {
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_backend_port() -> crate::envy::EnvVar {
+pub async fn get_backend_port() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::BACKEND_PORT;
     let value = std::env::var(key).expect(key);
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_frontend_url() -> crate::envy::EnvVar {
+pub async fn get_frontend_url() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::FRONTEND_URL;
     let value = std::env::var(key).expect(key);
@@ -77,7 +77,7 @@ pub fn get_frontend_url() -> crate::envy::EnvVar {
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_rust_log() -> crate::envy::EnvVar {
+pub async fn get_rust_log() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::RUST_LOG;
     let value = std::env::var(key).expect(key);
@@ -85,7 +85,7 @@ pub fn get_rust_log() -> crate::envy::EnvVar {
     crate::envy::init_envvar(key, &value)
 }
 
-pub fn get_allowed_origins() -> crate::envy::EnvVar {
+pub async fn get_allowed_origins() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::ALLOWED_ORIGINS;
     let value = std::env::var(key).expect(key);
@@ -96,8 +96,8 @@ pub fn get_allowed_origins() -> crate::envy::EnvVar {
     envvar
 }
 
-/// Get environment not specified in the library
+/// Get environment not specified in the code
-pub fn get_env(environment: &str) -> crate::envy::EnvVar {
+pub async fn get_env(environment: &str) -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let my_error = format!("{environment} {}", crate::envy::keys::error::GENERAL_ERROR);
     let value = std::env::var(environment).expect(&my_error);

src/envy/mod.rs

@@ -20,17 +20,16 @@ pub fn init_envvar(key: &str, value: &str) -> EnvVar {
 }
 
 pub fn init_delimiter(envvar: &mut EnvVar, delimiter: char) {
-    let amount_of_delimiters_found: i32 = {
+    let mut amount_of_delimiters_found: i32 = 0;
-        let mut count = 0;
+
-        for v in envvar.value.chars() {
+    for v in envvar.value.chars() {
-            if v == delimiter {
+        if v == delimiter {
-                count += 1;
+            amount_of_delimiters_found += 1;
-            }
+        }
-        }
+    }
 
-        count
-    };
     let has_delimiter = amount_of_delimiters_found >= 1;
+
     if has_delimiter {
         envvar.has_delimiter = has_delimiter;
         envvar.delimiter = delimiter;
@@ -38,20 +37,3 @@ pub fn init_delimiter(envvar: &mut EnvVar, delimiter: char) {
         envvar.has_delimiter = has_delimiter;
     }
 }
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_init_delimiter() {
-        let delimiter: char = ',';
-        let value = format!("red,green,white,black");
-        let mut env_var = super::EnvVar {
-            key: String::from("COLORS"),
-            value: value.clone(),
-            ..Default::default()
-        };
-
-        super::init_delimiter(&mut env_var, delimiter);
-        assert_eq!(value, env_var.value, "Colors do not match");
-    }
-}

src/envy/utility.rs

@@ -2,52 +2,14 @@
 /// extract it into some strings
 pub fn delimitize(var: &crate::envy::EnvVar) -> Result<Vec<String>, std::io::Error> {
     if var.has_delimiter {
-        let values: Vec<String> = match var
+        Ok(var
             .value
             .split(var.delimiter)
-            .map(|c| c.parse::<String>())
+            .map(|c| c.parse::<String>().unwrap())
-            .collect()
+            .collect())
-        {
-            Ok(v) => v,
-            Err(err) => {
-                return Err(std::io::Error::other(err));
-            }
-        };
-
-        Ok(values)
     } else {
         Err(std::io::Error::other(
             "Environment variable does not have a delimiter",
         ))
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_delimitize() {
-        let envvar = crate::envy::EnvVar {
-            key: "OCEANS".to_string(),
-            value: "Atlantic|Pacific|Indian|Arctic".to_string(),
-            has_delimiter: true,
-            delimiter: '|',
-        };
-        let all_values = vec![
-            "Atlantic".to_string(),
-            "Pacific".to_string(),
-            "Indian".to_string(),
-            "Arctic".to_string(),
-        ];
-
-        match delimitize(&envvar) {
-            Ok(values) => {
-                assert_eq!(values, all_values, "Failure in delimitizing EnvVar values");
-            }
-            Err(err) => {
-                assert!(false, "Error delimitizing: {err:?}");
-            }
-        }
-    }
-}

src/message/event/mod.rs

@@ -1,17 +1,14 @@
-/// Message status - Instant
+use serde::{Deserialize, Serialize};
+
 pub const MESSAGE_EVENT_RESPONSE_STATUS_INSTANT: &str = "INSTANT";
-/// Message status - Scheduled
 pub const MESSAGE_EVENT_RESPONSE_STATUS_SCHEDULED: &str = "SCHEDULED";
 
-#[derive(
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
 pub struct MessageEventResponse {
     pub id: uuid::Uuid,
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    pub scheduled_message_event_id: uuid::Uuid,
-    pub scheduled_message_event_id: Option<uuid::Uuid>,
+    // Json field
-    /// Stores a json response of the sent message
+    pub response: String,
-    pub response: serde_json::Value,
     pub user_id: uuid::Uuid,
     pub contact_id: uuid::Uuid,
     pub message_id: uuid::Uuid,

src/message/mod.rs

@@ -1,9 +1,9 @@
 pub mod event;
 pub mod scheduling;
 
-#[derive(
+use serde::{Deserialize, Serialize};
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
+
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct Message {
     #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub id: Option<uuid::Uuid>,

src/message/scheduling/mod.rs

@@ -1,26 +1,24 @@
-#[derive(
+use serde::{Deserialize, Serialize};
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
+
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct ScheduledMessageEvent {
-    pub id: uuid::Uuid,
+    id: uuid::Uuid,
-    pub contact_id: uuid::Uuid,
+    contact_id: uuid::Uuid,
-    pub message_id: uuid::Uuid,
+    message_id: uuid::Uuid,
-    pub scheduled_message_id: uuid::Uuid,
+    scheduled_message_id: uuid::Uuid,
     #[serde(with = "time::serde::rfc3339::option")]
-    pub created: Option<time::OffsetDateTime>,
+    created: Option<time::OffsetDateTime>,
 }
 
-#[derive(
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
 pub struct ScheduledMessage {
-    pub id: uuid::Uuid,
+    id: uuid::Uuid,
     #[serde(with = "time::serde::rfc3339::option")]
-    pub scheduled: Option<time::OffsetDateTime>,
+    scheduled: Option<time::OffsetDateTime>,
     #[serde(with = "time::serde::rfc3339::option")]
-    pub created: Option<time::OffsetDateTime>,
+    created: Option<time::OffsetDateTime>,
-    pub status: String,
+    status: String,
-    pub user_id: uuid::Uuid,
+    user_id: uuid::Uuid,
 }
 
 pub const READY: &str = "READY";

src/token/mod.rs

@@ -1,6 +1,6 @@
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Claims {
     pub user_id: uuid::Uuid,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -34,7 +34,7 @@ where
     }
 }
 
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct LoginResult {
     pub user_id: uuid::Uuid,
     pub access_token: String,
@@ -54,7 +54,7 @@ mod util {
     pub fn time_to_std_time(
         provided_time: &time::OffsetDateTime,
     ) -> Result<std::time::SystemTime, std::time::SystemTimeError> {
-        let converted: std::time::SystemTime = (*provided_time).into();
+        let converted = std::time::SystemTime::from(*provided_time);
         Ok(converted)
     }
 }
@@ -70,65 +70,21 @@ pub struct TokenResource {
 /// Token type
 pub const TOKEN_TYPE: &str = "JWT";
 
-pub struct CreateTokenResult {
-    pub access_token: String,
-    pub issued: i64,
-    pub expires_in: i64,
-    pub token_issued: time::OffsetDateTime,
-}
-
 pub fn create_token(
-    key: &str,
+    key: &String,
-    token_resource: TokenResource,
+    token_resource: &TokenResource,
     duration: time::Duration,
-) -> Result<CreateTokenResult, josekit::JoseError> {
+) -> Result<(String, i64), josekit::JoseError> {
     let mut header = josekit::jws::JwsHeader::new();
     header.set_token_type(TOKEN_TYPE);
 
-    match init_payload(token_resource, duration) {
-        Ok((payload, issued, expire)) => {
-            let signer = match josekit::jws::alg::hmac::HmacJwsAlgorithm::Hs256
-                .signer_from_bytes(key.as_bytes())
-            {
-                Ok(signer) => signer,
-                Err(err) => {
-                    return Err(err);
-                }
-            };
-            let access_token = match josekit::jwt::encode_with_signer(&payload, &header, &signer) {
-                Ok(access_token) => access_token,
-                Err(err) => {
-                    return Err(err);
-                }
-            };
-
-            Ok(CreateTokenResult {
-                access_token,
-                issued: issued.unix_timestamp(),
-                expires_in: expire.unix_timestamp(),
-                token_issued: issued,
-            })
-        }
-        Err(e) => Err(josekit::JoseError::InvalidClaim(e.into())),
-    }
-}
-
-fn init_payload(
-    token_resource: TokenResource,
-    duration: time::Duration,
-) -> Result<
-    (
-        josekit::jwt::JwtPayload,
-        time::OffsetDateTime,
-        time::OffsetDateTime,
-    ),
-    josekit::JoseError,
-> {
     let mut payload = josekit::jwt::JwtPayload::new();
-    payload.set_subject(token_resource.message);
+    let message = &token_resource.message;
-    payload.set_issuer(token_resource.issuer);
+    let issuer = &token_resource.issuer;
-    payload.set_audience(token_resource.audiences);
+    let audiences: &Vec<String> = &token_resource.audiences;
-
+    payload.set_subject(message);
+    payload.set_issuer(issuer);
+    payload.set_audience(audiences.clone());
     if !token_resource.user_id.is_nil() {
         match payload.set_claim("user_id", Some(serde_json::json!(token_resource.user_id))) {
             Ok(_) => {}
@@ -137,81 +93,20 @@ fn init_payload(
             }
         }
     }
-
-    match init_payload_issued(&mut payload, duration) {
-        Ok((issued, expire)) => Ok((payload, issued, expire)),
-        Err(err) => Err(err),
-    }
-}
-
-fn init_payload_issued(
-    payload: &mut josekit::jwt::JwtPayload,
-    duration: time::Duration,
-) -> Result<(time::OffsetDateTime, time::OffsetDateTime), josekit::JoseError> {
     match get_issued() {
         Ok(issued) => {
             let expire = issued + duration;
-            let issued_at = match util::time_to_std_time(&issued) {
+            payload.set_issued_at(&util::time_to_std_time(&issued).unwrap());
-                Ok(issued_at) => issued_at,
+            payload.set_expires_at(&util::time_to_std_time(&expire).unwrap());
-                Err(err) => {
-                    return Err(josekit::JoseError::InvalidClaim(err.into()));
-                }
-            };
-            let expires_at = match util::time_to_std_time(&expire) {
-                Ok(expires_at) => expires_at,
-                Err(err) => {
-                    return Err(josekit::JoseError::InvalidClaim(err.into()));
-                }
-            };
 
-            payload.set_issued_at(&issued_at);
+            let signer = josekit::jws::alg::hmac::HmacJwsAlgorithm::Hs256
-            payload.set_expires_at(&expires_at);
+                .signer_from_bytes(key.as_bytes())
-            Ok((issued, expire))
+                .unwrap();
-        }
+            Ok((
-        Err(err) => Err(josekit::JoseError::InvalidClaim(err.into())),
+                josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap(),
-    }
+                (expire - time::OffsetDateTime::UNIX_EPOCH).whole_seconds(),
-}
+            ))
-
-#[cfg(test)]
-mod tests {
-    const TEST_MESSAGE: &str = "Testing for textsender";
-    const TEST_ISSUER: &str = "textsender-test";
-    const TEST_AUDIENCE: &str = "area-test";
-    const TEST_USER_ID: uuid::Uuid = uuid::uuid!("9ab1c75f-d184-4913-ae99-544b4dcfcb41");
-    const TEST_KEY: &str = "8342nhf7ycrt4983q7ryfc93w478ryfc3w9487ryfc342w98i7cy";
-
-    #[test]
-    fn test_create_token() {
-        let token_resource = super::TokenResource {
-            message: String::from(TEST_MESSAGE),
-            issuer: String::from(TEST_ISSUER),
-            audiences: vec![String::from(TEST_AUDIENCE)],
-            user_id: TEST_USER_ID,
-        };
-
-        let token_duration = time::Duration::minutes(30);
-        let key = String::from(TEST_KEY);
-
-        match super::create_token(&key, token_resource, token_duration) {
-            Ok(cst) => match time::OffsetDateTime::from_unix_timestamp(cst.issued) {
-                Ok(d_result) => {
-                    let they_match = {
-                        d_result.year() == cst.token_issued.year()
-                            && d_result.month() == cst.token_issued.month()
-                            && d_result.day() == cst.token_issued.day()
-                            && d_result.hour() == cst.token_issued.hour()
-                            && d_result.minute() == cst.token_issued.minute()
-                            && d_result.second() == cst.token_issued.second()
-                    };
-                    assert!(they_match, "Issued times do not match");
-                }
-                Err(err) => {
-                    assert!(false, "Error: {err:?}");
-                }
-            },
-            Err(err) => {
-                assert!(false, "Error: {err:?}");
-            }
         }
+        Err(e) => Err(josekit::JoseError::InvalidClaim(e.into())),
     }
 }

src/user/mod.rs

@@ -1,12 +1,14 @@
-#[derive(
+use serde::{Deserialize, Serialize};
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
+
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 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>,
@@ -16,24 +18,21 @@ pub struct User {
     pub salt_id: uuid::Uuid,
 }
 
-#[derive(
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
 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>,
     #[serde(skip)]
     pub salt_id: uuid::Uuid,
 }
 
-#[derive(
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
 pub struct Organization {
     pub id: uuid::Uuid,
     pub name: String,
@@ -41,9 +40,7 @@ pub struct Organization {
     pub created: Option<time::OffsetDateTime>,
 }
 
-#[derive(
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
 pub struct UserLoginHistory {
     pub id: uuid::Uuid,
     #[serde(with = "time::serde::rfc3339::option")]
@@ -51,9 +48,7 @@ pub struct UserLoginHistory {
     pub user_id: uuid::Uuid,
 }
 
-#[derive(
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
 pub struct ServiceUserLoginHistory {
     pub id: uuid::Uuid,
     #[serde(with = "time::serde::rfc3339::option")]
@@ -61,9 +56,7 @@ pub struct ServiceUserLoginHistory {
     pub service_user_id: uuid::Uuid,
 }
 
-#[derive(
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
 pub struct UserProfile {
     pub user_id: uuid::Uuid,
     pub phone_number: String,
@@ -76,8 +69,9 @@ pub struct UserProfile {
     pub last_login: Option<time::OffsetDateTime>,
 }
 
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Salt {
+    // #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub id: uuid::Uuid,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub salt: String,