From ce4987aa71deb27970b2623a706349862a942ef4 Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Wed, 4 Feb 2015 12:20:12 -0500 Subject: Newer yesod-auth --- Auth/Proxied.hs | 2 +- sflctimekeeper.cabal | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Auth/Proxied.hs b/Auth/Proxied.hs index 15f5808..32b2b78 100644 --- a/Auth/Proxied.hs +++ b/Auth/Proxied.hs @@ -27,7 +27,7 @@ authProxied = where dispatch _ [] = do mfu <- fmap ((fmap (decodeUtf8 . B.takeWhile (58 /=)) . either (const Nothing) return . Base64.decode . B.drop 1 . B.dropWhile (32 /=) =<<) . lookup (mk "Authorization") . requestHeaders) waiRequest - lift $ setCreds True $ Creds "proxied" (fromMaybe "" mfu) [] + lift $ setCredsRedirect $ Creds "proxied" (fromMaybe "" mfu) [] dispatch _ _ = notFound login authToMaster = let url = authToMaster (PluginR "proxied" []) in diff --git a/sflctimekeeper.cabal b/sflctimekeeper.cabal index 6ea1be3..98661b4 100644 --- a/sflctimekeeper.cabal +++ b/sflctimekeeper.cabal @@ -60,20 +60,20 @@ library -- , yesod-platform >= 1.1 && < 1.2 , yesod >= 1.1.5 && < 1.3 , yesod-core >= 1.1.7 && < 1.3 - , yesod-auth >= 1.1 && < 1.3 + , yesod-auth >= 1.3 && < 1.4 , yesod-static >= 1.1 && < 1.3 , yesod-default >= 1.1 && < 1.3 , yesod-form >= 1.1 && < 1.4 , clientsession >= 0.8 && < 0.10 , bytestring >= 0.9 && < 0.11 , text >= 0.11 && < 0.12 - , persistent >= 1.2 && < 1.3 - , persistent-sqlite >= 1.2 && < 1.3 - , persistent-template >= 1.2 && < 1.3 + , persistent >= 1.2 && < 1.4 + , persistent-sqlite >= 1.2 && < 1.4 + , persistent-template >= 1.2 && < 1.4 , template-haskell , hamlet >= 1.1 && < 1.2 , shakespeare-css >= 1.0 && < 1.1 - , shakespeare-js >= 1.0.2 && < 1.2 + , shakespeare-js >= 1.0.2 && < 1.3 , shakespeare-text >= 1.0 && < 1.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 -- cgit v1.2.1