Adding Salt and extending users

2026-05-31 17:18:05 -04:00
11 changed files with 140 additions and 74 deletions
@@ -3,10 +3,10 @@ name: Release Tagging
 on:
  push:
    branches:
-      - main
+      - v0.3.0-migrate
  pull_request:
    branches:
-      - main
+      - v0.3.0-migrate

 jobs:
  release:
@@ -3,10 +3,10 @@ name: Rust Build
 on:
  push:
    branches:
-      - main
+      - v0.3.0-migrate
  pull_request:
    branches:
-      - main
+      - v0.3.0-migrate

 jobs:
  check:
@@ -17,7 +17,6 @@ jobs:
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
      - run: cargo check

  test:
@@ -28,7 +27,6 @@ jobs:
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
      - run: cargo test

  fmt:
@@ -39,7 +37,6 @@ jobs:
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
      - run: rustup component add rustfmt
      - run: cargo fmt --all -- --check

@@ -51,7 +48,6 @@ jobs:
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
      - run: rustup component add clippy
      - run: cargo clippy -- -D warnings

@@ -63,5 +59,4 @@ jobs:
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
      - run: cargo build
@@ -31,9 +31,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

 [[package]]
 name = "bitflags"
-version = "2.13.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"

 [[package]]
 name = "bumpalo"
@@ -57,6 +57,17 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"

+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "rand_core",
+]
+
 [[package]]
 name = "const_format"
 version = "0.2.36"
@@ -78,6 +89,15 @@ dependencies = [
 "unicode-xid",
 ]

+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -109,6 +129,22 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.9"
@@ -179,6 +215,7 @@ dependencies = [
 "cfg-if",
 "libc",
 "r-efi",
+ "rand_core",
 "wasip2",
 "wasip3",
 ]
@@ -285,10 +322,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"

 [[package]]
-name = "log"
-version = "0.4.32"
+name = "linux-raw-sys"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "log"
+version = "0.4.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"

 [[package]]
 name = "memchr"
@@ -407,6 +450,23 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"

+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+dependencies = [
+ "chacha20",
+ "getrandom",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+
 [[package]]
 name = "regex"
 version = "1.12.3"
@@ -436,6 +496,19 @@ version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"

+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -521,6 +594,19 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "tempfile"
+version = "3.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
+dependencies = [
+ "fastrand",
+ "getrandom",
+ "once_cell",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "textsender_models"
 version = "0.3.0"
@@ -528,10 +614,11 @@ dependencies = [
 "const_format",
 "dotenvy",
 "josekit",
+ "rand",
 "serde",
 "serde_json",
+ "tempfile",
 "time",
- "utoipa",
 "uuid",
 ]

@@ -598,35 +685,11 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"

-[[package]]
-name = "utoipa"
-version = "5.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bde15df68e80b16c7d16b9616e80770ad158988daa56a27dccd1e55558b0160"
-dependencies = [
- "indexmap",
- "serde",
- "serde_json",
- "utoipa-gen",
-]
-
-[[package]]
-name = "utoipa-gen"
-version = "5.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba0b99ee52df3028635d93840c797102da61f8a7bb3cf751032455895b52ef8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "uuid",
-]
-
 [[package]]
 name = "uuid"
-version = "1.23.2"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7"
+checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
 dependencies = [
 "getrandom",
 "js-sys",
@@ -737,6 +800,21 @@ dependencies = [
 "semver",
 ]

+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "wit-bindgen"
 version = "0.51.0"
@@ -3,16 +3,19 @@ name = "textsender_models"
 version = "0.3.0"
 edition = "2024"
 rust-version = "1.95"
-description = "Models used for the textsender project"
+description = "models used for the textsender project"
+# license = "MIT"

 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.149" }
+rand = { version = "0.10.1" }
 time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] }
 uuid = { version = "1.23.1", features = ["v4", "serde"] }
 dotenvy = { version = "0.15.7" }
 const_format = { version = "0.2.36" }
 josekit = { version = "0.10.3" }
-utoipa = { version = "5.4.0", features = ["uuid", "time"] }
+# utoipa = { version = "5.4.0", features = ["uuid", "time"] }

 [dev-dependencies]
+tempfile = { version = "3.27.0" }
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct TwilioConfig {
    #[serde(alias = "auth_id")]
-    pub account_sid: String,
+    pub account_sid: uuid::Uuid,
    #[serde(skip_serializing_if = "String::is_empty")]
    pub service_sid: String,
    #[serde(skip_serializing_if = "String::is_empty")]
@@ -2,19 +2,14 @@ use serde::{Deserialize, Serialize};

 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Contact {
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
-    pub id: Option<uuid::Uuid>,
+    pub id: uuid::Uuid,
    // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub firstname: Option<String>,
+    pub firstname: String,
    // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub lastname: Option<String>,
+    pub lastname: String,
    // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub nickname: Option<String>,
+    pub nickname: String,
    pub phone_number: String,
    // empty
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
-    pub user_id: Option<uuid::Uuid>,
+    pub user_id: uuid::Uuid,
 }
@@ -6,10 +6,7 @@ pub mod token;
 pub mod user;

 pub mod init {
-    pub fn is_uuid_nil(uuid: &Option<uuid::Uuid>) -> bool {
-        match uuid {
-            Some(id) => id.is_nil(),
-            None => true,
-        }
+    pub fn is_uuid_nil(uuid: &uuid::Uuid) -> bool {
+        uuid.is_nil()
    }
 }
@@ -3,11 +3,9 @@ pub mod scheduling;

 use serde::{Deserialize, Serialize};

-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Message {
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
-    pub id: Option<uuid::Uuid>,
+    pub id: uuid::Uuid,
    pub content: String,
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
-    pub user_id: Option<uuid::Uuid>,
+    pub user_id: uuid::Uuid,
 }
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};

-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct ScheduledMessageEvent {
    id: uuid::Uuid,
    contact_id: uuid::Uuid,
@@ -12,7 +12,7 @@ pub struct Claims {
    pub issued_at: i64,
 }

-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct LoginResult {
    pub user_id: uuid::Uuid,
    pub access_token: String,
@@ -37,7 +37,7 @@ mod util {
    }
 }

-#[derive(Debug, utoipa::ToSchema)]
+#[derive(Debug)]
 pub struct TokenResource {
    pub message: String,
    pub issuer: String,
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};

-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct User {
    pub id: uuid::Uuid,
    pub phone_number: String,
@@ -18,7 +18,7 @@ pub struct User {
    pub salt_id: uuid::Uuid,
 }

-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct ServiceUser {
    pub id: uuid::Uuid,
    pub username: String,
@@ -32,7 +32,7 @@ pub struct ServiceUser {
    pub salt_id: uuid::Uuid,
 }

-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Organization {
    pub id: uuid::Uuid,
    pub name: String,
@@ -40,7 +40,7 @@ pub struct Organization {
    pub created: Option<time::OffsetDateTime>,
 }

-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct UserLoginHistory {
    pub id: uuid::Uuid,
    #[serde(with = "time::serde::rfc3339::option")]
@@ -48,7 +48,7 @@ pub struct UserLoginHistory {
    pub user_id: uuid::Uuid,
 }

-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct ServiceUserLoginHistory {
    pub id: uuid::Uuid,
    #[serde(with = "time::serde::rfc3339::option")]
@@ -56,7 +56,7 @@ pub struct ServiceUserLoginHistory {
    pub service_user_id: uuid::Uuid,
 }

-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct UserProfile {
    pub user_id: uuid::Uuid,
    pub phone_number: String,
@@ -71,7 +71,7 @@ pub struct UserProfile {

 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Salt {
-    // #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
    pub id: uuid::Uuid,
    #[serde(skip_serializing_if = "String::is_empty")]
    pub salt: String,