[fix] duplicate MissingLegalholdConsentOldClients in galley API

wireapp · Jan 9, 2024 · 4410001 · 4410001
1 parent 4cc2a08
commit 4410001
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/libs/wire-api/src/Wire/API/Error/Brig.hs b/libs/wire-api/src/Wire/API/Error/Brig.hs
@@ -32,8 +32,8 @@ data BrigError
   | MalformedPrekeys
   | CodeAuthenticationFailed
   | CodeAuthenticationRequired
-  | MissingLegalholdConsentOldClients
   | MissingLegalholdConsent
+  | MissingLegalholdConsentOldClients
   | ConnectionLimitReached
   | UnknownClient
   | ClientNotFound

diff --git a/libs/wire-api/src/Wire/API/Error/Galley.hs b/libs/wire-api/src/Wire/API/Error/Galley.hs
@@ -124,6 +124,7 @@ data GalleyError
   | -- Legal hold Error
     -- FUTUREWORK: make LegalHoldError more static and documented
     MissingLegalholdConsent
+  | MissingLegalholdConsentOldClients
   | NoUserLegalHoldConsent
   | LegalHoldNotEnabled
   | LegalHoldDisableUnimplemented
@@ -298,6 +299,8 @@ type instance MapError 'LegalHoldServiceInvalidKey = 'StaticError 400 "legalhold
 
 type instance MapError 'MissingLegalholdConsent = 'StaticError 403 "missing-legalhold-consent" "Failed to connect to a user or to invite a user to a group because somebody is under legalhold and somebody else has not granted consent"
 
+type instance MapError 'MissingLegalholdConsentOldClients = 'StaticError 403 "missing-legalhold-consent-old-clients" "Failed to connect to a user or to invite a user to a group because somebody is under legalhold and somebody else has old clients that do not support legalhold's UI requirements"
+
 type instance MapError 'LegalHoldServiceNotRegistered = 'StaticError 400 "legalhold-not-registered" "legal hold service has not been registered for this team"
 
 type instance MapError 'LegalHoldServiceBadResponse = 'StaticError 400 "legalhold-status-bad" "legal hold service: invalid response"

diff --git a/libs/wire-api/src/Wire/API/Routes/Internal/Galley.hs b/libs/wire-api/src/Wire/API/Routes/Internal/Galley.hs
@@ -30,7 +30,6 @@ import Wire.API.ApplyMods
 import Wire.API.Conversation
 import Wire.API.Conversation.Role
 import Wire.API.Error
-import Wire.API.Error.Brig (BrigError (MissingLegalholdConsentOldClients))
 import Wire.API.Error.Galley
 import Wire.API.Event.Conversation
 import Wire.API.FederationStatus

diff --git a/libs/wire-api/src/Wire/API/Routes/Public/Galley/Messaging.hs b/libs/wire-api/src/Wire/API/Routes/Public/Galley/Messaging.hs
@@ -26,7 +26,6 @@ import Imports
 import Servant hiding (WithStatus)
 import Servant.OpenApi.Internal.Orphans ()
 import Wire.API.Error
-import Wire.API.Error.Brig (BrigError (MissingLegalholdConsentOldClients))
 import Wire.API.Error.Brig qualified as BrigError
 import Wire.API.Error.Galley
 import Wire.API.MakesFederatedCall