From cca7450613fc29b4d50281088918dcbb02b6cec1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 9 Feb 2010 20:30:29 +0200
Subject: [PATCH] Rpxnow login looks at DEST cookie

---
 Yesod/Helpers/Auth.hs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Yesod/Helpers/Auth.hs b/Yesod/Helpers/Auth.hs
index e8ae1ab0..b4d947aa 100644
--- a/Yesod/Helpers/Auth.hs
+++ b/Yesod/Helpers/Auth.hs
@@ -181,11 +181,15 @@ rpxnowLogin = do
                         (('#':rest):_) -> rest
                         (s:_) -> s
                 (d:_) -> d
+    let dest' = case cookies rr "DEST" of
+                    [] -> dest
+                    (x:_) -> x
     ident <- Rpxnow.authenticate apiKey token
     onRpxnowLogin ident
     header authCookieName $ Rpxnow.identifier ident
     header authDisplayName $ getDisplayName ident
-    redirect RedirectTemporary dest
+    deleteCookie "DEST"
+    redirect RedirectTemporary dest'
 
 data MissingToken = MissingToken
     deriving (Show, Typeable)