From 106db0d14dacfd308b6c35aaf62c81176ebd804f Mon Sep 17 00:00:00 2001
From: Filip Gralinski <filipg@amu.edu.pl>
Date: Sat, 3 Dec 2016 15:19:11 +0100
Subject: [PATCH] clarification as regards passwords

---
 Handler/YourAccount.hs        | 4 +++-
 messages/en.msg               | 2 +-
 templates/homepage.hamlet     | 2 +-
 templates/your-account.hamlet | 5 +++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Handler/YourAccount.hs b/Handler/YourAccount.hs
index 641a4b6..9807e8f 100644
--- a/Handler/YourAccount.hs
+++ b/Handler/YourAccount.hs
@@ -26,6 +26,7 @@ postYourAccountR :: Handler Html
 postYourAccountR = do
     ((result, formWidget), formEnctype) <- runFormPost (yourAccountForm Nothing Nothing Nothing)
     userId <- requireAuthId
+    user <- runDB $ get404 userId
     let accountData = case result of
             FormSuccess res -> Just res
             _ -> Nothing
@@ -73,6 +74,7 @@ updatePassword _ Nothing = return ()
 updatePassword userId (Just password) = do
   encodedPassword <- liftIO $ makePassword (encodeUtf8 password) defaultStrength
   runDB $ update userId [UserPassword =. Just (decodeUtf8 encodedPassword)]
+  setMessage $ toHtml ("Password set!" :: Text)
 
 updateAvatar :: Key User -> Maybe FileInfo -> Handler ()
 updateAvatar _ Nothing = return ()
@@ -140,7 +142,7 @@ passwordConfirmField = Field
     , fieldView = \idAttr nameAttr otherAttrs _ _ ->
         [whamlet|
             <input id=#{idAttr} name=#{nameAttr} *{otherAttrs} type=password>
-            <div>confirm:
+            <div>confirm new password:
             <input id=#{idAttr}-confirm name=#{nameAttr} *{otherAttrs} type=password>
         |]
     , fieldEnctype = UrlEncoded
diff --git a/messages/en.msg b/messages/en.msg
index 47c0f00..2b5ff16 100644
--- a/messages/en.msg
+++ b/messages/en.msg
@@ -25,4 +25,4 @@ CommentText: Write a comment
 Send: Send
 Avatar: avatar
 About: about
-Password: password
+Password: new password
diff --git a/templates/homepage.hamlet b/templates/homepage.hamlet
index 9e40ab8..dee68c9 100644
--- a/templates/homepage.hamlet
+++ b/templates/homepage.hamlet
@@ -14,7 +14,7 @@
         $nothing
             <div class="alert alert-info" role="alert">
                 <p>
-                    <strong>Please set up your password at <a href="@{YourAccountR}">your account</a> so that you could log in when <a href="https://developer.mozilla.org/en-US/Persona">Persona</a> authentication system.
+                    <strong>Please set up your password at <a href="@{YourAccountR}">your account</a> so that you could log in when <a href="https://developer.mozilla.org/en-US/Persona">Persona</a> authentication system is shut down.
 
         $maybe _ <- maybeLocalId
             <p>Go to the <a href="@{ListChallengesR}">challenge list</a> and choose a challenge for you!
diff --git a/templates/your-account.hamlet b/templates/your-account.hamlet
index 24caeeb..720ab60 100644
--- a/templates/your-account.hamlet
+++ b/templates/your-account.hamlet
@@ -2,6 +2,11 @@
     <div id="main" role="main">
         <h2>Your account
         <hr>
+        $maybe _ <- userPassword user
+        $nothing
+            <div class="alert alert-info" role="alert">
+                <p>
+                    <strong>Please set up your password below so that you could log in when <a href="https://developer.mozilla.org/en-US/Persona">Persona</a> authentication system is shut down.
         <img style="max-width:80px;padding-bottom:30px" src=@{AvatarR userId}>
         <form method=post action=@{YourAccountR}#form enctype=#{formEnctype}>
            ^{formWidget}