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

Rename variable

Browse source
This commit is contained in:
Till Faelligen 2020-06-01 13:59:42 +02:00
parent c7bd7aff58
commit 3f4b0b5554
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appservice/appservice.go
View file

@ -121,7 +121,7 @@ func generateAppServiceAccount(
// Create an account for the application service // Create an account for the application service
_, err := accountsDB.CreateAccount(ctx, as.SenderLocalpart, "", as.ID) _, err := accountsDB.CreateAccount(ctx, as.SenderLocalpart, "", as.ID)
if err != nil { if err != nil {
if errors.Is(err, internal.ErrSQLUserExists) { // This account already exists if errors.Is(err, internal.ErrUserExists) { // This account already exists
return nil return nil
} }
return err return err

2
clientapi/auth/storage/accounts/postgres/storage.go
View file

@ -164,7 +164,7 @@ func (d *Database) createAccount(
} }
if err := d.profiles.insertProfile(ctx, txn, localpart); err != nil { if err := d.profiles.insertProfile(ctx, txn, localpart); err != nil {
if internal.IsUniqueConstraintViolationErr(err) { if internal.IsUniqueConstraintViolationErr(err) {
return nil, internal.ErrSQLUserExists return nil, internal.ErrUserExists
} }
return nil, err return nil, err
} }

2
clientapi/routing/register.go
View file

@ -830,7 +830,7 @@ func completeRegistration(
acc, err := accountDB.CreateAccount(ctx, username, password, appserviceID) acc, err := accountDB.CreateAccount(ctx, username, password, appserviceID)
if err != nil { if err != nil {
if errors.Is(err, internal.ErrSQLUserExists) { // user already exists if errors.Is(err, internal.ErrUserExists) { // user already exists
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: jsonerror.UserInUse("Desired user ID is already taken."), JSON: jsonerror.UserInUse("Desired user ID is already taken."),

2
internal/sql.go
View file

@ -23,7 +23,7 @@ import (
) )
// ErrUserExists is returned if a username already exists in the database. // ErrUserExists is returned if a username already exists in the database.
var ErrSQLUserExists = errors.New("Username already exists") var ErrUserExists = errors.New("Username already exists")
// A Transaction is something that can be committed or rolledback. // A Transaction is something that can be committed or rolledback.
type Transaction interface { type Transaction interface {