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

src/common/di.rs

@@ -549,6 +549,7 @@ impl AppServiceFactory {
             device_auth_service: None,
             app_password_service: None,
             path_resolver: None,
+            webdav_lock_store: crate::infrastructure::services::webdav_lock_service::create_webdav_lock_store(),
         };
 
         // 9b. Wire admin settings service when auth is available
@@ -854,6 +855,8 @@ pub struct AppState {
         Option<Arc<crate::application::services::app_password_service::AppPasswordService>>,
     pub path_resolver:
         Option<Arc<crate::infrastructure::services::path_resolver_service::PathResolverService>>,
+    pub webdav_lock_store:
+        Arc<crate::infrastructure::services::webdav_lock_service::WebDavLockStore>,
 }
 
 // All AppState construction is done via struct literal in build_app_state().