bump: schedtxt_models

Reviewed-on: phoenix/textsender_models#34

.gitea/workflows/pr.yml

@@ -1,4 +1,4 @@
-name: textsender_models PR
+name: schedtxt_models PR
 
 on:
   pull_request:
@@ -14,10 +14,10 @@ jobs:
     name: Check
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: cargo check
 
@@ -25,10 +25,10 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
@@ -37,10 +37,10 @@ jobs:
     name: Clippy
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings

.gitea/workflows/release.yml

@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Important for git describe --tags
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.97
           components: cargo
 
       - name: Extract Version from Cargo.toml

.gitea/workflows/rust.yml

@@ -14,10 +14,10 @@ jobs:
     name: Check
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: cargo check
 
@@ -25,10 +25,10 @@ jobs:
     name: Test Suite
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: cargo test
 
@@ -36,10 +36,10 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
@@ -48,10 +48,10 @@ jobs:
     name: Clippy
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings
@@ -60,9 +60,9 @@ jobs:
     name: build
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: cargo build

Cargo.toml

@@ -1,16 +1,16 @@
 [package]
-name = "textsender_models"
+name = "schedtxt_models"
-version = "0.4.11"
+version = "0.5.3"
 edition = "2024"
-rust-version = "1.96"
+rust-version = "1.97"
-description = "Models used for the textsender project"
+description = "Models used for the schedtxt project"
 
 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.150" }
-time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] }
+time = { version = "0.3.53", features = ["formatting", "macros", "parsing", "serde"] }
-sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio-native-tls", "time", "uuid"] }
+sqlx = { version = "0.9.0", features = ["runtime-tokio", "tls-native-tls", "postgres", "time", "uuid"] }
-uuid = { version = "1.23.3", features = ["v4", "serde"] }
+uuid = { version = "1.23.5", features = ["v4", "serde"] }
 dotenvy = { version = "0.15.7" }
 const_format = { version = "0.2.36" }
 josekit = { version = "0.10.3" }

src/contact/mod.rs

@@ -4,13 +4,10 @@
 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

@@ -40,7 +40,7 @@ pub fn get_root_directory() -> crate::envy::EnvVar {
 
 pub fn get_app_base_api_url() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
-    let key = crate::envy::keys::TEXTSENDER_BASE_API_URL;
+    let key = crate::envy::keys::SCHEDTXT_BASE_API_URL;
     let value = std::env::var(key).expect(key);
 
     crate::envy::init_envvar(key, &value)
@@ -48,7 +48,7 @@ pub fn get_app_base_api_url() -> crate::envy::EnvVar {
 
 pub fn get_app_auth_base_api_url() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
-    let key = crate::envy::keys::TEXTSENDER_AUTH_BASE_API_URL;
+    let key = crate::envy::keys::SCHEDTXT_AUTH_BASE_API_URL;
     let value = std::env::var(key).expect(key);
 
     crate::envy::init_envvar(key, &value)

src/envy/keys.rs

@@ -2,7 +2,7 @@
 pub const DB_URL: &str = "DATABASE_URL";
 
 /// Environment key for secret main key
-/// Used for the textsender app
+/// Used for the schedtxt app
 pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY";
 
 /// Environment key for service logins
@@ -15,11 +15,11 @@ pub const SECRET_KEY: &str = "SECRET_KEY";
 /// Environment key for root directory for the textsender app
 pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY";
 
-/// Environment key for textsender api url
+/// Environment key for schedtxt api url
-pub const TEXTSENDER_BASE_API_URL: &str = "TEXTSENDER_BASE_API_URL";
+pub const SCHEDTXT_BASE_API_URL: &str = "SCHEDTXT_BASE_API_URL";
 
 /// Environment key for textsender auth api url
-pub const TEXTSENDER_AUTH_BASE_API_URL: &str = "TEXTSENDER_AUTH_BASE_API_URL";
+pub const SCHEDTXT_AUTH_BASE_API_URL: &str = "SCHEDTXT_AUTH_BASE_API_URL";
 
 /// Environment key for App status
 pub const APP_ENV: &str = "APP_ENV";
@@ -41,10 +41,10 @@ pub mod error {
     pub const SERVICE_LOGIN: &str = concatcp!(super::SERVICE_PASSPHRASE, " ", GENERAL_ERROR);
     pub const SECRET_KEY: &str = concatcp!(super::SECRET_KEY, " ", GENERAL_ERROR);
     pub const ROOT_DIRECTORY: &str = concatcp!(super::ROOT_DIRECTORY, " ", GENERAL_ERROR);
-    pub const TEXTSENDER_BASE_API_URL: &str =
+    pub const SCHEDTXT_BASE_API_URL: &str =
-        concatcp!(super::TEXTSENDER_BASE_API_URL, " ", GENERAL_ERROR);
+        concatcp!(super::SCHEDTXT_BASE_API_URL, " ", GENERAL_ERROR);
-    pub const TEXTSENDER_AUTH_BASE_API_URL: &str =
+    pub const SCHEDTXT_AUTH_BASE_API_URL: &str =
-        concatcp!(super::TEXTSENDER_AUTH_BASE_API_URL, " ", GENERAL_ERROR);
+        concatcp!(super::SCHEDTXT_AUTH_BASE_API_URL, " ", GENERAL_ERROR);
     pub const APP_ENV: &str = concatcp!(super::APP_ENV, " ", GENERAL_ERROR);
     pub const BACKEND_PORT: &str = concatcp!(super::BACKEND_PORT, " ", GENERAL_ERROR);
     pub const FRONTEND_URL: &str = concatcp!(super::FRONTEND_URL, " ", GENERAL_ERROR);

src/envy/utility.rs

@@ -2,14 +2,52 @@
 /// extract it into some strings
 pub fn delimitize(var: &crate::envy::EnvVar) -> Result<Vec<String>, std::io::Error> {
     if var.has_delimiter {
-        Ok(var
+        let values: Vec<String> = match var
             .value
             .split(var.delimiter)
-            .map(|c| c.parse::<String>().unwrap())
+            .map(|c| c.parse::<String>())
-            .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/token/mod.rs

@@ -78,37 +78,32 @@ pub struct CreateTokenResult {
 }
 
 pub fn create_token(
-    key: &String,
+    key: &str,
-    token_resource: &TokenResource,
+    token_resource: TokenResource,
     duration: time::Duration,
 ) -> Result<CreateTokenResult, josekit::JoseError> {
     let mut header = josekit::jws::JwsHeader::new();
     header.set_token_type(TOKEN_TYPE);
 
-    let mut payload = josekit::jwt::JwtPayload::new();
+    match init_payload(token_resource, duration) {
-    payload.set_subject(&token_resource.message);
+        Ok((payload, issued, expire)) => {
-    payload.set_issuer(&token_resource.issuer);
+            let signer = match josekit::jws::alg::hmac::HmacJwsAlgorithm::Hs256
-    payload.set_audience(token_resource.audiences.clone());
-    if !token_resource.user_id.is_nil() {
-        match payload.set_claim("user_id", Some(serde_json::json!(token_resource.user_id))) {
-            Ok(_) => {}
-            Err(err) => {
-                return Err(err);
-            }
-        }
-    }
-    match get_issued() {
-        Ok(issued) => {
-            let expire = issued + duration;
-            payload.set_issued_at(&util::time_to_std_time(&issued).unwrap());
-            payload.set_expires_at(&util::time_to_std_time(&expire).unwrap());
-
-            let signer = josekit::jws::alg::hmac::HmacJwsAlgorithm::Hs256
                 .signer_from_bytes(key.as_bytes())
-                .unwrap();
+            {
+                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: josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap(),
+                access_token,
                 issued: issued.unix_timestamp(),
                 expires_in: expire.unix_timestamp(),
                 token_issued: issued,
@@ -118,10 +113,69 @@ pub fn create_token(
     }
 }
 
+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);
+    payload.set_issuer(token_resource.issuer);
+    payload.set_audience(token_resource.audiences);
+
+    if !token_resource.user_id.is_nil() {
+        match payload.set_claim("user_id", Some(serde_json::json!(token_resource.user_id))) {
+            Ok(_) => {}
+            Err(err) => {
+                return Err(err);
+            }
+        }
+    }
+
+    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) {
+                Ok(issued_at) => issued_at,
+                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);
+            payload.set_expires_at(&expires_at);
+            Ok((issued, expire))
+        }
+        Err(err) => Err(josekit::JoseError::InvalidClaim(err.into())),
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    const TEST_MESSAGE: &str = "Testing for textsender";
+    const TEST_MESSAGE: &str = "Testing for schedtxt";
-    const TEST_ISSUER: &str = "textsender-test";
+    const TEST_ISSUER: &str = "schedtxt-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";
@@ -138,7 +192,7 @@ mod tests {
         let token_duration = time::Duration::minutes(30);
         let key = String::from(TEST_KEY);
 
-        match super::create_token(&key, &token_resource, token_duration) {
+        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 = {

src/user/mod.rs

@@ -6,9 +6,7 @@ pub struct User {
     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>,
@@ -27,7 +25,6 @@ pub struct ServiceUser {
     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)]
@@ -81,7 +78,6 @@ pub struct UserProfile {
 
 #[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow)]
 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,