fixup! fixup! move ClientCapability ClientSupportsConsumableNotificat…

…ions to APIv8
wireapp · Dec 4, 2024 · aea355b · aea355b
1 parent b18399e
commit aea355b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/integration/test/Test/Client.hs b/integration/test/Test/Client.hs
@@ -104,8 +104,8 @@ testUpdateClientWithConsumableNotificationsCapability = do
     resp.status `shouldMatchInt` 200
     resp.json %. "0.capabilities" `shouldMatch` [consumeCapability]
 
-testGetClientCapabilitiesV6 :: App ()
-testGetClientCapabilitiesV6 = do
+testGetClientCapabilitiesV7 :: App ()
+testGetClientCapabilitiesV7 = do
   let allCapabilities = ["legalhold-implicit-consent", "consumable-notifications"]
   alice <- randomUser OwnDomain def
   addClient alice def {acapabilities = Just allCapabilities} `bindResponse` \resp -> do
@@ -118,6 +118,6 @@ testGetClientCapabilitiesV6 = do
 
   -- In API v6 and below, the "capabilities" field is an enum, so having a new
   -- value for this enum is a breaking change.
-  withAPIVersion 6 $ getSelfClients alice `bindResponse` \resp -> do
+  withAPIVersion 7 $ getSelfClients alice `bindResponse` \resp -> do
     resp.status `shouldMatchInt` 200
     resp.json %. "0.capabilities.capabilities" `shouldMatchSet` ["legalhold-implicit-consent"]
diff --git a/libs/wire-api/src/Wire/API/User/Client.hs b/libs/wire-api/src/Wire/API/User/Client.hs
@@ -520,9 +520,17 @@ clientSchema mVersion =
       <*> clientLabel .= maybe_ (optField "label" schema)
       <*> clientCookie .= maybe_ (optField "cookie" schema)
       <*> clientModel .= maybe_ (optField "model" schema)
-      <*> clientCapabilities .= (fromMaybe mempty <$> optField "capabilities" (capabilitiesSchema mVersion))
+      <*> clientCapabilities .= (fromMaybe mempty <$> optField "capabilities" caps)
       <*> clientMLSPublicKeys .= mlsPublicKeysFieldSchema
       <*> clientLastActive .= maybe_ (optField "last_active" utcTimeSchema)
+  where
+    caps :: ValueSchema NamedSwaggerDoc ClientCapabilityList
+    caps = case mVersion of
+      -- broken capability serialisation for backwards compatibility
+      Just v
+        | v <= V7 ->
+            dimap Versioned unVersioned $ schema @(Versioned V7 ClientCapabilityList)
+      _ -> schema @ClientCapabilityList
 
 instance ToSchema Client where
   schema = clientSchema Nothing