sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Fix bug in devices endpoint (#877)

Browse source
This commit is contained in:
Neil Alexander 2020-02-28 15:06:16 +00:00 committed by GitHub
parent 6460b3725d
commit 72565f2eeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clientapi/auth/authtypes/device.go
View file

@ -26,4 +26,5 @@ type Device struct {
// associated with access tokens. // associated with access tokens.
SessionID int64 SessionID int64
// TODO: display name, last used timestamp, keys, etc // TODO: display name, last used timestamp, keys, etc
DisplayName string
} }

2
clientapi/auth/storage/devices/postgres/devices_table.go
View file

@ -230,7 +230,7 @@ func (s *devicesStatements) selectDevicesByLocalpart(
for rows.Next() { for rows.Next() {
var dev authtypes.Device var dev authtypes.Device
err = rows.Scan(&dev.ID) err = rows.Scan(&dev.ID, &dev.DisplayName)
if err != nil { if err != nil {
return devices, err return devices, err
} }

2
clientapi/auth/storage/devices/sqlite3/devices_table.go
View file

@ -231,7 +231,7 @@ func (s *devicesStatements) selectDevicesByLocalpart(
for rows.Next() { for rows.Next() {
var dev authtypes.Device var dev authtypes.Device
err = rows.Scan(&dev.ID) err = rows.Scan(&dev.ID, &dev.DisplayName)
if err != nil { if err != nil {
return devices, err return devices, err
} }