Revert "Better use of EnterpriseLoginSubsystem interface."

This reverts commit 7d439e6.
wireapp · Jan 31, 2025 · 6faf9d0 · 6faf9d0
1 parent 7d439e6
commit 6faf9d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/libs/wire-subsystems/src/Wire/TeamInvitationSubsystem/Error.hs b/libs/wire-subsystems/src/Wire/TeamInvitationSubsystem/Error.hs
@@ -13,6 +13,7 @@ data TeamInvitationSubsystemError
   | TooManyTeamInvitations
   | TeamInvitationBlacklistedEmail
   | TeamInvitationEmailTaken
+  | TeamInvitationInvalidEmail
   | TeamInvitationNotAllowedForEmail
   deriving (Eq, Show)
 
@@ -26,4 +27,5 @@ teamInvitationErrorToHttpError =
     TooManyTeamInvitations -> errorToWai @E.TooManyTeamInvitations
     TeamInvitationBlacklistedEmail -> errorToWai @E.BlacklistedEmail
     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"
diff --git a/libs/wire-subsystems/src/Wire/TeamInvitationSubsystem/Interpreter.hs b/libs/wire-subsystems/src/Wire/TeamInvitationSubsystem/Interpreter.hs
@@ -272,7 +272,8 @@ guardEmailDomainRegistration ::
   EmailAddress ->
   Sem r ()
 guardEmailDomainRegistration invitationFlow tid email = do
-  mReg <- getDomainRegistrationByEmail email
+  domain <- mapError (const TeamInvitationInvalidEmail) $ fromEither $ emailDomain email
+  mReg <- getDomainRegistration domain
   for_ mReg $ \reg -> do
     -- Check if domain has certain restrictions
     case reg.domainRedirect of