MirrorHub/dendrite
0
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-06-21 05:48:22 +02:00
Code Issues Releases Wiki Activity

Move ErrUserExists to accounts package

Browse source
This commit is contained in:
Till Faelligen 2020-06-01 18:05:49 +02:00
parent 0325ab56fb
commit be3d4cdacb
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
appservice/appservice.go
View file

@ -30,7 +30,6 @@ import (
"github.com/matrix-org/dendrite/appservice/workers"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
"github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/internal/basecomponent"
"github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/internal/transactions"
@ -121,7 +120,7 @@ func generateAppServiceAccount(
// Create an account for the application service
_, err := accountsDB.CreateAccount(ctx, as.SenderLocalpart, "", as.ID)
if err != nil {
if errors.Is(err, internal.ErrUserExists) { // This account already exists
if errors.Is(err, accounts.ErrUserExists) { // This account already exists
return nil
}
return err

3
clientapi/auth/storage/accounts/interface.go
View file

@ -55,3 +55,6 @@ type Database interface {
// Err3PIDInUse is the error returned when trying to save an association involving
// a third-party identifier which is already associated to a local user.
var Err3PIDInUse = errors.New("This third-party identifier is already in use")
// ErrUserExists is returned if a username already exists in the database.
var ErrUserExists = errors.New("Username already exists")

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

@ -21,6 +21,7 @@ import (
"strconv"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/gomatrixserverlib"
@ -164,7 +165,7 @@ func (d *Database) createAccount(
}
if err := d.profiles.insertProfile(ctx, txn, localpart); err != nil {
if internal.IsUniqueConstraintViolationErr(err) {
return nil, internal.ErrUserExists
return nil, accounts.ErrUserExists
}
return nil, err
}

3
clientapi/auth/storage/accounts/sqlite3/storage.go
View file

@ -22,6 +22,7 @@ import (
"sync"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/gomatrixserverlib"
@ -173,7 +174,7 @@ func (d *Database) createAccount(
}
if err := d.profiles.insertProfile(ctx, txn, localpart); err != nil {
if errors.Is(err, sqlite3.ErrConstraint) {
return nil, internal.ErrUserExists
return nil, accounts.ErrUserExists
}
return nil, err
}

2
clientapi/routing/register.go
View file

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

4
internal/sql.go
View file

@ -16,15 +16,11 @@ package internal
import (
"database/sql"
"errors"
"fmt"
"runtime"
"time"
)
// ErrUserExists is returned if a username already exists in the database.
var ErrUserExists = errors.New("Username already exists")
// A Transaction is something that can be committed or rolledback.
type Transaction interface {
// Commit the transaction