msc3861: cr fixes

Author: mdnight

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
 }

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

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.

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

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