Type ordinary integration probe HTTP traffic

test/Nuthatch/Probe/ProductClient.hs

@@ -2,10 +2,8 @@ module Nuthatch.Probe.ProductClient
   ( browse
   , deleteObject
   , download
-  , downloadFrom
   , sha256Hex
   , upload
-  , uploadTo
   ) where
 
 import           Crypto.Hash (Digest, SHA256, hash)
@@ -16,49 +14,39 @@ import qualified Data.ByteString.Char8 as B8
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text
 import           Network.HTTP.Types.URI (urlEncode)
-import           Nuthatch.Probe.Curl
+import           Nuthatch.Probe.Http
 import           Nuthatch.Probe.Oidc
-import           System.IO.Temp (withSystemTempFile)
-import           System.IO (hClose)
 
 browse
   :: ProbeContext
   -> Session
   -> String
-  -> IO CurlResponse
+  -> IO ProbeResponse
 browse context session query =
-  curl
-    [ "--cookie", sessionCookies session
-    , "--header", "Accept: application/json"
-    , probeBase context <> "/api/browse" <> query
-    ]
+  getWith
+    (probeClient context)
+    defaultRequestOptions
+      { optionCookies = Just (sessionCookies session)
+      , optionHeaders = [("Accept", "application/json")]
+      }
+    (probeBase context <> "/api/browse" <> query)
 
 download
   :: ProbeContext
   -> Session
   -> String
   -> String
-  -> IO CurlResponse
-download context =
-  downloadFrom (probeBase context) []
-
-downloadFrom
-  :: String
-  -> [String]
-  -> Session
-  -> String
-  -> String
-  -> IO CurlResponse
-downloadFrom base extra session root path =
-  curl
-    ( extra
-    <> [ "--cookie", sessionCookies session
-       , base
-         <> "/api/download?root="
-         <> encode root
-         <> "&path="
-         <> encode path
-       ]
+  -> IO ProbeResponse
+download context session root path =
+  getWith
+    (probeClient context)
+    defaultRequestOptions
+      { optionCookies = Just (sessionCookies session) }
+    ( probeBase context
+    <> "/api/download?root="
+    <> encode root
+    <> "&path="
+    <> encode path
     )
 
 upload
@@ -68,41 +56,28 @@ upload
   -> String
   -> String
   -> BS.ByteString
-  -> IO CurlResponse
-upload context =
-  uploadTo (probeBase context) []
-
-uploadTo
-  :: String
-  -> [String]
-  -> Session
-  -> String
-  -> String
-  -> String
-  -> BS.ByteString
-  -> IO CurlResponse
-uploadTo base extra session root path operationId body =
-  withSystemTempFile "nuthatch-upload" $ \bodyPath handle -> do
-    BS.hPut handle body
-    hClose handle
-    curl
-      ( extra
-      <> [ "--cookie", sessionCookies session
-         , "--header", "Content-Type: application/octet-stream"
-         , "--header", "X-Declared-Size: " <> show (BS.length body)
-         , "--header", "X-Content-SHA256: " <> B8.unpack (sha256Hex body)
-         , "--header"
-         , "X-CSRF-Token: " <> B8.unpack (sessionCsrf session)
-         , "--data-binary", "@" <> bodyPath
-         , base
-           <> "/api/upload?root="
-           <> encode root
-           <> "&path="
-           <> encode path
-           <> "&operation_id="
-           <> encode operationId
-         ]
-      )
+  -> IO ProbeResponse
+upload context session root path operationId body =
+  postWith
+    (probeClient context)
+    defaultRequestOptions
+      { optionCookies = Just (sessionCookies session)
+      , optionHeaders =
+          [ ("Content-Type", "application/octet-stream")
+          , ("X-Declared-Size", B8.pack (show (BS.length body)))
+          , ("X-Content-SHA256", sha256Hex body)
+          , ("X-CSRF-Token", sessionCsrf session)
+          ]
+      , optionBody = ByteBody body
+      }
+    ( probeBase context
+    <> "/api/upload?root="
+    <> encode root
+    <> "&path="
+    <> encode path
+    <> "&operation_id="
+    <> encode operationId
+    )
 
 deleteObject
   :: ProbeContext
@@ -110,13 +85,15 @@ deleteObject
   -> String
   -> String
   -> String
-  -> IO CurlResponse
+  -> IO ProbeResponse
 deleteObject context session root path operationId =
-  curl
-    [ "--cookie", sessionCookies session
-    , "--header", "Content-Type: application/json"
-    , "--data"
-    , "{\"root\":\""
+  postWith
+    (probeClient context)
+    defaultRequestOptions
+      { optionCookies = Just (sessionCookies session)
+      , optionHeaders = [("Content-Type", "application/json")]
+      , optionBody = ByteBody . B8.pack $
+          "{\"root\":\""
       <> root
       <> "\",\"path\":\""
       <> path
@@ -125,8 +102,8 @@ deleteObject context session root path operationId =
       <> "\",\"csrf\":\""
       <> B8.unpack (sessionCsrf session)
       <> "\"}"
-    , probeBase context <> "/api/delete"
-    ]
+      }
+    (probeBase context <> "/api/delete")
 
 sha256Hex :: BS.ByteString -> BS.ByteString
 sha256Hex input =