Update authentication, reauth, logout to use new transactions
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package jwt
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"context"
|
||||
"projectreshoot/db"
|
||||
|
||||
"github.com/google/uuid"
|
||||
@@ -12,7 +12,7 @@ type Token interface {
|
||||
GetJTI() uuid.UUID
|
||||
GetEXP() int64
|
||||
GetScope() string
|
||||
GetUser(conn *sql.DB) (*db.User, error)
|
||||
GetUser(ctx context.Context, tx *db.SafeTX) (*db.User, error)
|
||||
}
|
||||
|
||||
// Access token
|
||||
@@ -38,15 +38,15 @@ type RefreshToken struct {
|
||||
Scope string // Should be "refresh"
|
||||
}
|
||||
|
||||
func (a AccessToken) GetUser(conn *sql.DB) (*db.User, error) {
|
||||
user, err := db.GetUserFromID(conn, a.SUB)
|
||||
func (a AccessToken) GetUser(ctx context.Context, tx *db.SafeTX) (*db.User, error) {
|
||||
user, err := db.GetUserFromID(ctx, tx, a.SUB)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "db.GetUserFromID")
|
||||
}
|
||||
return user, nil
|
||||
}
|
||||
func (r RefreshToken) GetUser(conn *sql.DB) (*db.User, error) {
|
||||
user, err := db.GetUserFromID(conn, r.SUB)
|
||||
func (r RefreshToken) GetUser(ctx context.Context, tx *db.SafeTX) (*db.User, error) {
|
||||
user, err := db.GetUserFromID(ctx, tx, r.SUB)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "db.GetUserFromID")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user