Revert "Disallow email change to blocked domain (#4624)" (#4745)

This reverts commit b480a34.

This is because https://wearezeta.atlassian.net/browse/WPB-19643 should be released now. Otherwise, we'd need some configuration changes to the cloud that aren't done, yet.

Author: supersven

changelog.d/1-api-changes/no-email-change-to-blocked-domains

@@ -112,7 +112,6 @@ library
     Test.AssetUpload
     Test.Auth
     Test.B2B
-    Test.BlockedDomains
     Test.Bot
     Test.Brig
     Test.Cargohold.API

hls.json

@@ -422,21 +422,12 @@ putSelfLocale caller locale = do
 --
 -- NOTE: the full process of changing (and confirming) the email address is more complicated.
 -- see /services/brig/test/integration for details.
-putUserEmail :: (HasCallStack, MakesValue caller, MakesValue target) => caller -> target -> String -> App Response
-putUserEmail caller target emailAddress = do
-  uid <- asString $ target %. "id"
-  req <- baseRequest caller Brig Versioned $ joinHttpPath ["users", uid, "email"]
+putSelfEmail :: (HasCallStack, MakesValue caller) => caller -> String -> App Response
+putSelfEmail caller emailAddress = do
+  callerid <- asString $ caller %. "id"
+  req <- baseRequest caller Brig Versioned $ joinHttpPath ["users", callerid, "email"]
   submit "PUT" $ req & addJSONObject ["email" .= emailAddress]
 
-putSelfEmail :: (HasCallStack, MakesValue user) => user -> String -> String -> String -> App Response
-putSelfEmail user cookie token emailAddress = do
-  req <- baseRequest user Brig Versioned "/access/self/email"
-  submit "PUT" $
-    req
-      & setCookie cookie
-      & addHeader "Authorization" ("Bearer " <> token)
-      & addJSONObject ["email" .= emailAddress]
-
 -- | https://staging-nginz-https.zinfra.io/v6/api/swagger-ui/#/default/delete_self_email
 deleteSelfEmail :: (HasCallStack, MakesValue caller) => caller -> App Response
 deleteSelfEmail caller = do
@@ -891,11 +882,6 @@ activate domain key code = do
     req
       & addQueryParams [("key", key), ("code", code)]
 
-activateSend :: (HasCallStack, MakesValue domain) => domain -> String -> Maybe String -> App Response
-activateSend domain email locale = do
-  req <- rawBaseRequest domain Brig Versioned $ joinHttpPath ["activate", "send"]
-  submit "POST" $ req & addJSONObject (["email" .= email] <> maybeToList (((.=) "locale") <$> locale))
-
 acceptTeamInvitation :: (HasCallStack, MakesValue user) => user -> String -> Maybe String -> App Response
 acceptTeamInvitation user code mPw = do
   req <- baseRequest user Brig Versioned $ joinHttpPath ["teams", "invitations", "accept"]

integration/integration.cabal

@@ -169,7 +169,7 @@ testUpdateSelf (MkTagged mode) = do
       -- allowed unconditionally *for owner* (this is a bit off-topic: team members can't
       -- change their email addresses themselves under any conditions)
       someEmail <- (<> "@example.com") . UUID.toString <$> liftIO UUID.nextRandom
-      bindResponse (putUserEmail owner owner someEmail) $ \resp -> do
+      bindResponse (putSelfEmail owner someEmail) $ \resp -> do
         resp.status `shouldMatchInt` 200
     TestUpdateLocale -> do
       -- scim maps "User.preferredLanguage" to brig's locale field.  allowed unconditionally.

integration/test/API/Brig.hs

@@ -32,7 +32,6 @@ import Data.ByteString qualified as BS
 import Data.ByteString.Builder qualified as Builder
 import Data.ByteString.Char8 qualified as BS.Char8
 import Data.ByteString.Conversion
-import Data.Hashable
 import Data.OpenApi qualified as S
 import Data.Schema
 import Data.Text qualified as Text
@@ -67,7 +66,6 @@ newtype Domain = Domain {_domainText :: Text}
   deriving stock (Eq, Ord, Generic, Show)
   deriving newtype (S.ToParamSchema, Binary)
   deriving (FromJSON, ToJSON, S.ToSchema) via Schema Domain
-  deriving (Hashable)
 
 instance ToSchema Domain where
   schema =

integration/test/Test/BlockedDomains.hs

@@ -293,7 +293,9 @@ type instance
     'StaticError
       451
       "domain-blocked-for-registration"
-      "[Customer extension] The email domain has been blocked for Wire users.  Please contact your IT department."
+      "[Customer extension] the email domain example.com \
+      \that you are attempting to register a user with has been \
+      \blocked for creating wire users.  Please contact your IT department."
 
 type instance MapError 'PasswordResetInProgress = 'StaticError 409 "code-exists" "A password reset is already in progress."
 

integration/test/Test/User.hs

@@ -15,7 +15,6 @@ data TeamInvitationSubsystemError
   | TeamInvitationEmailTaken
   | TeamInvitationInvalidEmail
   | TeamInvitationNotAllowedForEmail
-  | TeamInvitationBlockedDomain
   deriving (Eq, Show)
 
 instance Exception TeamInvitationSubsystemError
@@ -30,4 +29,3 @@ teamInvitationErrorToHttpError =
     TeamInvitationEmailTaken -> errorToWai @E.EmailExists
     TeamInvitationInvalidEmail -> errorToWai @E.InvalidEmail
     TeamInvitationNotAllowedForEmail -> Wai.mkError status403 "condition-failed" "Emails from this domain are not allowed to be invited to this team"
-    TeamInvitationBlockedDomain -> errorToWai @E.CustomerExtensionBlockedDomain