From f91cc64401ab84b7d4a01850577fc147f58a9f14 Mon Sep 17 00:00:00 2001 From: Roman Isaev Date: Wed, 12 Feb 2025 16:40:22 +0000 Subject: [PATCH] msc3861: cr fixes --- setup/mscs/msc3861/msc3861.go | 2 +- .../storage/postgres/localpart_external_ids_table.go | 12 ++++++------ userapi/storage/shared/storage.go | 6 +++--- .../storage/sqlite3/localpart_external_ids_table.go | 12 ++++++------ userapi/storage/tables/interface.go | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/setup/mscs/msc3861/msc3861.go b/setup/mscs/msc3861/msc3861.go index 9e3d0012..4dd5d517 100644 --- a/setup/mscs/msc3861/msc3861.go +++ b/setup/mscs/msc3861/msc3861.go @@ -20,6 +20,6 @@ func Enable(m *setup.Monolith) error { if err != nil { return err } - m.UserVerifierProvider.UserVerifier = userVerifier + m.UserVerifierProvider = setup.NewUserVerifierProvider(userVerifier) return nil } diff --git a/userapi/storage/postgres/localpart_external_ids_table.go b/userapi/storage/postgres/localpart_external_ids_table.go index bc2adac2..8e6a81d4 100644 --- a/userapi/storage/postgres/localpart_external_ids_table.go +++ b/userapi/storage/postgres/localpart_external_ids_table.go @@ -67,8 +67,8 @@ func NewPostgresLocalpartExternalIDsTable(db *sql.DB) (tables.LocalpartExternalI }.Prepare(db) } -// Select 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) { +// SelectLocalExternalPartID selects an existing OpenID Connect connection from the database +func (u *localpartExternalIDStatements) SelectLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) (*api.LocalpartExternalID, error) { ret := api.LocalpartExternalID{ ExternalID: externalID, AuthProvider: authProvider, @@ -87,15 +87,15 @@ func (u *localpartExternalIDStatements) Select(ctx context.Context, txn *sql.Tx, return &ret, nil } -// Insert 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 { +// InsertLocalExternalPartID creates a new record representing an OpenID Connect connection between Matrix and external accounts. +func (u *localpartExternalIDStatements) InsertLocalExternalPartID(ctx context.Context, txn *sql.Tx, localpart, externalID, authProvider string) error { stmt := sqlutil.TxStmt(txn, u.insertUserExternalIDStmt) _, err := stmt.ExecContext(ctx, localpart, externalID, authProvider, time.Now().Unix()) 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. -func (u *localpartExternalIDStatements) Delete(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error { +// 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) DeleteLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error { stmt := sqlutil.TxStmt(txn, u.deleteUserExternalIDStmt) _, err := stmt.ExecContext(ctx, externalID, authProvider) return err diff --git a/userapi/storage/shared/storage.go b/userapi/storage/shared/storage.go index 834c7648..17140e69 100644 --- a/userapi/storage/shared/storage.go +++ b/userapi/storage/shared/storage.go @@ -907,15 +907,15 @@ func (d *Database) UpsertPusher( } 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) { - 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 { - return d.LocalpartExternalIDs.Delete(ctx, nil, externalID, authProvider) + return d.LocalpartExternalIDs.DeleteLocalExternalPartID(ctx, nil, externalID, authProvider) } // GetPushers returns the pushers matching the given localpart. diff --git a/userapi/storage/sqlite3/localpart_external_ids_table.go b/userapi/storage/sqlite3/localpart_external_ids_table.go index acbd5a7e..e5074625 100644 --- a/userapi/storage/sqlite3/localpart_external_ids_table.go +++ b/userapi/storage/sqlite3/localpart_external_ids_table.go @@ -67,8 +67,8 @@ func NewSQLiteLocalpartExternalIDsTable(db *sql.DB) (tables.LocalpartExternalIDs }.Prepare(db) } -// Select 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) { +// SelectLocalExternalPartID selects an existing OpenID Connect connection from the database +func (u *localpartExternalIDStatements) SelectLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) (*api.LocalpartExternalID, error) { ret := api.LocalpartExternalID{ ExternalID: externalID, AuthProvider: authProvider, @@ -87,15 +87,15 @@ func (u *localpartExternalIDStatements) Select(ctx context.Context, txn *sql.Tx, return &ret, nil } -// Insert 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 { +// InsertLocalExternalPartID creates a new record representing an OpenID Connect connection between Matrix and external accounts. +func (u *localpartExternalIDStatements) InsertLocalExternalPartID(ctx context.Context, txn *sql.Tx, localpart, externalID, authProvider string) error { stmt := sqlutil.TxStmt(txn, u.insertUserExternalIDStmt) _, err := stmt.ExecContext(ctx, localpart, externalID, authProvider, time.Now().Unix()) 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. -func (u *localpartExternalIDStatements) Delete(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error { +// 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) DeleteLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error { stmt := sqlutil.TxStmt(txn, u.deleteUserExternalIDStmt) _, err := stmt.ExecContext(ctx, externalID, authProvider) return err diff --git a/userapi/storage/tables/interface.go b/userapi/storage/tables/interface.go index 43470276..fd9f10c3 100644 --- a/userapi/storage/tables/interface.go +++ b/userapi/storage/tables/interface.go @@ -128,9 +128,9 @@ type StatsTable interface { } type LocalpartExternalIDsTable interface { - Select(ctx context.Context, txn *sql.Tx, externalID, authProvider string) (*api.LocalpartExternalID, error) - Insert(ctx context.Context, txn *sql.Tx, localpart, externalID, authProvider string) error - Delete(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error + SelectLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) (*api.LocalpartExternalID, error) + InsertLocalExternalPartID(ctx context.Context, txn *sql.Tx, localpart, externalID, authProvider string) error + DeleteLocalExternalPartID(ctx context.Context, txn *sql.Tx, externalID, authProvider string) error } type NotificationFilter uint32