mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 09:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update completeRegistration with display name parameter

Browse source 
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
This commit is contained in:
Andrew (anoa) 2017-11-16 23:38:29 -08:00
parent ff666f16ee
commit 9146cebc9f
No known key found for this signature in database
GPG key ID: 174BEAB009FD176D
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -284,14 +284,16 @@ func Register(
if resErr = validateRecaptcha(cfg, r.Auth.Response, req.RemoteAddr); resErr != nil { if resErr = validateRecaptcha(cfg, r.Auth.Response, req.RemoteAddr); resErr != nil {
return *resErr return *resErr
} }
return completeRegistration(req.Context(), accountDB, deviceDB, r.Username, r.Password) return completeRegistration(req.Context(), accountDB, deviceDB,
r.Username, r.Password, r.InitialDisplayName)
case authtypes.LoginTypeSharedSecret: case authtypes.LoginTypeSharedSecret:
if cfg.Matrix.RegistrationSharedSecret == "" { if cfg.Matrix.RegistrationSharedSecret == "" {
return util.MessageResponse(400, "Shared secret registration is disabled") return util.MessageResponse(400, "Shared secret registration is disabled")
} }
valid, err := isValidMacLogin(r.Username, r.Password, r.Admin, r.Auth.Mac, cfg.Matrix.RegistrationSharedSecret) valid, err := isValidMacLogin(r.Username, r.Password, r.Admin,
r.Auth.Mac, cfg.Matrix.RegistrationSharedSecret)
if err != nil { if err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
@ -301,10 +303,12 @@ func Register(
return util.MessageResponse(403, "HMAC incorrect") return util.MessageResponse(403, "HMAC incorrect")
} }
return completeRegistration(req.Context(), accountDB, deviceDB, r.Username, r.Password, r.InitialDisplayName) return completeRegistration(req.Context(), accountDB, deviceDB,
r.Username, r.Password, r.InitialDisplayName)
case authtypes.LoginTypeDummy: case authtypes.LoginTypeDummy:
// there is nothing to do // there is nothing to do
return completeRegistration(req.Context(), accountDB, deviceDB, r.Username, r.Password, r.InitialDisplayName) return completeRegistration(req.Context(), accountDB, deviceDB,
r.Username, r.Password, r.InitialDisplayName)
default: default:
return util.JSONResponse{ return util.JSONResponse{
Code: 501, Code: 501,