mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-04-03 07:24:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make it the caller's responsibility to give an access_token

Browse source
This commit is contained in:
Kegan Dougal 2017-05-25 17:30:17 +01:00
parent d748a2f5ce
commit c94e4740ba
1 changed files with 3 additions and 10 deletions

13
src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/storage.go
View file

@ -49,23 +49,16 @@ func (d *Database) GetDeviceByAccessToken(token string) (*authtypes.Device, erro
// CreateDevice makes a new device associated with the given user ID localpart. // CreateDevice makes a new device associated with the given user ID localpart.
// If there is already a device with the same device ID for this user, that access token will be revoked // If there is already a device with the same device ID for this user, that access token will be revoked
// and replaced with a newly generated token. If 'desiredAccessToken' is specified, the device will be // and replaced with the given accessToken. If the given accessToken is already in use for another device,
// created with that access_token and an error will be returned if this is not possible. // an error will be returned.
// Returns the device on success. // Returns the device on success.
func (d *Database) CreateDevice(localpart, deviceID, desiredAccessToken string) (dev *authtypes.Device, returnErr error) { func (d *Database) CreateDevice(localpart, deviceID, accessToken string) (dev *authtypes.Device, returnErr error) {
returnErr = runTransaction(d.db, func(txn *sql.Tx) error { returnErr = runTransaction(d.db, func(txn *sql.Tx) error {
var err error var err error
// Revoke existing token for this device // Revoke existing token for this device
if err = d.devices.deleteDevice(txn, deviceID, localpart); err != nil { if err = d.devices.deleteDevice(txn, deviceID, localpart); err != nil {
return err return err
} }
// TODO: generate an access token. We should probably make sure that it's not possible for this
// token to be the same as the one we just revoked...
accessToken := makeUserID(localpart, d.devices.serverName)
if desiredAccessToken != "" {
accessToken = desiredAccessToken
}
dev, err = d.devices.insertDevice(txn, deviceID, localpart, accessToken) dev, err = d.devices.insertDevice(txn, deviceID, localpart, accessToken)
if err != nil { if err != nil {