From 163a7e91c4e3e5bd8116b78038c4812edf4e5497 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 22 Jul 2024 19:48:54 -0400 Subject: [PATCH] make keeplocked client UUID optional It's not used, but it makes the protocol simpler if this parameter can always be sent. --- P2P/Http.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/P2P/Http.hs b/P2P/Http.hs index 638a81ed53..9919822f0a 100644 --- a/P2P/Http.hs +++ b/P2P/Http.hs @@ -872,7 +872,7 @@ clientLockContent clientenv (ProtocolVersion ver) k su cu bypass auth = type KeepLockedAPI = LockIDParam - :> CU Required + :> CU Optional :> BypassUUIDs :> IsSecure :> AuthHeader @@ -887,7 +887,7 @@ serveKeepLocked -> B64UUID ServerSide -> v -> LockID - -> B64UUID ClientSide + -> Maybe (B64UUID ClientSide) -> [B64UUID Bypass] -> IsSecure -> Maybe Auth @@ -923,7 +923,7 @@ clientKeepLocked clientKeepLocked clientenv (ProtocolVersion ver) lckid su cu bypass auth a = do keeplocked <- newEmptyTMVarIO tid <- async $ a keeplocked - let cli' = cli lckid cu bypass auth + let cli' = cli lckid (Just cu) bypass auth (Just connectionKeepAlive) (Just keepAlive) (S.fromStepT (unlocksender keeplocked)) withClientM cli' clientenv $ \case