diff --git a/Cargo.lock b/Cargo.lock index 3d990de4..b25d4e49 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1275,7 +1275,7 @@ dependencies = [ "http 0.2.9", "percent-encoding", "tracing", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -1909,7 +1909,7 @@ dependencies = [ "serde_bytes", "serde_json", "time", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -2814,7 +2814,7 @@ dependencies = [ "pq-sys", "r2d2", "time", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -2827,7 +2827,7 @@ dependencies = [ "env_logger", "log", "serde", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -4543,7 +4543,7 @@ dependencies = [ "mysql 24.0.0", "r2d2", "r2d2_mysql", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -5147,7 +5147,7 @@ dependencies = [ "trust-dns-proto", "trust-dns-resolver", "typed-builder", - "uuid 1.7.0", + "uuid 1.8.0", "webpki-roots 0.25.4", ] @@ -5179,7 +5179,7 @@ dependencies = [ "futures-util", "log", "sanitize-filename", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -5299,7 +5299,7 @@ dependencies = [ "subprocess", "thiserror", "time", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -6725,7 +6725,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -7448,7 +7448,7 @@ dependencies = [ "serde_json", "sparkpost", "time", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -8663,7 +8663,7 @@ dependencies = [ "pin-project", "tracing", "tracing-opentelemetry", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -8873,7 +8873,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "rand 0.8.5", "static_assertions", ] @@ -9137,9 +9137,9 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "atomic", "getrandom 0.2.12", diff --git a/Cargo.toml b/Cargo.toml index 0741578f..fa252ec2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,3 +115,4 @@ tokio-util = "0.7.4" tokio-stream = "0.1.1" tracing = "0.1.30" tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] } +uuid = { version = "1.6", features = ["v4", "v7", "serde"] } diff --git a/auth/simple-auth-server/Cargo.toml b/auth/simple-auth-server/Cargo.toml index f14d76cf..1edf6e1d 100644 --- a/auth/simple-auth-server/Cargo.toml +++ b/auth/simple-auth-server/Cargo.toml @@ -21,4 +21,4 @@ serde_json.workspace = true serde.workspace = true sparkpost = "0.5" time = "0.3" -uuid = { version = "1", features = ["v4", "serde"] } +uuid.workspace = true diff --git a/auth/simple-auth-server/src/register_handler.rs b/auth/simple-auth-server/src/register_handler.rs index bdcceae6..837211bd 100644 --- a/auth/simple-auth-server/src/register_handler.rs +++ b/auth/simple-auth-server/src/register_handler.rs @@ -1,6 +1,7 @@ use actix_web::{web, HttpResponse}; use diesel::prelude::*; use serde::Deserialize; +use uuid::Uuid; use crate::{ errors::ServiceError, @@ -40,7 +41,7 @@ fn query( let mut conn = pool.get().unwrap(); - let invitation_id = uuid::Uuid::parse_str(&invitation_id)?; + let invitation_id = invitation_id.parse::()?; invitations .filter(id.eq(invitation_id)) diff --git a/databases/diesel/Cargo.toml b/databases/diesel/Cargo.toml index eaaa681d..d9238400 100644 --- a/databases/diesel/Cargo.toml +++ b/databases/diesel/Cargo.toml @@ -5,9 +5,9 @@ edition = "2021" [dependencies] actix-web.workspace = true -diesel = { version = "2", features = ["sqlite", "r2d2"] } +diesel = { version = "2", features = ["sqlite", "r2d2", "uuid"] } dotenvy.workspace = true env_logger.workspace = true log.workspace = true serde = { version = "1.0", features = ["derive"] } -uuid = { version = "1", features = ["v4", "serde"] } +uuid.workspace = true diff --git a/forms/multipart/Cargo.toml b/forms/multipart/Cargo.toml index 3eb092c6..e5d37882 100644 --- a/forms/multipart/Cargo.toml +++ b/forms/multipart/Cargo.toml @@ -12,4 +12,4 @@ env_logger.workspace = true futures-util.workspace = true log.workspace = true sanitize-filename = "0.5" -uuid = { version = "1", features = ["v4"] } +uuid.workspace = true diff --git a/graphql/juniper-advanced/Cargo.toml b/graphql/juniper-advanced/Cargo.toml index 7b4e55bb..e24588bd 100644 --- a/graphql/juniper-advanced/Cargo.toml +++ b/graphql/juniper-advanced/Cargo.toml @@ -17,4 +17,4 @@ r2d2_mysql = "24" dotenvy.workspace = true env_logger.workspace = true log.workspace = true -uuid = { version = "1", features = ["v4", "serde"] } +uuid.workspace = true