From b73c71ffa578fc06d915a1c0a578d2c9ee2ee371 Mon Sep 17 00:00:00 2001
From: Jonni Liljamo <jonni@liljamo.com>
Date: Mon, 27 Feb 2023 14:16:02 +0200
Subject: [PATCH] chore(api): argon2 dep, uuid dep absolute fuckery

---
 Cargo.lock     | 37 ++++++++++++++++++++++++++++++++++---
 api/Cargo.toml | 11 +++++------
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 87c418c..fb9d504 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -353,6 +353,7 @@ name = "api"
 version = "0.1.0"
 dependencies = [
  "actix-web",
+ "argon2",
  "chrono",
  "diesel",
  "diesel_migrations",
@@ -361,7 +362,7 @@ dependencies = [
  "pretty_env_logger",
  "serde",
  "shared",
- "uuid 0.8.2",
+ "uuid 1.3.0",
 ]
 
 [[package]]
@@ -393,6 +394,17 @@ dependencies = [
  "x11rb",
 ]
 
+[[package]]
+name = "argon2"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db4ce4441f99dbd377ca8a8f57b698c44d0d6e712d8329b5040da5a64aa1ce73"
+dependencies = [
+ "base64ct",
+ "blake2",
+ "password-hash",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.5.2"
@@ -1459,6 +1471,15 @@ dependencies = [
  "wyz",
 ]
 
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest 0.10.6",
+]
+
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -2314,7 +2335,7 @@ dependencies = [
  "itoa",
  "pq-sys",
  "r2d2",
- "uuid 0.8.2",
+ "uuid 1.3.0",
 ]
 
 [[package]]
@@ -4459,6 +4480,17 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "password-hash"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.11"
@@ -6042,7 +6074,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
  "getrandom 0.2.8",
- "serde",
 ]
 
 [[package]]
diff --git a/api/Cargo.toml b/api/Cargo.toml
index 9ab2ac9..9eca0ba 100644
--- a/api/Cargo.toml
+++ b/api/Cargo.toml
@@ -18,6 +18,7 @@ pretty_env_logger = "0.4.0"
 diesel_migrations = "2.0.0"
 
 email_address = "0.2.4"
+argon2 = "0.4.1"
 
 [dependencies.serde]
 version = "1.0.152"
@@ -29,12 +30,6 @@ version = "0.4.23"
 default-features = false
 features = [ "alloc", "std", "serde" ]
 
-[dependencies.uuid]
-# this is the only version that works with diesel,
-# due to some issues with the Cargo resolver...
-version = "0.8.2"
-features = [ "std", "v4", "serde" ]
-
 [dependencies.actix-web]
 version = "4.3.0"
 default-features = false
@@ -44,3 +39,7 @@ features = ["macros", "compress-gzip"]
 version = "2.0.3"
 default-features = false
 features = ["with-deprecated", "32-column-tables", "postgres", "r2d2", "chrono", "uuid"]
+
+[dependencies.uuid]
+version = "1.3.0"
+features = [ "std", "v4", "serde" ]
-- 
2.44.1