merge: resolve conflict in auth_factory.rs with origin/main

Keep custom Result type alias (replacing anyhow) from main while
preserving our removal of unused TokenServicePort import.

https://claude.ai/code/session_01EbAFEfyJNLRmJHmmYDX3Tt
This commit is contained in:
Claude
2026-03-03 15:42:28 +00:00
11 changed files with 323 additions and 51 deletions
+1 -2
View File
@@ -29,7 +29,6 @@ uuid = { version = "1.21.0", features = ["v4", "serde"] }
thiserror = "2.0.18"
mockall = { version = "0.14.0", optional = true }
sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio", "tls-rustls", "chrono", "uuid", "json"] }
anyhow = "1.0.102"
jsonwebtoken = { version = "10.3.0", features = ["rust_crypto"] }
argon2 = "0.5.3"
rand_core = { version = "0.6", features = ["std", "getrandom"] }
@@ -41,7 +40,7 @@ http-range-header = "0.4"
image = { version = "0.25", default-features = false, features = ["jpeg", "png", "gif", "webp"] }
md5 = "0.8.0"
sha2 = "0.10.9"
blake3 = "1.8.3"
blake3 = { version = "1.8.3", features = ["rayon"] }
hex = "0.4.3"
http-body-util = "0.1.3"
percent-encoding = "2.3"