mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-14 13:22:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

msc3861: cr fixes

Browse source
This commit is contained in:
Roman Isaev 2025-02-12 16:40:22 +00:00
parent 3eb4c7e1bd
commit f91cc64401
No known key found for this signature in database
GPG key ID: 7BE2B6A6C89AEC7F
5 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
setup/mscs/msc3861/msc3861.go
View file

@ -20,6 +20,6 @@ func Enable(m *setup.Monolith) error {
if err != nil { if err != nil {
return err return err
} }
m.UserVerifierProvider.UserVerifier = userVerifier m.UserVerifierProvider = setup.NewUserVerifierProvider(userVerifier)
return nil return nil
} }

12
userapi/storage/postgres/localpart_external_ids_table.go
View file

@ -67,8 +67,8 @@ func NewPostgresLocalpartExternalIDsTable(db *sql.DB) (tables.LocalpartExternalI
}.Prepare(db) }.Prepare(db)
} }
// Select selects an existing OpenID Connect connection from the database // SelectLocalExternalPartID selects an existing OpenID Connect connection from the database
func (u *localpartExternalIDStatements) Select(ctx context.Context, txn *sql.Tx, externalID, authProvider string) (*api.LocalpartExternalID, error) { func (u *localpartExternalIDStatements) SelectLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) (*api.LocalpartExternalID, error) {
ret := api.LocalpartExternalID{ ret := api.LocalpartExternalID{
ExternalID: externalID, ExternalID: externalID,
AuthProvider: authProvider, AuthProvider: authProvider,
@ -87,15 +87,15 @@ func (u *localpartExternalIDStatements) Select(ctx context.Context, txn *sql.Tx,
return &ret, nil return &ret, nil
} }
// Insert creates a new record representing an OpenID Connect connection between Matrix and external accounts. // InsertLocalExternalPartID creates a new record representing an OpenID Connect connection between Matrix and external accounts.
func (u *localpartExternalIDStatements) Insert(ctx context.Context, txn *sql.Tx, localpart, externalID, authProvider string) error { func (u *localpartExternalIDStatements) InsertLocalExternalPartID(ctx context.Context, txn *sql.Tx, localpart, externalID, authProvider string) error {
stmt := sqlutil.TxStmt(txn, u.insertUserExternalIDStmt) stmt := sqlutil.TxStmt(txn, u.insertUserExternalIDStmt)
_, err := stmt.ExecContext(ctx, localpart, externalID, authProvider, time.Now().Unix()) _, err := stmt.ExecContext(ctx, localpart, externalID, authProvider, time.Now().Unix())
return err return err
} }
// Delete deletes the existing OpenID Connect connection. After this method is called, the Matrix account will no longer be associated with the external account. // DeleteLocalExternalPartID deletes the existing OpenID Connect connection. After this method is called, the Matrix account will no longer be associated with the external account.
func (u *localpartExternalIDStatements) Delete(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error { func (u *localpartExternalIDStatements) DeleteLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error {
stmt := sqlutil.TxStmt(txn, u.deleteUserExternalIDStmt) stmt := sqlutil.TxStmt(txn, u.deleteUserExternalIDStmt)
_, err := stmt.ExecContext(ctx, externalID, authProvider) _, err := stmt.ExecContext(ctx, externalID, authProvider)
return err return err

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

@ -907,15 +907,15 @@ func (d *Database) UpsertPusher(
} }
func (d *Database) CreateLocalpartExternalID(ctx context.Context, localpart, externalID, authProvider string) error { func (d *Database) CreateLocalpartExternalID(ctx context.Context, localpart, externalID, authProvider string) error {
return d.LocalpartExternalIDs.Insert(ctx, nil, localpart, externalID, authProvider) return d.LocalpartExternalIDs.InsertLocalExternalPartID(ctx, nil, localpart, externalID, authProvider)
} }
func (d *Database) GetLocalpartForExternalID(ctx context.Context, externalID, authProvider string) (*api.LocalpartExternalID, error) { func (d *Database) GetLocalpartForExternalID(ctx context.Context, externalID, authProvider string) (*api.LocalpartExternalID, error) {
return d.LocalpartExternalIDs.Select(ctx, nil, externalID, authProvider) return d.LocalpartExternalIDs.SelectLocalExternalPartID(ctx, nil, externalID, authProvider)
} }
func (d *Database) DeleteLocalpartExternalID(ctx context.Context, externalID, authProvider string) error { func (d *Database) DeleteLocalpartExternalID(ctx context.Context, externalID, authProvider string) error {
return d.LocalpartExternalIDs.Delete(ctx, nil, externalID, authProvider) return d.LocalpartExternalIDs.DeleteLocalExternalPartID(ctx, nil, externalID, authProvider)
} }
// GetPushers returns the pushers matching the given localpart. // GetPushers returns the pushers matching the given localpart.

12
userapi/storage/sqlite3/localpart_external_ids_table.go
View file

@ -67,8 +67,8 @@ func NewSQLiteLocalpartExternalIDsTable(db *sql.DB) (tables.LocalpartExternalIDs
}.Prepare(db) }.Prepare(db)
} }
// Select selects an existing OpenID Connect connection from the database // SelectLocalExternalPartID selects an existing OpenID Connect connection from the database
func (u *localpartExternalIDStatements) Select(ctx context.Context, txn *sql.Tx, externalID, authProvider string) (*api.LocalpartExternalID, error) { func (u *localpartExternalIDStatements) SelectLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) (*api.LocalpartExternalID, error) {
ret := api.LocalpartExternalID{ ret := api.LocalpartExternalID{
ExternalID: externalID, ExternalID: externalID,
AuthProvider: authProvider, AuthProvider: authProvider,
@ -87,15 +87,15 @@ func (u *localpartExternalIDStatements) Select(ctx context.Context, txn *sql.Tx,
return &ret, nil return &ret, nil
} }
// Insert creates a new record representing an OpenID Connect connection between Matrix and external accounts. // InsertLocalExternalPartID creates a new record representing an OpenID Connect connection between Matrix and external accounts.
func (u *localpartExternalIDStatements) Insert(ctx context.Context, txn *sql.Tx, localpart, externalID, authProvider string) error { func (u *localpartExternalIDStatements) InsertLocalExternalPartID(ctx context.Context, txn *sql.Tx, localpart, externalID, authProvider string) error {
stmt := sqlutil.TxStmt(txn, u.insertUserExternalIDStmt) stmt := sqlutil.TxStmt(txn, u.insertUserExternalIDStmt)
_, err := stmt.ExecContext(ctx, localpart, externalID, authProvider, time.Now().Unix()) _, err := stmt.ExecContext(ctx, localpart, externalID, authProvider, time.Now().Unix())
return err return err
} }
// Delete deletes the existing OpenID Connect connection. After this method is called, the Matrix account will no longer be associated with the external account. // DeleteLocalExternalPartID deletes the existing OpenID Connect connection. After this method is called, the Matrix account will no longer be associated with the external account.
func (u *localpartExternalIDStatements) Delete(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error { func (u *localpartExternalIDStatements) DeleteLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error {
stmt := sqlutil.TxStmt(txn, u.deleteUserExternalIDStmt) stmt := sqlutil.TxStmt(txn, u.deleteUserExternalIDStmt)
_, err := stmt.ExecContext(ctx, externalID, authProvider) _, err := stmt.ExecContext(ctx, externalID, authProvider)
return err return err

6
userapi/storage/tables/interface.go
View file

@ -128,9 +128,9 @@ type StatsTable interface {
} }
type LocalpartExternalIDsTable interface { type LocalpartExternalIDsTable interface {
Select(ctx context.Context, txn *sql.Tx, externalID, authProvider string) (*api.LocalpartExternalID, error) SelectLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) (*api.LocalpartExternalID, error)
Insert(ctx context.Context, txn *sql.Tx, localpart, externalID, authProvider string) error InsertLocalExternalPartID(ctx context.Context, txn *sql.Tx, localpart, externalID, authProvider string) error
Delete(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error DeleteLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error
} }
type NotificationFilter uint32 type NotificationFilter uint32