diff options
| author | nickago <ngonella@calpoly.edu> | 2015-07-29 09:42:13 -0700 |
|---|---|---|
| committer | nickago <ngonella@calpoly.edu> | 2015-07-29 09:42:13 -0700 |
| commit | a07ab924d32a6a2258539f53ba2875afa1e070bf (patch) | |
| tree | 0e6fc0964fdf5eaa2ac14f182798d86696d5133c /store/sql_user_store.go | |
| parent | 54265271fa16c624570ff89a26ae8596cf0fafc7 (diff) | |
| download | chat-a07ab924d32a6a2258539f53ba2875afa1e070bf.tar.gz chat-a07ab924d32a6a2258539f53ba2875afa1e070bf.tar.bz2 chat-a07ab924d32a6a2258539f53ba2875afa1e070bf.zip | |
Added a unique error message for bad username and simplified error outputed to user
Diffstat (limited to 'store/sql_user_store.go')
| -rw-r--r-- | store/sql_user_store.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index cd63e95b8..19b61d8f9 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -161,7 +161,11 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha } if count, err := us.GetMaster().Update(user); err != nil { - result.Err = model.NewAppError("SqlUserStore.Update", "We encounted an error updating the account", "user_id="+user.Id+", "+err.Error()) + if IsUniqueConstraintError(err.Error(), "Username", "users_username_teamid_key") { + result.Err = model.NewAppError("SqlUserStore.Update", "This username is already taken. Please choose another.", "user_id="+user.Id+", "+err.Error()) + } else { + result.Err = model.NewAppError("SqlUserStore.Update", "We encounted an error updating the account", "user_id="+user.Id+", "+err.Error()) + } } else if count != 1 { result.Err = model.NewAppError("SqlUserStore.Update", "We couldn't update the account", fmt.Sprintf("user_id=%v, count=%v", user.Id, count)) } else { |