diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-10 08:25:42 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-10 08:25:42 -0400 |
commit | 5f1bd7e9acf3bce3cffbc2263caa4ca8f39f6c6a (patch) | |
tree | 08f7ab9e3fef1aa23fb1ed2b3adb9861829daa38 | |
parent | e82070c2ce8fe2bfcce13037870675c1cb8a79ab (diff) | |
parent | 7a9e709bd25407c1915e97e37bbf424ad5dc3ef5 (diff) | |
download | chat-5f1bd7e9acf3bce3cffbc2263caa4ca8f39f6c6a.tar.gz chat-5f1bd7e9acf3bce3cffbc2263caa4ca8f39f6c6a.tar.bz2 chat-5f1bd7e9acf3bce3cffbc2263caa4ca8f39f6c6a.zip |
Merge pull request #636 from hmhealey/validusername
Removed pointless attempt to verify a new user's username
-rw-r--r-- | api/user.go | 5 | ||||
-rw-r--r-- | model/user.go | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/api/user.go b/api/user.go index d69244fad..727accd1f 100644 --- a/api/user.go +++ b/api/user.go @@ -71,10 +71,7 @@ func createUser(c *Context, w http.ResponseWriter, r *http.Request) { return } - if !model.IsUsernameValid(user.Username) { - c.Err = model.NewAppError("createUser", "That username is invalid", "might be using a resrved username") - return - } + // the user's username is checked to be valid when they are saved to the database user.EmailVerified = false diff --git a/model/user.go b/model/user.go index 9f90b8204..05fc96953 100644 --- a/model/user.go +++ b/model/user.go @@ -335,11 +335,6 @@ func ComparePassword(hash string, password string) bool { return err == nil } -func IsUsernameValid(username string) bool { - - return true -} - var validUsernameChars = regexp.MustCompile(`^[a-z0-9\.\-_]+$`) var restrictedUsernames = []string{ |