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
Generated
+1 -1
View File
@@ -278,6 +278,7 @@ dependencies = [
"cfg-if",
"constant_time_eq",
"cpufeatures",
"rayon-core",
]
[[package]]
@@ -1804,7 +1805,6 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
name = "oxicloud"
version = "0.5.0"
dependencies = [
"anyhow",
"argon2",
"async-compression",
"async-stream",