diff --git a/yesod-auth-oauth/yesod-auth-oauth.cabal b/yesod-auth-oauth/yesod-auth-oauth.cabal index e6be9e93..97992b24 100644 --- a/yesod-auth-oauth/yesod-auth-oauth.cabal +++ b/yesod-auth-oauth/yesod-auth-oauth.cabal @@ -1,5 +1,5 @@ name: yesod-auth-oauth -version: 1.0.0 +version: 1.1.0.0 license: BSD3 license-file: LICENSE author: Hiromi Ishii @@ -10,7 +10,7 @@ stability: Stable cabal-version: >= 1.6.0 build-type: Simple homepage: http://www.yesodweb.com/ -description: Authentication for Yesod. +description: Oauth Authentication for Yesod. flag ghc7 @@ -20,12 +20,12 @@ library cpp-options: -DGHC7 else build-depends: base >= 4 && < 4.3 - build-depends: authenticate-oauth >= 1.3 && < 1.4 + build-depends: authenticate-oauth >= 1.4 && < 1.5 , bytestring >= 0.9.1.4 && < 0.10 - , yesod-core >= 1.0 && < 1.1 - , yesod-auth >= 1.0 && < 1.1 + , yesod-core >= 1.1 && < 1.2 + , yesod-auth >= 1.1 && < 1.2 , text >= 0.7 && < 0.12 - , yesod-form >= 1.0 && < 1.1 + , yesod-form >= 1.1 && < 1.2 , transformers >= 0.2.2 && < 0.4 exposed-modules: Yesod.Auth.OAuth ghc-options: -Wall diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs index 811d8f54..d6c54ef3 100644 --- a/yesod-core/Yesod/Handler.hs +++ b/yesod-core/Yesod/Handler.hs @@ -438,6 +438,12 @@ handlerToIO = newWaiReq = oldWaiReq { W.requestBody = mempty } newReq = oldReq { reqWaiRequest = newWaiReq , reqBodySize = 0 } + clearedOldHandlerData = + oldHandlerData { handlerRequest = err "handlerRequest never here" + , handlerState = err "handlerState never here" } + where + err :: String -> a + err = error . ("handlerToIO: clearedOldHandlerData/" ++) newState <- liftIO $ do oldState <- I.readIORef (handlerState oldHandlerData) return $ oldState { ghsRBC = Nothing @@ -450,8 +456,9 @@ handlerToIO = -- The state IORef needs to be created here, otherwise it -- will be shared by different invocations of this function. newStateIORef <- I.newIORef newState - runResourceT $ f oldHandlerData { handlerRequest = newReq - , handlerState = newStateIORef } + runResourceT $ f clearedOldHandlerData + { handlerRequest = newReq + , handlerState = newStateIORef } -- | Function used internally by Yesod in the process of converting a @@ -750,7 +757,7 @@ getExpires m = do -- -- Note: although the value used for key and path is 'Text', you should only -- use ASCII values to be HTTP compliant. -deleteCookie :: Text -- ^ key +deleteCookie :: Text -- ^ key -> Text -- ^ path -> GHandler sub master () deleteCookie a = addHeader . DeleteCookie (encodeUtf8 a) . encodeUtf8 diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 2f070668..e9ef9403 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.1.1 +version: 1.1.1.1 license: MIT license-file: LICENSE author: Michael Snoyman diff --git a/yesod/AddHandler.hs b/yesod/AddHandler.hs index accd9347..04ffc8cf 100644 --- a/yesod/AddHandler.hs +++ b/yesod/AddHandler.hs @@ -29,10 +29,10 @@ addHandler = do c:_ | isLower c -> error "Name must start with an upper case letter" | otherwise -> return () - putStr "Enter route pattern: " + putStr "Enter route pattern (ex: /entry/#EntryId): " hFlush stdout pattern <- getLine - putStr "Enter space-separated list of methods: " + putStr "Enter space-separated list of methods (ex: GET POST): " hFlush stdout methods <- getLine