move crypto module

crates/blend-web/Cargo.toml

@@ -8,18 +8,21 @@ license.workspace = true
 
 [dependencies]
 blend-config = { path = "../blend-config" }
-blend-crypto = { path = "../blend-crypto" }
 blend-feed = { path = "../blend-feed" }
 blend-db = { path = "../blend-db" }
 blend-worker = { path = "../blend-worker" }
+argon2 = { version = "0.5", features = ["std"] }
 axum = { version = "0.7", features = ["ws"] }
 axum-embed = "0.1"
 chrono = { workspace = true, features = ["serde"] }
 futures = "0.3"
 futures-util = "0.3"
+hmac = "0.12"
+jwt = "0.16"
 rust-embed = { workspace = true, features = ["interpolate-folder-path"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
+sha2 = "0.10"
 sqlx = { workspace = true, features = ["chrono"] }
 thiserror = { workspace = true }
 tokio = { workspace = true }

crates/blend-crypto/src/jwt.rs → crates/blend-web/src/crypto/jwt.rs

@@ -1,4 +1,4 @@
-use crate::error::{CryptoError, CryptoResult};
+use super::error::{CryptoError, CryptoResult};
 use chrono::{DateTime, Duration, Utc};
 use hmac::{Hmac, Mac};
 use jwt::{SignWithKey, VerifyWithKey};

crates/blend-web/src/crypto/mod.rs

@@ -0,0 +1,7 @@
+#![allow(dead_code)]
+
+mod error;
+pub(crate) mod jwt;
+pub(crate) mod password;
+
+pub use error::CryptoError as Error;

crates/blend-crypto/src/password.rs → crates/blend-web/src/crypto/password.rs

@@ -1,4 +1,4 @@
-use crate::error::CryptoResult;
+use super::error::CryptoResult;
 use argon2::{
     password_hash::{rand_core, SaltString},
     Argon2, PasswordHash, PasswordHasher, PasswordVerifier,

crates/blend-web/src/error.rs

@@ -30,19 +30,19 @@ pub enum WebError {
     ValidationErrorMap(#[from] validator::ValidationErrors),
 
     #[error(transparent)]
-    CryptoError(#[from] blend_crypto::Error),
+    WorkerJobSendError(#[from] tokio::sync::mpsc::error::SendError<blend_worker::Job>),
 
     #[error(transparent)]
-    DbError(#[from] blend_db::Error),
+    NotificationSendError(
+        #[from] tokio::sync::broadcast::error::SendError<blend_worker::Notification>,
+    ),
 
     #[error(transparent)]
-    FeedError(#[from] blend_feed::Error),
+    CryptoError(#[from] crate::crypto::Error),
 
     #[error(transparent)]
-    WorkerJobSendError(#[from] tokio::sync::mpsc::error::SendError<blend_worker::Job>),
+    DbError(#[from] blend_db::Error),
 
     #[error(transparent)]
-    NotificationSendError(
-        #[from] tokio::sync::broadcast::error::SendError<blend_worker::Notification>,
-    ),
+    FeedError(#[from] blend_feed::Error),
 }

crates/blend-web/src/lib.rs

@@ -10,6 +10,7 @@ use tower_http::{
 };
 
 mod context;
+mod crypto;
 mod error;
 mod middleware;
 mod response;

crates/blend-web/src/middleware/auth.rs

@@ -1,6 +1,6 @@
+use crate::crypto::jwt;
 use crate::{error::WebResult, router::JWT_COOKIE};
 use axum::{body::Body, extract::State, http::Request, middleware::Next, response::IntoResponse};
-use blend_crypto::jwt;
 use tower_cookies::Cookies;
 
 pub async fn middleware(

crates/blend-web/src/response.rs

@@ -1,10 +1,10 @@
 use super::error::WebError;
+use crate::crypto::Error as CryptoError;
 use axum::{
     http::StatusCode,
     response::{IntoResponse, Response},
     Json,
 };
-use blend_crypto::Error as CryptoError;
 use serde_json::{json, Value};
 
 impl IntoResponse for WebError {

package.json

@@ -31,7 +31,7 @@
     "solid-icons": "^1.1.0",
     "solid-js": "^1.8.17",
     "solid-transition-group": "^0.2.3",
-    "wretch": "^2.8.1"
+    "wretch": "^2.9.0"
   },
   "devDependencies": {
     "@biomejs/biome": "1.7.3",