Keep User-Agent header up to date

phadej · phadej · commit 787c8dbf749e · 2019-09-30T00:07:03.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
   [#399](https://github.com/phadej/github/pull/399)
 - Make File.fileSha optional
   [#392](https://github.com/phadej/github/pull/392)
+- Update User-Agent to contain up to date version
+  [#403](https://github.com/phadej/github/pull/403)
+  [#394](https://github.com/phadej/github/pull/394)
 
 ## Changes for 0.22
 
diff --git a/github.cabal b/github.cabal
@@ -154,6 +154,8 @@ library
     GitHub.Internal.Prelude
     GitHub.Request
 
+  other-modules: Paths_github
+
   -- Packages bundles with GHC, mtl and text are also here
   build-depends:
       base          >=4.7      && <4.14
diff --git a/src/GitHub/Request.hs b/src/GitHub/Request.hs
@@ -68,7 +68,9 @@ import Control.Monad.Trans.Class  (lift)
 import Control.Monad.Trans.Except (ExceptT (..), runExceptT)
 import Data.Aeson                 (eitherDecode)
 import Data.List                  (find)
+import Data.String                (fromString)
 import Data.Tagged                (Tagged (..))
+import Data.Version               (showVersion)
 
 import Network.HTTP.Client
        (HttpException (..), Manager, RequestBody (..), Response (..), getUri,
@@ -88,11 +90,11 @@ import qualified Network.HTTP.Client          as HTTP
 import qualified Network.HTTP.Client.Internal as HTTP
 
 #ifdef MIN_VERSION_http_client_tls
-import Network.HTTP.Client.TLS  (tlsManagerSettings)
+import Network.HTTP.Client.TLS (tlsManagerSettings)
 #else
 import Network.HTTP.Client.OpenSSL (opensslManagerSettings, withOpenSSL)
 
-import qualified OpenSSL.Session as SSL
+import qualified OpenSSL.Session          as SSL
 import qualified OpenSSL.X509.SystemStore as SSL
 #endif
 
@@ -101,6 +103,8 @@ import GitHub.Data              (Error (..))
 import GitHub.Data.PullRequests (MergeResult (..))
 import GitHub.Data.Request
 
+import Paths_github (version)
+
 #ifdef MIN_VERSION_http_client_tls
 withOpenSSL :: IO a -> IO a
 withOpenSSL = id
@@ -418,7 +422,7 @@ makeHttpRequest auth r = case r of
     setMethod m req = req { method = m }
 
     reqHeaders :: RequestHeaders
-    reqHeaders = [("User-Agent", "github.hs/0.21")] -- Version
+    reqHeaders = [("User-Agent", "github.hs/" <> fromString (showVersion version))] -- Version
         <> [("Accept", unTagged (contentType :: Tagged mt BS.ByteString))]
 
     setBody :: LBS.ByteString -> HTTP.Request -> HTTP.Request
