endpoint and dummy handler for requesting a dns token for a team

wireapp · Jan 20, 2025 · 482c6aa · 482c6aa
1 parent f504d3f
commit 482c6aa
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/libs/wire-api/src/Wire/API/Routes/Public/Brig/DomainVerification.hs b/libs/wire-api/src/Wire/API/Routes/Public/Brig/DomainVerification.hs
@@ -27,6 +27,15 @@ type DomainVerificationAPI =
         :> "token"
         :> Post '[JSON] DomainVerificationTokenResponse
     )
+    :<|> Named
+           "domain-verification-token-team"
+           ( Summary "Get a DNS verification token"
+               :> ZLocalUser
+               :> "domain-verification"
+               :> Capture "domain" Domain
+               :> "team-token"
+               :> Post '[JSON] DomainVerificationTokenResponse
+           )
     :<|> Named
            "update-domain-redirect"
            ( Summary "Verify DNS record and save domain redirect configuration"
@@ -56,7 +65,7 @@ type DomainVerificationAPI =
            )
 
 data DomainVerificationTokenResponse = DomainVerificationTokenResponse
-  { authToken :: DomainVerificationAuthToken,
+  { authToken :: Maybe DomainVerificationAuthToken,
     dnsToken :: DomainVerificationToken
   }
   deriving (A.ToJSON, A.FromJSON, S.ToSchema) via (Schema DomainVerificationTokenResponse)
@@ -65,7 +74,7 @@ instance ToSchema DomainVerificationTokenResponse where
   schema =
     object "DomainVerificationTokenResponse" $
       DomainVerificationTokenResponse
-        <$> (.authToken) .= field "auth_token" schema
+        <$> (.authToken) .= maybe_ (optField "auth_token" schema)
         <*> (.dnsToken) .= field "dns_verification_token" schema
 
 data DomainRedirectConfig

diff --git a/libs/wire-subsystems/src/Wire/EnterpriseLoginSubsystem.hs b/libs/wire-subsystems/src/Wire/EnterpriseLoginSubsystem.hs
@@ -23,6 +23,10 @@ data EnterpriseLoginSubsystem m a where
     Maybe DomainVerificationAuthToken ->
     Domain ->
     EnterpriseLoginSubsystem m DomainVerificationTokenResponse
+  RequestDomainVerificationTeamToken ::
+    Local UserId ->
+    Domain ->
+    EnterpriseLoginSubsystem m DomainVerificationTokenResponse
   UpdateDomainRedirect ::
     DomainVerificationAuthToken ->
     Domain ->

diff --git a/libs/wire-subsystems/src/Wire/EnterpriseLoginSubsystem/Interpreter.hs b/libs/wire-subsystems/src/Wire/EnterpriseLoginSubsystem/Interpreter.hs
@@ -89,6 +89,9 @@ runEnterpriseLoginSubsystem = interpret $
     RequestDomainVerificationToken mAuthToken domain ->
       runInputSem (wireServerEnterpriseEndpoint <$> input) $
         requestDomainVerificationTokenImpl mAuthToken domain
+    RequestDomainVerificationTeamToken lusr domain ->
+      runInputSem (wireServerEnterpriseEndpoint <$> input) $
+        requestDomainVerificationTeamTokenImpl lusr domain
     UpdateDomainRedirect mAuthToken domain config ->
       runInputSem (wireServerEnterpriseEndpoint <$> input) $
         updateDomainRedirectImpl mAuthToken domain config
@@ -448,16 +451,17 @@ requestDomainVerificationTokenImpl ::
   Domain ->
   Sem r DomainVerificationTokenResponse
 requestDomainVerificationTokenImpl mAuthToken domain = do
-  authToken <- case mAuthToken of
-    Nothing -> generateAuthToken
-    Just token -> pure token
+  authToken <- maybe generateAuthToken pure mAuthToken
   dnsToken <- getDomainVerificationToken domain authToken
   pure
     DomainVerificationTokenResponse
-      { authToken,
-        dnsToken
+      { authToken = Just authToken,
+        dnsToken = dnsToken
       }
 
+requestDomainVerificationTeamTokenImpl :: Local UserId -> Domain -> Sem (Input Endpoint : r) DomainVerificationTokenResponse
+requestDomainVerificationTeamTokenImpl = todo
+
 updateDomainRedirectImpl ::
   ( Member (Error EnterpriseLoginSubsystemError) r,
     Member (Error ParseException) r,

diff --git a/services/brig/src/Brig/API/Public.hs b/services/brig/src/Brig/API/Public.hs
@@ -552,6 +552,7 @@ servantSitemap =
     domainVerificationAPI :: ServerT DomainVerificationAPI (Handler r)
     domainVerificationAPI =
       Named @"domain-verification-token" requestDomainVerificationToken
+        :<|> Named @"domain-verification-token-team" requestDomainVerificationTeamToken
         :<|> Named @"update-domain-redirect" updateDomainRedirect
         :<|> Named @"update-team-invite" updateTeamInvite
         :<|> Named @"get-domain-registration" getDomainRegistration
@@ -1519,6 +1520,15 @@ requestDomainVerificationToken ::
 requestDomainVerificationToken (fmap unBearer -> mAuthToken) domain =
   lift . liftSem $ EnterpriseLogin.requestDomainVerificationToken mAuthToken domain
 
+requestDomainVerificationTeamToken ::
+  forall r.
+  (_) =>
+  Local UserId ->
+  Domain ->
+  Handler r DomainVerificationTokenResponse
+requestDomainVerificationTeamToken lusr domain =
+  lift . liftSem $ EnterpriseLogin.requestDomainVerificationTeamToken lusr domain
+
 updateDomainRedirect ::
   (_) =>
   Bearer DomainVerificationAuthToken ->