cargo fmt

Cargo.lock

@@ -619,7 +619,6 @@ dependencies = [
  "serde_json",
  "tempfile",
  "time",
- "utoipa",
  "uuid",
 ]
 
@@ -686,30 +685,6 @@ 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.1"

Cargo.toml

@@ -15,7 +15,7 @@ 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" }

src/contact/mod.rs

@@ -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: uuid::Uuid,
     // empty?
-    #[serde(skip_serializing_if = "String::is_empty")]
     pub firstname: String,
     // empty?
-    #[serde(skip_serializing_if = "String::is_empty")]
     pub lastname: String,
     // empty?
-    #[serde(skip_serializing_if = "String::is_empty")]
     pub nickname: String,
     pub phone_number: String,
     // empty
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub user_id: uuid::Uuid,
 }

src/lib.rs

@@ -4,9 +4,3 @@ pub mod envy;
 pub mod message;
 pub mod token;
 pub mod user;
-
-pub mod init {
-    pub fn is_uuid_nil(uuid: &uuid::Uuid) -> bool {
-        uuid.is_nil()
-    }
-}

src/message/mod.rs

@@ -3,7 +3,7 @@ pub mod scheduling;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Message {
     pub id: uuid::Uuid,
     pub content: String,

src/message/scheduling/mod.rs

@@ -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,

src/token/mod.rs

@@ -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,

src/user/mod.rs

@@ -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,
@@ -14,11 +14,9 @@ pub struct User {
     pub created: Option<time::OffsetDateTime>,
     #[serde(with = "time::serde::rfc3339::option")]
     pub last_login: Option<time::OffsetDateTime>,
-    #[serde(skip)]
-    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,
@@ -28,11 +26,9 @@ pub struct ServiceUser {
     // 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(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 +36,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 +44,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 +52,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,
@@ -69,24 +65,6 @@ pub struct UserProfile {
     pub last_login: Option<time::OffsetDateTime>,
 }
 
-#[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,
-}
-
-impl Salt {
-    pub fn to_json(&self, output_pretty: bool) -> Result<String, serde_json::Error> {
-        if output_pretty {
-            serde_json::to_string_pretty(&self)
-        } else {
-            serde_json::to_string(&self)
-        }
-    }
-}
-
 pub fn init_user_profile(usr: &User) -> UserProfile {
     UserProfile {
         user_id: usr.id,