Unpack constructor before passing to signing function

Author: Juan Pablo Santos

Network/Wreq/Internal.hs

@@ -118,7 +118,7 @@ prepare modify opts url = do
     signRequest = maybe return f $ auth opts
       where
         f (AWSAuth versn key secret) = AWS.signRequest versn key secret
-        f oauth1Credentials@(OAuth1 _ _ _ _) = OAuth1.signRequest oauth1Credentials
+        f (OAuth1 consumerToken consumerSecret token secret) = OAuth1.signRequest consumerToken consumerSecret token secret
         f _ = return
 
 

Network/Wreq/Internal/OAuth1.hs

@@ -1,17 +1,12 @@
-module Network.Wreq.Internal.OAuth1
-  (
-   signRequest
-  ) where
+module Network.Wreq.Internal.OAuth1 (signRequest) where
 
 import Network.HTTP.Client (Request(..))
-import Network.Wreq.Internal.Types (Auth(..))
 import Web.Authenticate.OAuth ( signOAuth, newOAuth, oauthConsumerKey
                               , oauthConsumerSecret, newCredential)
+import qualified Data.ByteString as S
 
-signRequest :: Auth -> Request -> IO Request
-signRequest (OAuth1 consumerToken consumerSecret token tokenSecret) requestToSign = signOAuth app creds requestToSign
+signRequest :: S.ByteString -> S.ByteString -> S.ByteString -> S.ByteString -> Request -> IO Request
+signRequest consumerToken consumerSecret token tokenSecret = signOAuth app creds
   where
     app = newOAuth { oauthConsumerKey = consumerToken, oauthConsumerSecret = consumerSecret }
     creds = newCredential token tokenSecret
-
-signRequest _ requestToSign = return requestToSign

Network/Wreq/Internal/Types.hs

@@ -178,6 +178,8 @@ data Auth = BasicAuth S.ByteString S.ByteString
             -- ^ Amazon Web Services request signing
             -- AWSAuthVersion key secret
           | OAuth1 S.ByteString S.ByteString S.ByteString S.ByteString
+            -- ^ OAuth1 request signing
+            -- OAuth1 consumerToken consumerSecret token secret
           deriving (Eq, Show, Typeable)
 
 data AWSAuthVersion = AWSv4

wreq.cabal

@@ -80,9 +80,9 @@ library
   other-modules:
     Network.Wreq.Internal
     Network.Wreq.Internal.AWS
-    Network.Wreq.Internal.OAuth1
     Network.Wreq.Internal.Lens
     Network.Wreq.Internal.Link
+    Network.Wreq.Internal.OAuth1
     Network.Wreq.Internal.Types
     Network.Wreq.Lens.Machinery
     Network.Wreq.Lens.TH