From 13e11794097cbd9b3b5684776baa69c3d955e5fd Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 2 Jan 2012 21:03:13 +0200
Subject: [PATCH] Switch to BrowserId/GoogleEmail for scaffolded site

---
 yesod-auth/Yesod/Auth/GoogleEmail.hs | 2 +-
 yesod/scaffold/Foundation.hs.cg      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/yesod-auth/Yesod/Auth/GoogleEmail.hs b/yesod-auth/Yesod/Auth/GoogleEmail.hs
index f1e5075d..a54606a9 100644
--- a/yesod-auth/Yesod/Auth/GoogleEmail.hs
+++ b/yesod-auth/Yesod/Auth/GoogleEmail.hs
@@ -41,7 +41,7 @@ authGoogleEmail =
         [whamlet|
 <form method=get action=@{tm forwardUrl}>
     <input type=hidden name=openid_identifier value=https://www.google.com/accounts/o8/id>
-    <input type=submit value=_{Msg.LoginTitle}>
+    <input type=submit value=_{Msg.LoginGoogle}>
 |]
     dispatch "GET" ["forward"] = do
         roid <- runInputGet $ iopt textField name
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 0c10fa5b..cc947b3f 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -20,7 +20,8 @@ import Yesod
 import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
 import Yesod.Auth
-import Yesod.Auth.OpenId
+import Yesod.Auth.BrowserId
+import Yesod.Auth.GoogleEmail
 import Yesod.Default.Config
 import Yesod.Default.Util (addStaticContentExternal)
 import Yesod.Logger (Logger, logMsg, formatLogText)
@@ -144,7 +145,7 @@ instance YesodAuth ~sitearg~ where
                 fmap Just $ insert $ User (credsIdent creds) Nothing
 
     -- You can add other plugins like BrowserID, email or OAuth here
-    authPlugins = [authOpenId]
+    authPlugins = [authBrowserId, authGoogleEmail]
 
 -- Sends off your mail. Requires sendmail in production!
 deliver :: ~sitearg~ -> L.ByteString -> IO ()