From e7c4b0a1cd6499544335b89e1466e33a82109ea3 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 29 Dec 2011 15:45:36 +0200
Subject: [PATCH] Fixed yesod-json, yesod-auth

---
 yesod-auth/Yesod/Auth.hs          | 3 +--
 yesod-auth/Yesod/Auth/Facebook.hs | 3 +--
 yesod-auth/Yesod/Auth/OAuth.hs    | 3 +--
 yesod-auth/Yesod/Auth/OpenId.hs   | 3 +--
 yesod-json/Yesod/Json.hs          | 5 ++---
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs
index 73178147..250558c4 100644
--- a/yesod-auth/Yesod/Auth.hs
+++ b/yesod-auth/Yesod/Auth.hs
@@ -26,7 +26,6 @@ module Yesod.Auth
 #include "qq.h"
 
 import Control.Monad                 (when)  
-import Control.Monad.Trans.Class     (lift)
 import Control.Monad.Trans.Maybe
 
 import Data.Aeson
@@ -92,7 +91,7 @@ class (Yesod m, PathPiece (AuthId m), RenderMessage m FormMessage) => YesodAuth
     loginHandler :: GHandler Auth m RepHtml
     loginHandler = defaultLayout $ do
         setTitleI Msg.LoginTitle
-        tm <- lift getRouteToMaster
+        tm <- liftWidget getRouteToMaster
         mapM_ (flip apLogin tm) authPlugins
 
     renderAuthMessage :: m
diff --git a/yesod-auth/Yesod/Auth/Facebook.hs b/yesod-auth/Yesod/Auth/Facebook.hs
index 28ec3868..be4f3a0d 100644
--- a/yesod-auth/Yesod/Auth/Facebook.hs
+++ b/yesod-auth/Yesod/Auth/Facebook.hs
@@ -21,7 +21,6 @@ import Yesod.Form
 import Yesod.Handler
 import Yesod.Widget
 import Control.Monad.IO.Class (MonadIO, liftIO)
-import Control.Monad.Trans.Class (lift)
 import Data.Text (Text)
 import Control.Monad (liftM, mzero, when)
 import Data.Monoid (mappend)
@@ -100,7 +99,7 @@ authFacebook cid secret perms =
             redirectText RedirectTemporary logout
     dispatch _ _ = notFound
     login tm = do
-        render <- lift getUrlRender
+        render <- liftWidget getUrlRender
         let fb = Facebook.Facebook cid secret $ render $ tm url
         let furl = Facebook.getForwardUrl fb $ perms
         [QQ(whamlet)|
diff --git a/yesod-auth/Yesod/Auth/OAuth.hs b/yesod-auth/Yesod/Auth/OAuth.hs
index ebb1251d..51193cb0 100644
--- a/yesod-auth/Yesod/Auth/OAuth.hs
+++ b/yesod-auth/Yesod/Auth/OAuth.hs
@@ -20,7 +20,6 @@ import Data.String
 import Data.ByteString.Char8 (pack)
 import Control.Arrow ((***))
 import Control.Monad.IO.Class (liftIO)
-import Control.Monad.Trans.Class (lift)
 import Data.Text (Text, unpack)
 import Data.Text.Encoding (encodeUtf8, decodeUtf8With)
 import Data.Text.Encoding.Error (lenientDecode)
@@ -66,7 +65,7 @@ authOAuth name ident reqUrl accUrl authUrl key sec = AuthPlugin name dispatch lo
         setCreds True creds
     dispatch _ _ = notFound
     login tm = do
-        render <- lift getUrlRender
+        render <- liftWidget getUrlRender
         let oaUrl = render $ tm $ oauthUrl name
         addHtml
           [QQ(shamlet)| <a href=#{oaUrl}>Login with #{name} |]
diff --git a/yesod-auth/Yesod/Auth/OpenId.hs b/yesod-auth/Yesod/Auth/OpenId.hs
index 38891278..77565526 100644
--- a/yesod-auth/Yesod/Auth/OpenId.hs
+++ b/yesod-auth/Yesod/Auth/OpenId.hs
@@ -19,7 +19,6 @@ import Yesod.Widget
 import Yesod.Request
 import Text.Cassius (cassius)
 import Text.Blaze (toHtml)
-import Control.Monad.Trans.Class (lift)
 import Data.Text (Text)
 import qualified Yesod.Auth.Message as Msg
 
@@ -36,7 +35,7 @@ authOpenIdExtended extensionFields =
     complete = PluginR "openid" ["complete"]
     name = "openid_identifier"
     login tm = do
-        ident <- lift newIdent
+        ident <- liftWidget newIdent
         addCassius
             [QQ(cassius)|##{ident}
     background: #fff url(http://www.myopenid.com/static/openid-icon-small.gif) no-repeat scroll 0pt 50%;
diff --git a/yesod-json/Yesod/Json.hs b/yesod-json/Yesod/Json.hs
index 9effa7c4..0a52baa0 100644
--- a/yesod-json/Yesod/Json.hs
+++ b/yesod-json/Yesod/Json.hs
@@ -13,7 +13,7 @@ module Yesod.Json
     , array
     ) where
 
-import Yesod.Handler (GHandler, waiRequest)
+import Yesod.Handler (GHandler, waiRequest, liftHandler)
 import Yesod.Content
     ( ToContent (toContent), RepHtmlJson (RepHtmlJson), RepHtml (RepHtml)
     , RepJson (RepJson), Content (ContentBuilder)
@@ -25,7 +25,6 @@ import qualified Data.Aeson.Encode as JE
 import Data.Aeson.Encode (fromValue)
 import Data.Conduit.Attoparsec (sinkParser)
 import Data.Text (Text)
-import Control.Monad.Trans.Class (lift)
 import qualified Data.Vector as V
 import Text.Julius (ToJavascript (..))
 import Data.Text.Lazy.Builder (fromLazyText)
@@ -61,7 +60,7 @@ jsonToRepJson = return . RepJson . toContent
 parseJsonBody :: GHandler sub master J.Value
 parseJsonBody = do
     req <- waiRequest
-    lift $ requestBody req $$ sinkParser J.json'
+    liftHandler $ requestBody req $$ sinkParser J.json'
 
 instance ToJavascript J.Value where
     toJavascript = fromLazyText . decodeUtf8 . JE.encode