wireapp
diff --git a/‎changelog.d/1-api-changes/WPB-3611
-5 b/‎changelog.d/1-api-changes/WPB-3611
-5
diff --git a/‎changelog.d/1-api-changes/WPB-4668-disable-defederation
+1 b/‎changelog.d/1-api-changes/WPB-4668-disable-defederation
+1
diff --git a/‎changelog.d/3-bug-fixes/WPB-4629
+1 b/‎changelog.d/3-bug-fixes/WPB-4629
+1
diff --git a/‎changelog.d/3-bug-fixes/remote-member-removal-notification
+1 b/‎changelog.d/3-bug-fixes/remote-member-removal-notification
+1
diff --git a/‎changelog.d/4-docs/WPB-4240
+1 b/‎changelog.d/4-docs/WPB-4240
+1
diff --git a/‎changelog.d/5-internal/WPB-4240
+4 b/‎changelog.d/5-internal/WPB-4240
+4
diff --git a/‎changelog.d/6-federation/WPB-3611
-1 b/‎changelog.d/6-federation/WPB-3611
-1
diff --git a/‎charts/fake-aws-s3/requirements.yaml
+1-1 b/‎charts/fake-aws-s3/requirements.yaml
+1-1
diff --git a/‎charts/fake-aws-s3/values.yaml
+1-5 b/‎charts/fake-aws-s3/values.yaml
+1-5
diff --git a/‎deploy/dockerephemeral/docker-compose.yaml
+1-2 b/‎deploy/dockerephemeral/docker-compose.yaml
+1-2
diff --git a/‎docs/src/how-to/install/sft.md
+1-1 b/‎docs/src/how-to/install/sft.md
+1-1
diff --git a/‎docs/src/understand/configure-federation.md
+2-7 b/‎docs/src/understand/configure-federation.md
+2-7
diff --git a/‎integration/default.nix
+6 b/‎integration/default.nix
+6
diff --git a/‎integration/integration.cabal
+6-1 b/‎integration/integration.cabal
+6-1
diff --git a/‎integration/test/API/BrigInternal.hs
-19 b/‎integration/test/API/BrigInternal.hs
-19
diff --git a/‎integration/test/API/Galley.hs
+134-5 b/‎integration/test/API/Galley.hs
+134-5
diff --git a/‎integration/test/API/GalleyInternal.hs
-9 b/‎integration/test/API/GalleyInternal.hs
-9
@@ -0,0 +1 @@
+Remove de-federation (to avoid a scalability issue).
@@ -0,0 +1 @@
+Fixed add user to conversation when one of the other participating backends is offline
@@ -0,0 +1 @@
+This fixes a bug where a remote member is removed from a conversation while their backend is unreachable, and the backend does not receive the removal notification once it is reachable again.
@@ -0,0 +1 @@
+Updating the route documentation from Swagger 2 to OpenAPI 3.
@@ -0,0 +1,4 @@
+Updating the route documentation library from swagger2 to openapi3.
+
+This also introduced a breaking change in how we track what federation calls each route makes.
+The openapi3 library doesn't support extension fields, and as such tags are being used instead in a similar way.
@@ -1,4 +1,4 @@
 dependencies:
 - name: minio
-  version: 3.2.0
+  version: 5.0.13
   repository: https://charts.min.io/
@@ -1,9 +1,5 @@
-# See defaults in https://github.com/helm/charts/tree/master/stable/minio
+# See defaults in https://github.com/minio/minio/blob/RELEASE.2023-07-07T07-13-57Z/helm/minio/values.yaml
 minio:
-  mcImage:
-    repository: quay.io/minio/mc
-    tag: RELEASE.2021-10-07T04-19-58Z
-    pullPolicy: IfNotPresent
   fullnameOverride: fake-aws-s3
   service:
     port: "9000"
 
@@ -57,8 +57,7 @@ services:
 
   fake_s3:
     container_name: demo_wire_s3
-#    image: minio/minio:RELEASE.2018-05-25T19-49-13Z
-    image: julialongtin/minio:0.0.9
+    image: minio/minio:RELEASE.2023-07-07T07-13-57Z
     ports:
      - "127.0.0.1:4570:9000"
     environment:
 
@@ -18,7 +18,7 @@ tags:
 
 sftd:
   host: sftd.example.com # Replace example.com with your domain
-  allowOrigin: webapp.example.com # Should be the address you used for the webapp deployment
+  allowOrigin: https://webapp.example.com # Should be the address you used for the webapp deployment (Note: you must include the uri scheme "https://")
 ```
 
 In your `secrets.yaml` you should set the TLS keys for sftd domain:
 
@@ -457,13 +457,8 @@ the sysadmin:
 
 * [`PUT`](https://staging-nginz-https.zinfra.io/api-internal/swagger-ui/brig/#/brig/put_i_federation_remotes__domain_)
 
-* [`DELETE`](https://staging-nginz-https.zinfra.io/api-internal/swagger-ui/brig/#/brig/delete_i_federation_remotes__domain_)
-  - **WARNING:** If you delete a connection, all users from that
-   remote will be removed from local conversations, and all
-   conversations hosted by that remote will be removed from the local
-   backend.  Connections between local and remote users that are
-   removed will be archived, and can be re-established should you
-   decide to add the same backend later.
+* **NOTE:** De-federating (`DELETE`) has been removed from the API to
+   avoid a scalability issue.  Watch out for a fix in the changelog!
 
 The `remotes` list looks like this:
 
 
@@ -15,8 +15,11 @@
 , Cabal
 , case-insensitive
 , containers
+, cql
+, cql-io
 , cryptonite
 , data-default
+, data-timeout
 , directory
 , errors
 , exceptions
@@ -80,8 +83,11 @@ mkDerivation {
     bytestring-conversion
     case-insensitive
     containers
+    cql
+    cql-io
     cryptonite
     data-default
+    data-timeout
     directory
     errors
     exceptions
 
@@ -100,21 +100,23 @@ library
     Notifications
     RunAllTests
     SetupHelpers
+    Test.AccessUpdate
     Test.AssetDownload
     Test.B2B
     Test.Brig
     Test.Client
     Test.Conversation
-    Test.Defederation
     Test.Demo
     Test.Federation
     Test.Federator
+    Test.MessageTimer
     Test.MLS
     Test.MLS.KeyPackage
     Test.MLS.One2One
     Test.MLS.SubConversation
     Test.Notifications
     Test.Presence
+    Test.Roles
     Test.User
     Testlib.App
     Testlib.Assertions
@@ -147,8 +149,11 @@ library
     , bytestring-conversion
     , case-insensitive
     , containers
+    , cql
+    , cql-io
     , cryptonite
     , data-default
+    , data-timeout
     , directory
     , errors
     , exceptions
 
@@ -99,25 +99,6 @@ updateFedConn' owndom dom fedConn = do
   conn <- make fedConn
   submit "PUT" $ addJSON conn req
 
-deleteFedConn :: (HasCallStack, MakesValue owndom) => owndom -> String -> App Response
-deleteFedConn owndom dom = do
-  bindResponse (deleteFedConn' owndom dom) $ \res -> do
-    res.status `shouldMatchRange` (200, 299)
-    pure res
-
-deleteFedConn' :: (HasCallStack, MakesValue owndom) => owndom -> String -> App Response
-deleteFedConn' owndom dom = do
-  req <- rawBaseRequest owndom Brig Unversioned ("/i/federation/remotes/" <> dom)
-  submit "DELETE" req
-
-deleteAllFedConns :: (HasCallStack, MakesValue dom) => dom -> App ()
-deleteAllFedConns dom = do
-  readFedConns dom >>= \resp ->
-    resp.json %. "remotes"
-      & asList
-      >>= traverse (\v -> v %. "domain" & asString)
-      >>= mapM_ (deleteFedConn dom)
-
 registerOAuthClient :: (HasCallStack, MakesValue user, MakesValue name, MakesValue url) => user -> name -> url -> App Response
 registerOAuthClient user name url = do
   req <- baseRequest user Brig Unversioned "i/oauth/clients"
 
@@ -5,6 +5,7 @@ module API.Galley where
 import Control.Lens hiding ((.=))
 import Control.Monad.Reader
 import Data.Aeson qualified as Aeson
+import Data.Aeson.Types qualified as Aeson
 import Data.ByteString.Base64 qualified as B64
 import Data.ByteString.Base64.URL qualified as B64U
 import Data.ByteString.Char8 qualified as BS
@@ -83,6 +84,21 @@ postConversation user cc = do
   ccv <- make cc
   submit "POST" $ req & addJSON ccv
 
+deleteTeamConversation ::
+  ( HasCallStack,
+    MakesValue user,
+    MakesValue conv
+  ) =>
+  String ->
+  conv ->
+  user ->
+  App Response
+deleteTeamConversation tid qcnv user = do
+  cnv <- snd <$> objQid qcnv
+  let path = joinHttpPath ["teams", tid, "conversations", cnv]
+  req <- baseRequest user Galley Versioned path
+  submit "DELETE" req
+
 putConversationProtocol ::
   ( HasCallStack,
     MakesValue user,
@@ -296,12 +312,39 @@ getGroupClients user groupId = do
       (joinHttpPath ["i", "group", BS.unpack . B64U.encodeUnpadded . B64.decodeLenient $ BS.pack groupId])
   submit "GET" req
 
-addMembers :: (HasCallStack, MakesValue user, MakesValue conv) => user -> conv -> [Value] -> App Response
-addMembers usr qcnv newMembers = do
+data AddMembers = AddMembers
+  { users :: [Value],
+    role :: Maybe String,
+    version :: Maybe Int
+  }
+
+instance Default AddMembers where
+  def = AddMembers {users = [], role = Nothing, version = Nothing}
+
+addMembers ::
+  (HasCallStack, MakesValue user, MakesValue conv) =>
+  user ->
+  conv ->
+  AddMembers ->
+  App Response
+addMembers usr qcnv opts = do
   (convDomain, convId) <- objQid qcnv
-  qUsers <- mapM objQidObject newMembers
-  req <- baseRequest usr Galley Versioned (joinHttpPath ["conversations", convDomain, convId, "members"])
-  submit "POST" (req & addJSONObject ["qualified_users" .= qUsers])
+  qUsers <- mapM objQidObject opts.users
+  let path = case opts.version of
+        Just v | v <= 1 -> ["conversations", convId, "members", "v2"]
+        _ -> ["conversations", convDomain, convId, "members"]
+  req <-
+    baseRequest
+      usr
+      Galley
+      (maybe Versioned ExplicitVersion opts.version)
+      (joinHttpPath path)
+  submit "POST" $
+    req
+      & addJSONObject
+        ( ["qualified_users" .= qUsers]
+            <> ["conversation_role" .= r | r <- toList opts.role]
+        )
 
 removeMember :: (HasCallStack, MakesValue remover, MakesValue conv, MakesValue removed) => remover -> conv -> removed -> App Response
 removeMember remover qcnv removed = do
@@ -342,3 +385,89 @@ getConversationCode user conv mbZHost = do
         & addQueryParams [("cnv", convId)]
         & maybe id zHost mbZHost
     )
+
+changeConversationName ::
+  (HasCallStack, MakesValue user, MakesValue conv, MakesValue name) =>
+  user ->
+  conv ->
+  name ->
+  App Response
+changeConversationName user qcnv name = do
+  (convDomain, convId) <- objQid qcnv
+  let path = joinHttpPath ["conversations", convDomain, convId, "name"]
+  nameReq <- make name
+  req <- baseRequest user Galley Versioned path
+  submit "PUT" (req & addJSONObject ["name" .= nameReq])
+
+updateRole ::
+  ( HasCallStack,
+    MakesValue callerUser,
+    MakesValue targetUser,
+    MakesValue roleUpdate,
+    MakesValue qcnv
+  ) =>
+  callerUser ->
+  targetUser ->
+  roleUpdate ->
+  qcnv ->
+  App Response
+updateRole caller target role qcnv = do
+  (cnvDomain, cnvId) <- objQid qcnv
+  (tarDomain, tarId) <- objQid target
+  roleReq <- make role
+  req <-
+    baseRequest
+      caller
+      Galley
+      Versioned
+      ( joinHttpPath ["conversations", cnvDomain, cnvId, "members", tarDomain, tarId]
+      )
+  submit "PUT" (req & addJSONObject ["conversation_role" .= roleReq])
+
+updateReceiptMode ::
+  ( HasCallStack,
+    MakesValue user,
+    MakesValue conv,
+    MakesValue mode
+  ) =>
+  user ->
+  conv ->
+  mode ->
+  App Response
+updateReceiptMode user qcnv mode = do
+  (cnvDomain, cnvId) <- objQid qcnv
+  modeReq <- make mode
+  let path = joinHttpPath ["conversations", cnvDomain, cnvId, "receipt-mode"]
+  req <- baseRequest user Galley Versioned path
+  submit "PUT" (req & addJSONObject ["receipt_mode" .= modeReq])
+
+updateAccess ::
+  ( HasCallStack,
+    MakesValue user,
+    MakesValue conv
+  ) =>
+  user ->
+  conv ->
+  [Aeson.Pair] ->
+  App Response
+updateAccess user qcnv update = do
+  (cnvDomain, cnvId) <- objQid qcnv
+  let path = joinHttpPath ["conversations", cnvDomain, cnvId, "access"]
+  req <- baseRequest user Galley Versioned path
+  submit "PUT" (req & addJSONObject update)
+
+updateMessageTimer ::
+  ( HasCallStack,
+    MakesValue user,
+    MakesValue conv
+  ) =>
+  user ->
+  conv ->
+  Word64 ->
+  App Response
+updateMessageTimer user qcnv update = do
+  (cnvDomain, cnvId) <- objQid qcnv
+  updateReq <- make update
+  let path = joinHttpPath ["conversations", cnvDomain, cnvId, "message-timer"]
+  req <- baseRequest user Galley Versioned path
+  submit "PUT" (addJSONObject ["message_timer" .= updateReq] req)
@@ -51,12 +51,3 @@ getFederationStatus user domains =
         submit
           "GET"
           $ req & addJSONObject ["domains" .= domainList]
-
-deleteFederationDomain ::
-  ( HasCallStack
-  ) =>
-  String ->
-  App Response
-deleteFederationDomain domain = do
-  req <- rawBaseRequest OwnDomain Galley Unversioned $ joinHttpPath ["i", "federation", domain]
-  submit "DELETE" req
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Remove de-federation (to avoid a scalability issue).`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fixed add user to conversation when one of the other participating backends is offline`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+This fixes a bug where a remote member is removed from a conversation while their backend is unreachable, and the backend does not receive the removal notification once it is reachable again.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Updating the route documentation from Swagger 2 to OpenAPI 3.`