From 9146cebc9fa2431daeb8ab9d9677a7b49aa35dcf Mon Sep 17 00:00:00 2001 From: "Andrew (anoa)" Date: Thu, 16 Nov 2017 23:38:29 -0800 Subject: [PATCH] Update completeRegistration with display name parameter Signed-off-by: Andrew (anoa) --- .../dendrite/clientapi/routing/register.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/register.go b/src/github.com/matrix-org/dendrite/clientapi/routing/register.go index 40c21b34a..da3247e88 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/routing/register.go +++ b/src/github.com/matrix-org/dendrite/clientapi/routing/register.go @@ -284,14 +284,16 @@ func Register( if resErr = validateRecaptcha(cfg, r.Auth.Response, req.RemoteAddr); resErr != nil { 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: if cfg.Matrix.RegistrationSharedSecret == "" { 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 { return httputil.LogThenError(req, err) @@ -301,10 +303,12 @@ func Register( 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: // 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: return util.JSONResponse{ Code: 501,