hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-11 22:33:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce Register func complexity

Browse source
This commit is contained in:
Andrew Morgan 2018-07-26 15:39:38 +01:00
parent 04733b1360
commit c091a4bcb3
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/github.com/matrix-org/dendrite/clientapi/routing/register.go
View file

@ -180,6 +180,18 @@ type recaptchaResponse struct {
ErrorCodes []int `json:"error-codes"` ErrorCodes []int `json:"error-codes"`
} }
// validateUsernameAndPassword is a convenience function that returns an error
// response if either the username or password is invalid
func validateUsernameAndPassword(username, password string) *util.JSONResponse {
if err := validateUsername(username); err != nil {
return err
}
if err := validatePassword(password); err != nil {
return err
}
return nil
}
// validateUsername returns an error response if the username is invalid // validateUsername returns an error response if the username is invalid
func validateUsername(username string) *util.JSONResponse { func validateUsername(username string) *util.JSONResponse {
// https://github.com/matrix-org/synapse/blob/v0.20.0/synapse/rest/client/v2_alpha/register.py#L161 // https://github.com/matrix-org/synapse/blob/v0.20.0/synapse/rest/client/v2_alpha/register.py#L161
@ -467,10 +479,7 @@ func Register(
// Squash username to all lowercase letters // Squash username to all lowercase letters
r.Username = strings.ToLower(r.Username) r.Username = strings.ToLower(r.Username)
if resErr = validateUsername(r.Username); resErr != nil { if resErr = validateUsernameAndPassword(r.Username, r.Password); resErr != nil {
return *resErr
}
if resErr = validatePassword(r.Password); resErr != nil {
return *resErr return *resErr
} }
@ -679,10 +688,7 @@ func parseAndValidateLegacyLogin(req *http.Request, r *legacyRegisterRequest) *u
// Squash username to all lowercase letters // Squash username to all lowercase letters
r.Username = strings.ToLower(r.Username) r.Username = strings.ToLower(r.Username)
if resErr = validateUsername(r.Username); resErr != nil { if resErr = validateUsernameAndPassword(r.Username, r.Password); resErr != nil {
return resErr
}
if resErr = validatePassword(r.Password); resErr != nil {
return resErr return resErr
} }