Merge branch 'master' into issue-339

Author: scott-fleischman

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Changes for next
+
+- Allow http-client-0.6
+
+- Change to use `cryptohash-sha1` (before `cryptohash`)
+
 ## Changes for 0.20
 
 - Add ratelimit endpoint

github.cabal

@@ -149,12 +149,11 @@ Library
     base-compat           >=0.10.4    && <0.11,
     base16-bytestring     >=0.1.1.6   && <0.2,
     binary-orphans        >=0.1.8.0   && <0.2,
-    byteable              >=0.1.1     && <0.2,
-    cryptohash            >=0.11.9    && <0.12,
+    cryptohash-sha1       >=0.11.100.1 && <0.12,
     deepseq-generics      >=0.2.0.0   && <0.3,
     exceptions            >=0.10.0    && <0.11,
     hashable              >=1.2.7.0   && <1.3,
-    http-client           >=0.5.12    && <0.6,
+    http-client           >=0.5.12    && <0.7,
     http-client-tls       >=0.3.5.3   && <0.4,
     http-link-header      >=1.0.3.1   && <1.1,
     http-types            >=0.12.1    && <0.13,
@@ -189,7 +188,7 @@ test-suite github-test
     GitHub.UsersSpec
   main-is: Spec.hs
   ghc-options: -Wall
-  build-tool-depends: hspec-discover:hspec-discover >=2.5.6 && <2.6
+  build-tool-depends: hspec-discover:hspec-discover >=2.6.1 && <2.7
   build-depends: base,
                  base-compat,
                  aeson,
@@ -198,4 +197,4 @@ test-suite github-test
                  vector,
                  unordered-containers,
                  file-embed,
-                 hspec >= 2.5.6 && <2.6
+                 hspec >= 2.6.1 && <2.7

src/GitHub.hs

@@ -156,6 +156,7 @@ module GitHub (
     -- * Edit an organization
     publicOrganizationsForR,
     publicOrganizationR,
+    organizationsR,
     -- ** Members
     -- | See <https://developer.github.com/v3/orgs/members/>
     --

src/GitHub/Data/Webhooks/Validate.hs

@@ -12,9 +12,8 @@ module GitHub.Data.Webhooks.Validate (
 import GitHub.Internal.Prelude
 import Prelude ()
 
-import Crypto.Hash     (HMAC, SHA1, hmac, hmacGetDigest)
-import Data.Byteable   (constEqBytes, toBytes)
-import Data.ByteString (ByteString)
+import Crypto.Hash.SHA1 (hmac)
+import Data.ByteString  (ByteString)
 
 import qualified Data.ByteString.Base16 as Hex
 import qualified Data.Text.Encoding     as TE
@@ -30,10 +29,9 @@ isValidPayload
                     -- including the 'sha1=...' prefix
   -> ByteString     -- ^ the body
   -> Bool
-isValidPayload secret shaOpt payload = maybe False (constEqBytes sign) shaOptBS
+isValidPayload secret shaOpt payload = maybe False (sign ==) shaOptBS
   where
     shaOptBS = TE.encodeUtf8 <$> shaOpt
-    hexDigest = Hex.encode . toBytes . hmacGetDigest
-
-    hm = hmac (TE.encodeUtf8 secret) payload :: HMAC SHA1
+    hexDigest = Hex.encode
+    hm = hmac (TE.encodeUtf8 secret) payload
     sign = "sha1=" <> hexDigest hm

src/GitHub/Endpoints/Organizations.hs

@@ -11,6 +11,7 @@ module GitHub.Endpoints.Organizations (
     publicOrganization,
     publicOrganization',
     publicOrganizationR,
+    organizationsR,
     module GitHub.Data,
     ) where
 
@@ -32,7 +33,12 @@ publicOrganizationsFor' auth org =
 publicOrganizationsFor :: Name User -> IO (Either Error (Vector SimpleOrganization))
 publicOrganizationsFor = publicOrganizationsFor' Nothing
 
--- | List user organizations.
+-- | List all user organizations.
+-- See <https://developer.github.com/v3/orgs/#list-your-organizations>
+organizationsR :: FetchCount -> Request k (Vector SimpleOrganization)
+organizationsR = pagedQuery ["user", "orgs"] []
+
+-- | List public user organizations.
 -- See <https://developer.github.com/v3/orgs/#list-user-organizations>
 publicOrganizationsForR :: Name User -> FetchCount -> Request k (Vector SimpleOrganization)
 publicOrganizationsForR user = pagedQuery ["users", toPathPart user, "orgs"] []