use /login endpoint for /i/metrics test

Author: battermann

libs/wire-api/src/Wire/API/Routes/Public/Brig.hs

@@ -493,10 +493,6 @@ type AccountAPI =
                :> ReqBody '[JSON] PasswordReset
                :> MultiVerb 'POST '[JSON] '[RespondEmpty 200 "Password reset successful."] ()
            )
-    -- This endpoint is used to test /i/metrics, when this is servantified, please
-    -- make sure some other endpoint is used to test that routes defined in this
-    -- function are recorded and reported correctly in /i/metrics.
-    -- see test/integration/API/Metrics.hs
     :<|> Named
            "onboarding"
            ( Summary "Upload contacts and invoke matching."

services/brig/src/Brig/User/API/Auth.hs

@@ -110,6 +110,10 @@ routesPublic = do
     Doc.errorResponse passwordExists
     Doc.errorResponse' loginCodePending Doc.pendingLoginError
 
+  -- This endpoint is used to test /i/metrics, when this is servantified, please
+  -- make sure some other wai-route endpoint is used to test that routes defined in
+  -- this function ('Brig.API.Public.sitemap') are recorded and reported correctly in /i/metrics.
+  -- see test/integration/API/Metrics.hs
   post "/login" (continue loginH) $
     jsonRequest @Public.Login
       .&. def False (query "persist")

services/brig/test/integration/API/Metrics.hs

@@ -54,23 +54,23 @@ testMetricsEndpoint :: Brig -> Http ()
 testMetricsEndpoint brig = do
   let p1 = "/self"
       p2 uid = "/users/" <> uid <> "/clients"
-      p3 = "/onboarding/v3"
+      p3 = "/login"
   beforeSelf <- getCount "/self" "GET"
   beforeClients <- getCount "/users/:uid/clients" "GET"
-  beforeProperties <- getCount "/onboarding/v3" "POST"
-  uid <- userId <$> randomUser brig
+  beforeProperties <- getCount "/login" "POST"
+  (uid, Just email) <- (\u -> (userId u, userEmail u)) <$> randomUser brig
   uid' <- userId <$> randomUser brig
   _ <- get (brig . path p1 . zAuthAccess uid "conn" . expect2xx)
   _ <- get (brig . path (p2 $ toByteString' uid) . zAuthAccess uid "conn" . expect2xx)
   _ <- get (brig . path (p2 $ toByteString' uid') . zAuthAccess uid "conn" . expect2xx)
-  _ <- post (brig . path p3 . zAuthAccess uid "conn" . json 'x' . expect2xx)
-  _ <- post (brig . path p3 . zAuthAccess uid "conn" . json 'x' . expect2xx)
+  _ <- post (brig . path p3 . contentJson . queryItem "persist" "true" . json (defEmailLogin email) . expect2xx)
+  _ <- post (brig . path p3 . contentJson . queryItem "persist" "true" . json (defEmailLogin email) . expect2xx)
   countSelf <- getCount "/self" "GET"
   liftIO $ assertEqual "/self was called once" (beforeSelf + 1) countSelf
   countClients <- getCount "/users/:uid/clients" "GET"
   liftIO $ assertEqual "/users/:uid/clients was called twice" (beforeClients + 2) countClients
-  countProperties <- getCount "/onboarding/v3" "POST"
-  liftIO $ assertEqual "/onboarding/v3 was called twice" (beforeProperties + 2) countProperties
+  countProperties <- getCount "/login" "POST"
+  liftIO $ assertEqual "/login was called twice" (beforeProperties + 2) countProperties
   where
     getCount endpoint m = do
       rsp <- responseBody <$> get (brig . path "i/metrics")