BrowserID: createOnClick

yesod-auth/Yesod/Auth/BrowserId.hs

@@ -3,6 +3,7 @@
 module Yesod.Auth.BrowserId
     ( authBrowserId
     , authBrowserIdAudience
+    , createOnClick
     ) where
 
 import Yesod.Auth
@@ -64,6 +65,27 @@ helper maudience = AuthPlugin
             (_, []) -> badMethod
             _ -> notFound
     , apLogin = \toMaster -> do
+        onclick <- createOnClick toMaster
+
+        autologin <- fmap (== Just "true") $ lift $ lookupGetParam "autologin"
+        when autologin $ toWidget [julius|
+#{rawJS onclick}();
+|]
+
+        toWidget [hamlet|
+$newline never
+<p>
+    <a href="javascript:#{onclick}()">
+        <img src="https://browserid.org/i/sign_in_green.png">
+|]
+    }
+  where
+    stripScheme t = fromMaybe t $ T.stripPrefix "//" $ snd $ T.breakOn "//" t
+
+-- | Generates a function to handle on-click events, and returns that function
+-- name.
+createOnClick :: (Route Auth -> Route master) -> GWidget sub master Text
+createOnClick toMaster = do
     addScriptRemote browserIdJs
     onclick <- lift newIdent
     render <- lift getUrlRender
@@ -85,20 +107,9 @@ function #{rawJS onclick}() {
     |]
 
     autologin <- fmap (== Just "true") $ lift $ lookupGetParam "autologin"
-        when autologin $ toWidget [julius|
+    when autologin $ toWidget [julius|#{rawJS onclick}();|]
-#{rawJS onclick}();
+    return onclick
-|]
-
-        toWidget [hamlet|
-$newline never
-<p>
-    <a href="javascript:#{onclick}()">
-        <img src="https://browserid.org/i/sign_in_green.png">
-|]
-    }
   where
-    stripScheme t = fromMaybe t $ T.stripPrefix "//" $ snd $ T.breakOn "//" t
-
     getPath t = fromMaybe t $ do
         uri <- parseURI $ T.unpack t
         return $ T.pack $ uriPath uri

yesod-auth/yesod-auth.cabal

@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         1.1.2.2
+version:         1.1.3
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin