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

Merge pull request #43 from globekeeper/daniel/inhibit_device

Browse source 
Daniel/inhibit device
This commit is contained in:
Daniel Aloni 2022-10-26 16:19:13 +03:00 committed by GitHub
parent 2511b7d5ca b9173ba072
commit b3d7d80be7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/login.go
View file

@ -73,7 +73,7 @@ func Login(
return util.JSONResponse{
Code: http.StatusOK,
JSON: loginResponse{
UserID: login.Username(),
UserID: userutil.MakeUserID(login.Username(), cfg.Matrix.ServerName),
AccessToken: "",
HomeServer: cfg.Matrix.ServerName,
DeviceID: "",

2
userapi/storage/shared/storage.go
View file

@ -562,7 +562,7 @@ func (d *Database) CreateDevice(
ctx context.Context, localpart string, deviceID *string, accessToken string,
displayName *string, ipAddr, userAgent string,
) (dev *api.Device, returnErr error) {
if deviceID != nil {
if deviceID != nil && *deviceID != "" {
returnErr = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
var err error
// Revoke existing tokens for this device