add Wreq and Lens libraries

2 files changed, 20 insertions, 18 deletions

diff --git a/acme-encrypt.cabal b/acme-encrypt.cabal
index 0faf99b..824b09d 100644
--- a/acme-encrypt.cabal
+++ b/acme-encrypt.cabal
@@ -21,7 +21,9 @@ executable acme-encrypt-exe
   -- hs-source-dirs:      app
   main-is:             acme.hs
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall
-  build-depends:       base, cryptonite, aeson, bytestring, base64-bytestring, SHA, text, HsOpenSSL, process
+  build-depends:       base,
+                       cryptonite, aeson, bytestring, base64-bytestring, SHA,
+                       text, HsOpenSSL, process, wreq, lens
                      -- , acme-encrypt
   default-language:    Haskell2010
 
diff --git a/acme.hs b/acme.hs
index 737968f..2f8138c 100644
--- a/acme.hs
+++ b/acme.hs
@@ -21,22 +21,10 @@ import OpenSSL.EVP.PKey
 import OpenSSL.PEM (readPublicKey)
 import OpenSSL.RSA
 import System.Process (readProcess)
+import Network.Wreq hiding (header)
+import Control.Lens hiding ((.=))
 
 
---------------------------------------------------------------------------------
-email :: String
-email = "noteed@gmail.com"
-
-domain :: String
-domain = "aaa.reesd.com"
-
-nonce_ :: String
-nonce_ = "ckYlMQ7BflfUb7HmxipdSpnkFle83-8lUkn50U-X97Q"
-
-terms :: String
-terms = "https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf"
-
---------------------------------------------------------------------------------
 main :: IO ()
 main = do
   userKey_ <- readFile "user.pub" >>= readPublicKey
@@ -46,7 +34,7 @@ main = do
       let protected = b64 (header userKey nonce_)
 
       -- Create user account
-      signPayload "registration" userKey protected (registration email)
+      signPayload "registration" userKey protected (registration email terms)
 
       -- Obtain a challenge
       signPayload "challenge-request" userKey protected (authz domain)
@@ -70,6 +58,18 @@ main = do
       csr_ <- B.readFile (domain ++ ".csr.der")
       signPayload "csr-request" userKey protected (csr csr_)
 
+  where
+    email :: String
+    email = "noteed@gmail.com"
+
+    domain :: String
+    domain = "aaa.reesd.com"
+
+    nonce_ :: String
+    nonce_ = "ckYlMQ7BflfUb7HmxipdSpnkFle83-8lUkn50U-X97Q"
+
+    terms :: String
+    terms = "https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf"
 
 --------------------------------------------------------------------------------
 -- | Sign and write a payload to a file with a nonce-protected header.
@@ -127,8 +127,8 @@ header key nonce = (toStrict . encode)
   (Header "RS256" (JWK (rsaE key) "RSA" (rsaN key)) (Just nonce))
 
 -- | Registration payload to sign with user key.
-registration :: String -> ByteString
-registration emailAddr = (b64 . toStrict . encode) (Reg emailAddr terms)
+registration :: String -> String -> ByteString
+registration emailAddr terms = (b64 . toStrict . encode) (Reg emailAddr terms)
 
 -- | Challenge request payload to sign with user key.
 authz :: String -> ByteString