fix tests and impl

integration/test/Test/DomainVerification.hs

@@ -6,6 +6,7 @@ module Test.DomainVerification where
 import API.Brig
 import API.BrigInternal
 import API.Common
+import API.GalleyInternal (setTeamFeatureLockStatus, setTeamFeatureStatus)
 import SetupHelpers
 import Test.DNSMock
 import Testlib.Prelude
@@ -280,7 +281,12 @@ testDomainVerificationLockedState = do
 testDomainVerificationLockedStateTeam :: (HasCallStack) => App ()
 testDomainVerificationLockedStateTeam = do
   domain <- randomDomain
-  (owner, _tid, _m : _) <- createTeam OwnDomain 2
+  (owner, tid, _m : _) <- createTeam OwnDomain 2
+
+  -- set conference calling (paying team)
+  assertSuccess =<< do
+    setTeamFeatureLockStatus owner tid "conferenceCalling" "unlocked"
+    setTeamFeatureStatus owner tid "conferenceCalling" "enabled"
 
   -- [backoffice] lock the domain (public email provider)
   domainRegistrationLock OwnDomain domain >>= assertStatus 204
@@ -307,12 +313,17 @@ testDomainVerificationLockedStateTeam = do
 
 testUpdateTeamInvite :: (HasCallStack) => App ()
 testUpdateTeamInvite = do
-  (owner, _tid, _m : _) <- createTeam OwnDomain 2
+  (owner, tid, _m : _) <- createTeam OwnDomain 2
+
+  -- set conference calling (paying team)
+  assertSuccess =<< do
+    setTeamFeatureLockStatus owner tid "conferenceCalling" "unlocked"
+    setTeamFeatureStatus owner tid "conferenceCalling" "enabled"
 
   domain <- randomDomain
 
   -- [customer admin] fetch tokens
-  tokens <- domainVerificationToken OwnDomain domain Nothing >>= getJSON 200
+  tokens <- domainVerificationTeamToken owner domain >>= getJSON 200
   dnsToken <- tokens %. "dns_verification_token" & asString
 
   -- [customer admin] register TXT DNS record

libs/wire-subsystems/src/Wire/EnterpriseLoginSubsystem/Interpreter.hs

@@ -566,14 +566,11 @@ updateTeamInviteImpl luid domain config = do
 
 guardTeamAdminAccess ::
   forall r.
-  ( Member (Input Endpoint) r,
-    Member TinyLog r,
+  ( Member TinyLog r,
     Member (Error EnterpriseLoginSubsystemError) r,
-    Member (Error ParseException) r,
     Member UserSubsystem r,
     Member GalleyAPIAccess r,
-    Member DomainRegistrationStore r,
-    Member Rpc r
+    Member DomainRegistrationStore r
   ) =>
   Local UserId ->
   Domain ->
@@ -588,7 +585,6 @@ guardTeamAdminAccess luid domain = do
   unless (isAdminOrOwner (teamMember ^. permissions)) $
     throw EnterpriseLoginSubsystemAuthFailure
   mbDomainReg <- tryGetDomainRegistrationImpl domain
-  verifyDNSRecord domain (idToText tid)
   pure (tid, mbDomainReg)
   where
     validatePaymentStatus :: TeamId -> Sem r ()