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

Pass device_id as nil

Browse source
This commit is contained in:
Prateek Sachan 2020-01-29 18:37:18 +05:30
parent 0e74bac653
commit 7cabe39671
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clientapi/routing/register.go
View file

@ -531,9 +531,6 @@ func handleGuestRegistration(
JSON: jsonerror.Unknown("failed to create account: " + err.Error()), JSON: jsonerror.Unknown("failed to create account: " + err.Error()),
} }
} }
//we don't allow guests to specify their own device_id
deviceId := "guest_device"
token, err := tokens.GenerateLoginToken(tokens.TokenOptions{ token, err := tokens.GenerateLoginToken(tokens.TokenOptions{
ServerPrivateKey: cfg.Matrix.PrivateKey.Seed(), ServerPrivateKey: cfg.Matrix.PrivateKey.Seed(),
ServerName: string(acc.ServerName), ServerName: string(acc.ServerName),
@ -546,7 +543,8 @@ func handleGuestRegistration(
JSON: jsonerror.Unknown("Failed to generate access token"), JSON: jsonerror.Unknown("Failed to generate access token"),
} }
} }
dev, err := deviceDB.CreateDevice(req.Context(), acc.Localpart, &deviceId, token, r.InitialDisplayName) //we don't allow guests to specify their own device_id
dev, err := deviceDB.CreateDevice(req.Context(), acc.Localpart, nil, token, r.InitialDisplayName)
if err != nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusInternalServerError, Code: http.StatusInternalServerError,