summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorCarlos Tadeu Panato Junior <ctadeu@gmail.com>2016-11-17 15:07:16 +0100
committerChristopher Speller <crspeller@gmail.com>2016-11-17 09:07:16 -0500
commit3d2249edfcd5e8596bea2b741c28bcd28d6f8137 (patch)
tree824ca5b55df17625718774d9508f0184b92ad19a /api
parent6dde2d268a9c3224af481e84b7f440a4dfa92bfb (diff)
downloadchat-3d2249edfcd5e8596bea2b741c28bcd28d6f8137.tar.gz
chat-3d2249edfcd5e8596bea2b741c28bcd28d6f8137.tar.bz2
chat-3d2249edfcd5e8596bea2b741c28bcd28d6f8137.zip
PLT-4524 Update password reset page (#4522)
* Implement PLT-4524 Update password reset page * fix lints * changes based on review * update per request/review * update tests * add css for alert-success * change per request
Diffstat (limited to 'api')
-rw-r--r--api/user.go2
-rw-r--r--api/user_test.go15
2 files changed, 11 insertions, 6 deletions
diff --git a/api/user.go b/api/user.go
index 278199f7c..5fcea3367 100644
--- a/api/user.go
+++ b/api/user.go
@@ -1723,7 +1723,7 @@ func sendPasswordReset(c *Context, w http.ResponseWriter, r *http.Request) {
var user *model.User
if result := <-Srv.Store.User().GetByEmail(email); result.Err != nil {
- c.Err = model.NewLocAppError("sendPasswordReset", "api.user.send_password_reset.find.app_error", nil, "email="+email)
+ w.Write([]byte(model.MapToJson(props)))
return
} else {
user = result.Data.(*model.User)
diff --git a/api/user_test.go b/api/user_test.go
index 0d67030d2..bc804ca11 100644
--- a/api/user_test.go
+++ b/api/user_test.go
@@ -1256,16 +1256,21 @@ func TestSendPasswordReset(t *testing.T) {
LinkUserToTeam(user, team)
store.Must(Srv.Store.User().VerifyEmail(user.Id))
- if _, err := Client.SendPasswordReset(user.Email); err != nil {
+ if result, err := Client.SendPasswordReset(user.Email); err != nil {
t.Fatal(err)
+ } else {
+ resp := result.Data.(map[string]string)
+ if resp["email"] != user.Email {
+ t.Fatal("wrong email")
+ }
}
- if _, err := Client.SendPasswordReset(""); err == nil {
- t.Fatal("Should have errored - no email")
+ if _, err := Client.SendPasswordReset("junk@junk.com"); err != nil {
+ t.Fatal("Should have errored - bad email")
}
- if _, err := Client.SendPasswordReset("junk@junk.com"); err == nil {
- t.Fatal("Should have errored - bad email")
+ if _, err := Client.SendPasswordReset(""); err == nil {
+ t.Fatal("Should have errored - no email")
}
authData := model.NewId()