Merge pull request #183 from input-output-hk/KtorZ/api-any-content-type

replace 'OctetStream' content-type in API with a 'Any' for response without content

src/Cardano/Wallet/Api.hs

@@ -23,12 +23,13 @@ import Servant.API
     , Get
     , JSON
     , NoContent
-    , OctetStream
     , PostAccepted
     , Put
     , QueryParam
     , ReqBody
     )
+import Servant.Extra.ContentTypes
+    ( Any )
 
 type Api = Addresses :<|> Wallets :<|> Transactions
 
@@ -64,7 +65,7 @@ type Wallets =
 -- | https://input-output-hk.github.io/cardano-wallet/api/#operation/deleteWallet
 type DeleteWallet = "wallets"
     :> Capture "walletId" (ApiT WalletId)
-    :> DeleteNoContent '[OctetStream] NoContent
+    :> DeleteNoContent '[Any] NoContent
 
 -- | https://input-output-hk.github.io/cardano-wallet/api/#operation/getWallet
 type GetWallet = "wallets"
@@ -91,7 +92,7 @@ type PutWalletPassphrase = "wallets"
     :> Capture "walletId" (ApiT WalletId)
     :> "passphrase"
     :> ReqBody '[JSON] WalletPutPassphraseData
-    :> Put '[OctetStream] NoContent
+    :> Put '[Any] NoContent
 
 {-------------------------------------------------------------------------------
                                   Transactions

src/Servant/Extra/ContentTypes.hs

@@ -12,8 +12,11 @@ module Servant.Extra.ContentTypes
     , Hash (..)
     , Packed
     , WithHash (..)
+    , Any
     ) where
 
+import Prelude
+
 import Cardano.Wallet.Binary.Packfile
     ( decodePackfile )
 import Crypto.Hash
@@ -22,13 +25,14 @@ import Crypto.Hash.IO
     ( HashAlgorithm (..) )
 import Data.ByteArray.Encoding
     ( Base (Base16), convertToBase )
+import Data.List.NonEmpty
+    ( NonEmpty (..) )
 import Data.Proxy
     ( Proxy (..) )
 import Data.Text.Encoding
     ( decodeUtf8 )
 import Network.HTTP.Media
-    ( (//) )
-import Prelude
+    ( (//), (/:) )
 import Servant.API
     ( Accept (..), MimeUnrender (..), ToHttpApiData (..) )
 
@@ -95,3 +99,13 @@ instance forall a b . MimeUnrender a b => MimeUnrender (Packed a) [b] where
         (Left . show)
         (traverse $ mimeUnrender (Proxy :: Proxy a) . BL.fromStrict)
         (decodePackfile bs)
+
+-- | Any media type
+data Any
+
+instance Accept Any where
+    contentTypes _ = ("*" // "*") :|
+        -- We also 'conveniently' accept JSON format
+        [ "application" // "json"
+        , "application" // "json" /: ("charset", "utf-8")
+        ]