mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-08 06:33:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove MS suffix

Browse source
This commit is contained in:
Till Faelligen 2022-05-12 09:55:47 +02:00
parent 06f691fde7
commit 81b3fb9715
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
userapi/storage/postgres/openid_table.go
View file

@ -55,10 +55,10 @@ func (s *openIDTokenStatements) InsertOpenIDToken(
ctx context.Context, ctx context.Context,
txn *sql.Tx, txn *sql.Tx,
token, localpart string, token, localpart string,
expiresAtMS gomatrixserverlib.Timestamp, expiresAt gomatrixserverlib.Timestamp,
) (err error) { ) (err error) {
stmt := sqlutil.TxStmt(txn, s.insertTokenStmt) stmt := sqlutil.TxStmt(txn, s.insertTokenStmt)
_, err = stmt.ExecContext(ctx, token, localpart, expiresAtMS) _, err = stmt.ExecContext(ctx, token, localpart, expiresAt)
return return
} }

4
userapi/storage/postgres/storage.go
View file

@ -31,7 +31,7 @@ import (
) )
// NewDatabase creates a new accounts and profiles database // NewDatabase creates a new accounts and profiles database
func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions, serverName gomatrixserverlib.ServerName, bcryptCost int, openIDTokenLifetimeMS, loginTokenLifetime time.Duration, serverNoticesLocalpart string) (*shared.Database, error) { func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions, serverName gomatrixserverlib.ServerName, bcryptCost int, openIDTokenLifetime, loginTokenLifetime time.Duration, serverNoticesLocalpart string) (*shared.Database, error) {
db, writer, err := base.DatabaseConnection(dbProperties, sqlutil.NewDummyWriter()) db, writer, err := base.DatabaseConnection(dbProperties, sqlutil.NewDummyWriter())
if err != nil { if err != nil {
return nil, err return nil, err
@ -116,6 +116,6 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
Writer: writer, Writer: writer,
LoginTokenLifetime: loginTokenLifetime, LoginTokenLifetime: loginTokenLifetime,
BcryptCost: bcryptCost, BcryptCost: bcryptCost,
OpenIDTokenLifetime: openIDTokenLifetimeMS, OpenIDTokenLifetime: openIDTokenLifetime,
}, nil }, nil
} }

4
userapi/storage/sqlite3/openid_table.go
View file

@ -57,10 +57,10 @@ func (s *openIDTokenStatements) InsertOpenIDToken(
ctx context.Context, ctx context.Context,
txn *sql.Tx, txn *sql.Tx,
token, localpart string, token, localpart string,
expiresAtMS gomatrixserverlib.Timestamp, expiresAt gomatrixserverlib.Timestamp,
) (err error) { ) (err error) {
stmt := sqlutil.TxStmt(txn, s.insertTokenStmt) stmt := sqlutil.TxStmt(txn, s.insertTokenStmt)
_, err = stmt.ExecContext(ctx, token, localpart, expiresAtMS) _, err = stmt.ExecContext(ctx, token, localpart, expiresAt)
return return
} }

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

@ -78,7 +78,7 @@ type LoginTokenTable interface {
} }
type OpenIDTable interface { type OpenIDTable interface {
InsertOpenIDToken(ctx context.Context, txn *sql.Tx, token, localpart string, expiresAtMS gomatrixserverlib.Timestamp) (err error) InsertOpenIDToken(ctx context.Context, txn *sql.Tx, token, localpart string, expiresAt gomatrixserverlib.Timestamp) (err error)
SelectOpenIDTokenAtrributes(ctx context.Context, token string) (*api.OpenIDTokenAttributes, error) SelectOpenIDTokenAtrributes(ctx context.Context, token string) (*api.OpenIDTokenAttributes, error)
} }