From f923406f0e20bcc80259a8f80f8c8cbd18e11211 Mon Sep 17 00:00:00 2001
From: jprider63 <jp@jamesparker.me>
Date: Mon, 23 Mar 2015 11:24:44 -0400
Subject: [PATCH] removed dead code, use monoid instead of append, use <$>
 instead of fmap

---
 Yesod/Auth/OAuth2.hs        | 13 +++++++------
 Yesod/Auth/OAuth2/Github.hs |  9 ++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Yesod/Auth/OAuth2.hs b/Yesod/Auth/OAuth2.hs
index 0598e14..39012b6 100644
--- a/Yesod/Auth/OAuth2.hs
+++ b/Yesod/Auth/OAuth2.hs
@@ -14,11 +14,12 @@ module Yesod.Auth.OAuth2
     , module Network.OAuth.OAuth2
     ) where
 
+import Control.Applicative ((<$>))
 import Control.Exception.Lifted
 import Control.Monad.IO.Class
 import Data.ByteString (ByteString)
-import qualified Data.ByteString as BS
-import Data.Text (Text, append, pack)
+import Data.Monoid ((<>))
+import Data.Text (Text, pack)
 import Data.Text.Encoding (decodeUtf8With, encodeUtf8)
 import Data.Text.Encoding.Error (lenientDecode)
 import Data.Typeable
@@ -57,7 +58,7 @@ authOAuth2 name oauth getCreds = AuthPlugin name dispatch login
         withCallback csrfToken = do
             tm <- getRouteToParent
             render <- lift $ getUrlRender
-            let newEndpoint = oauthOAuthorizeEndpoint oauth `BS.append` "&state=" `BS.append` encodeUtf8 csrfToken
+            let newEndpoint = oauthOAuthorizeEndpoint oauth <> "&state=" <> encodeUtf8 csrfToken
             return $ oauth { 
                     oauthCallback = Just $ encodeUtf8 $ render $ tm url, 
                     oauthOAuthorizeEndpoint = newEndpoint
@@ -66,7 +67,7 @@ authOAuth2 name oauth getCreds = AuthPlugin name dispatch login
         dispatch "GET" ["forward"] = do
             csrfToken <- liftIO $ generateToken
             setSession tokenSessionKey csrfToken
-            authUrl <- fmap (bsToText . authorizationUrl) $ withCallback csrfToken
+            authUrl <- (bsToText . authorizationUrl) <$> withCallback csrfToken
             lift $ redirect authUrl
 
         dispatch "GET" ["callback"] = do
@@ -89,10 +90,10 @@ authOAuth2 name oauth getCreds = AuthPlugin name dispatch login
 
         dispatch _ _ = notFound
 
-        generateToken = fmap (pack . take 30 . randomRs ('a','z')) newStdGen
+        generateToken = (pack . take 30 . randomRs ('a','z')) <$> newStdGen
 
         tokenSessionKey :: Text
-        tokenSessionKey = "_yesod_oauth2_" `append` name
+        tokenSessionKey = "_yesod_oauth2_" <> name
 
         login tm = do
             render <- getUrlRender
diff --git a/Yesod/Auth/OAuth2/Github.hs b/Yesod/Auth/OAuth2/Github.hs
index 7a50055..4d759f2 100644
--- a/Yesod/Auth/OAuth2/Github.hs
+++ b/Yesod/Auth/OAuth2/Github.hs
@@ -18,16 +18,11 @@ import Control.Exception.Lifted
 import Control.Monad (mzero)
 import Data.Aeson
 import Data.Text (Text)
--- import Data.Monoid (mappend)
+import Data.Monoid ((<>))
 import Data.Text.Encoding (encodeUtf8, decodeUtf8)
 import Yesod.Auth
 import Yesod.Auth.OAuth2
--- import Yesod.Core
--- import Yesod.Form
 import Network.HTTP.Conduit(Manager)
--- import Data.UUID (toString)
--- import Data.UUID.V4 (nextRandom)
--- import qualified Data.ByteString as BS
 import qualified Data.Text as T
 
 data GithubUser = GithubUser
@@ -72,7 +67,7 @@ oauth2GithubScoped clientId clientSecret scopes = authOAuth2 "github" oauth fetc
         oauth = OAuth2
                 { oauthClientId            = encodeUtf8 clientId
                 , oauthClientSecret        = encodeUtf8 clientSecret
-                , oauthOAuthorizeEndpoint  = encodeUtf8 $ "https://github.com/login/oauth/authorize?scope=" `T.append` T.intercalate "," scopes
+                , oauthOAuthorizeEndpoint  = encodeUtf8 $ "https://github.com/login/oauth/authorize?scope=" <> T.intercalate "," scopes
                 , oauthAccessTokenEndpoint = "https://github.com/login/oauth/access_token"
                 , oauthCallback            = Nothing
                 }