Block and kick users in case of LH no_consent conflict (1:1 convs).

libs/brig-types/brig-types.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: b653eba4d855ab6675efd3519d4259c9bb49379e92b15fb7f4f9080eac634bb1
+-- hash: 2b3c91a37e09e61ca32cf32ab80c46e8f019926c78165bec82d9c84a5b8d20a6
 
 name:           brig-types
 version:        1.35.0
@@ -89,6 +89,7 @@ test-suite brig-types-tests
     , attoparsec >=0.10
     , base ==4.*
     , brig-types
+    , bytestring-conversion >=0.3.1
     , containers >=0.5
     , imports
     , swagger2 >=2.5

libs/brig-types/package.yaml

@@ -12,6 +12,7 @@ dependencies:
 - aeson >=0.11
 - attoparsec >=0.10
 - base ==4.*
+- bytestring-conversion >=0.3.1
 - containers >=0.5
 - imports
 - QuickCheck >=2.9

libs/brig-types/src/Brig/Types/Connection.hs

@@ -26,6 +26,7 @@ module Brig.Types.Connection
   ( module C,
     UserIds (..),
     ConnectionsStatusRequest (..),
+    UpdateConnectionsInternal (..),
 
     -- * re-exports
     Message (..),
@@ -41,6 +42,7 @@ import Brig.Types.Common as C
 import Data.Aeson
 import Data.Id (UserId)
 import Imports
+import Wire.API.Arbitrary
 import Wire.API.Connection
 
 -- | Response type for endpoints returning lists of users with a specific connection state.
@@ -57,6 +59,17 @@ data ConnectionsStatusRequest = ConnectionsStatusRequest
   }
   deriving (Eq, Show, Generic)
 
+data UpdateConnectionsInternal
+  = BlockForMissingLHConsent UserId [UserId]
+  | RemoveLHBlocksInvolving UserId
+  deriving (Eq, Show, Generic)
+  deriving (Arbitrary) via (GenericUniform UpdateConnectionsInternal)
+
+instance FromJSON UpdateConnectionsInternal
+
+-- | `{"tag":"BlockForMissingLHConsent","contents":["3ae7f23a-bd47-11eb-932d-5fccbbcde454",["3ae7f23a-bd47-11eb-932d-5fccbbcde454"]]}`
+instance ToJSON UpdateConnectionsInternal
+
 ----------------------------------------------------------------------------
 -- JSON instances
 

libs/brig-types/test/unit/Test/Brig/Roundtrip.hs

@@ -19,6 +19,7 @@ module Test.Brig.Roundtrip where
 
 import Data.Aeson (FromJSON, ToJSON, parseJSON, toJSON)
 import Data.Aeson.Types (parseEither)
+import Data.ByteString.Conversion
 import Data.Swagger (ToSchema, validatePrettyToJSON)
 import Imports
 import Test.Tasty (TestTree)
@@ -55,3 +56,14 @@ testRoundTripWithSwagger = testProperty msg (trip .&&. scm)
             validatePrettyToJSON v
         )
         $ isNothing (validatePrettyToJSON v)
+
+testRoundTripByteString ::
+  forall a.
+  (Arbitrary a, Typeable a, ToByteString a, FromByteString a, Eq a, Show a) =>
+  TestTree
+testRoundTripByteString = testProperty msg trip
+  where
+    msg = show (typeRep @a)
+    trip (v :: a) =
+      counterexample (show $ toByteString' v) $
+        Just v === (fromByteString . toByteString') v

libs/brig-types/test/unit/Test/Brig/Types/User.hs

@@ -27,6 +27,7 @@
 
 module Test.Brig.Types.User where
 
+import Brig.Types.Connection (UpdateConnectionsInternal (..))
 import Brig.Types.Intra (NewUserScimInvitation (..), ReAuthUser (..))
 import Brig.Types.User (ManagedByUpdate (..), RichInfoUpdate (..))
 import Brig.Types.User.EJPD (EJPDRequestBody (..), EJPDResponseBody (..))
@@ -45,7 +46,8 @@ roundtripTests =
     testRoundTrip @RichInfoUpdate,
     testRoundTrip @NewUserScimInvitation,
     testRoundTripWithSwagger @EJPDRequestBody,
-    testRoundTripWithSwagger @EJPDResponseBody
+    testRoundTripWithSwagger @EJPDResponseBody,
+    testRoundTrip @UpdateConnectionsInternal
   ]
 
 instance Arbitrary ManagedByUpdate where

libs/wire-api/src/Wire/API/Connection.hs

@@ -51,7 +51,7 @@ import Data.Range
 import qualified Data.Swagger.Build.Api as Doc
 import Data.Swagger.Schema
 import Data.Text as Text
-import Deriving.Swagger (CamelToSnake, ConstructorTagModifier, CustomSwagger)
+import Deriving.Swagger (CamelToKebab, ConstructorTagModifier, CustomSwagger)
 import Imports
 import Wire.API.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
 
@@ -159,9 +159,11 @@ data Relation
   | Ignored
   | Sent
   | Cancelled
+  | -- | behaves like blocked, the extra constructor is just to inform why.
+    MissingLegalholdConsent
   deriving stock (Eq, Ord, Show, Generic)
   deriving (Arbitrary) via (GenericUniform Relation)
-  deriving (ToSchema) via (CustomSwagger '[ConstructorTagModifier CamelToSnake] Relation)
+  deriving (ToSchema) via (CustomSwagger '[ConstructorTagModifier CamelToKebab] Relation)
 
 typeRelation :: Doc.DataType
 typeRelation =
@@ -172,11 +174,19 @@ typeRelation =
         "pending",
         "ignored",
         "sent",
-        "cancelled"
+        "cancelled",
+        "missing-legalhold-consent"
       ]
 
 instance ToJSON Relation where
-  toJSON = String . Text.toLower . pack . show
+  toJSON = \case
+    Accepted -> "accepted"
+    Blocked -> "blocked"
+    Pending -> "pending"
+    Ignored -> "ignored"
+    Sent -> "sent"
+    Cancelled -> "cancelled"
+    MissingLegalholdConsent -> "missing-legalhold-consent"
 
 instance FromJSON Relation where
   parseJSON (String "accepted") = return Accepted
@@ -185,6 +195,7 @@ instance FromJSON Relation where
   parseJSON (String "ignored") = return Ignored
   parseJSON (String "sent") = return Sent
   parseJSON (String "cancelled") = return Cancelled
+  parseJSON (String "missing-legalhold-consent") = return MissingLegalholdConsent
   parseJSON _ = mzero
 
 instance FromByteString Relation where
@@ -196,8 +207,19 @@ instance FromByteString Relation where
       "ignored" -> return Ignored
       "sent" -> return Sent
       "cancelled" -> return Cancelled
+      "missing-legalhold-consent" -> return MissingLegalholdConsent
       x -> fail $ "Invalid relation-type " <> show x
 
+instance ToByteString Relation where
+  builder = \case
+    Accepted -> "accepted"
+    Blocked -> "blocked"
+    Pending -> "pending"
+    Ignored -> "ignored"
+    Sent -> "sent"
+    Cancelled -> "cancelled"
+    MissingLegalholdConsent -> "missing-legalhold-consent"
+
 --------------------------------------------------------------------------------
 -- Message
 

libs/wire-api/test/golden/testObject_Relation_user_20.json

@@ -1 +1 @@
-"ignored"
+"missing-legalhold-consent"

libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Relation_user.hs

@@ -79,4 +79,4 @@ testObject_Relation_user_19 :: Relation
 testObject_Relation_user_19 = Cancelled
 
 testObject_Relation_user_20 :: Relation
-testObject_Relation_user_20 = Ignored
+testObject_Relation_user_20 = MissingLegalholdConsent

libs/wire-api/test/unit/Test/Wire/API/Roundtrip/ByteString.hs

@@ -26,6 +26,7 @@ import qualified Wire.API.Arbitrary as Arbitrary ()
 import qualified Wire.API.Asset.V3 as Asset.V3
 import qualified Wire.API.Asset.V3.Resumable as Asset.V3.Resumable
 import qualified Wire.API.Call.Config as Call.Config
+import qualified Wire.API.Connection as Connection
 import qualified Wire.API.Conversation.Code as Conversation.Code
 import qualified Wire.API.Conversation.Role as Conversation.Role
 import qualified Wire.API.Properties as Properties
@@ -56,6 +57,7 @@ tests =
       testRoundTrip @Call.Config.Transport,
       testRoundTrip @Call.Config.TurnHost,
       testRoundTrip @Call.Config.TurnURI,
+      testRoundTrip @Connection.Relation,
       testRoundTrip @Conversation.Code.Key,
       testRoundTrip @Conversation.Code.Value,
       testRoundTrip @Conversation.Role.RoleName,