From d35de4ca0af036791b002e8662cfc6a661595653 Mon Sep 17 00:00:00 2001 From: J3vb <192430104+J3vb@users.noreply.github.com> Date: Fri, 24 Jul 2026 11:29:21 +0200 Subject: [PATCH] fix: integrate logging hardening with rebased main (F3 + tauri plugins) Rebasing onto post-F3 main surfaced two spots the auto-merge left inconsistent: - profile_handler UpdateIdentityKey path: thread ctx into the writeServiceError call (the signature gained a context param in the server logging change) - identity-pin store lookup: drop a needless borrow flagged by clippy Co-Authored-By: Claude Opus 4.8 (1M context) --- Client/tauri-client/src-tauri/src/commands.rs | 2 +- Server/api/profile_handler.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Client/tauri-client/src-tauri/src/commands.rs b/Client/tauri-client/src-tauri/src/commands.rs index 5ae07de2..0c876d92 100644 --- a/Client/tauri-client/src-tauri/src/commands.rs +++ b/Client/tauri-client/src-tauri/src/commands.rs @@ -241,7 +241,7 @@ pub fn get_identity_pin( .store(IDENTITY_PINS_STORE) .map_err(|e| format!("failed to open identity pins store: {e}"))?; - let value = store.get(&identity_pin_key(&host, &user_id)).and_then(|v| { + let value = store.get(identity_pin_key(&host, &user_id)).and_then(|v| { if let Value::String(s) = v { Some(s) } else { diff --git a/Server/api/profile_handler.go b/Server/api/profile_handler.go index 56c09481..50aee3ab 100644 --- a/Server/api/profile_handler.go +++ b/Server/api/profile_handler.go @@ -178,7 +178,7 @@ func handleUpdateProfile(svc *service.Services, broadcaster ProfileBroadcaster) if req.IdentityPublicKey != nil { updated, err = svc.Users.UpdateIdentityKey(r.Context(), user.ID, *req.IdentityPublicKey) if err != nil { - writeServiceError(w, err) + writeServiceError(r.Context(), w, err) return } }