Haelnorr
1b25e2f0a5
Simplified the database layer by removing custom interface wrappers and using standard library *sql.DB and *sql.Tx types directly. Changes: - Removed DBConnection and DBTransaction interfaces from database.go - Removed NewDBConnection() wrapper function - Updated TokenGenerator to use *sql.DB instead of DBConnection - Updated all validation and revocation methods to accept *sql.Tx - Updated TableManager to work with *sql.DB directly - Updated all tests to use db.Begin() instead of custom wrappers - Fixed GeneratorConfig.DB field (was DBConn) - Updated documentation in doc.go with correct API usage Benefits: - Simpler API with fewer abstractions - Works directly with database/sql standard library - Compatible with GORM (via gormDB.DB()) and Bun (share same *sql.DB) - Easier to understand and maintain - No unnecessary wrapper layers Breaking changes: - GeneratorConfig.DBConn renamed to GeneratorConfig.DB - Removed NewDBConnection() function - pass *sql.DB directly - ValidateAccess/ValidateRefresh now accept *sql.Tx instead of DBTransaction - Token.Revoke/CheckNotRevoked now accept *sql.Tx instead of DBTransaction 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
57 lines
1.6 KiB
Go
57 lines
1.6 KiB
Go
package jwt
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"fmt"
|
|
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
// revoke is an internal method that adds a token to the blacklist database.
|
|
// Once revoked, the token will fail validation checks even if it hasn't expired.
|
|
// This operation must be performed within a database transaction.
|
|
func (gen *TokenGenerator) revoke(tx *sql.Tx, t Token) error {
|
|
if gen.db == nil {
|
|
return errors.New("No DB provided, unable to use this function")
|
|
}
|
|
|
|
tableName := gen.tableConfig.TableName
|
|
jti := t.GetJTI()
|
|
exp := t.GetEXP()
|
|
sub := t.GetSUB()
|
|
|
|
query := fmt.Sprintf("INSERT INTO %s (jti, exp, sub) VALUES (?, ?, ?)", tableName)
|
|
_, err := tx.ExecContext(context.Background(), query, jti.String(), exp, sub)
|
|
if err != nil {
|
|
return errors.Wrap(err, "tx.ExecContext")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// checkNotRevoked is an internal method that queries the blacklist to verify
|
|
// a token hasn't been revoked. Returns true if the token is valid (not blacklisted),
|
|
// false if it has been revoked. This operation must be performed within a database transaction.
|
|
func (gen *TokenGenerator) checkNotRevoked(tx *sql.Tx, t Token) (bool, error) {
|
|
if gen.db == nil {
|
|
return false, errors.New("No DB provided, unable to use this function")
|
|
}
|
|
|
|
tableName := gen.tableConfig.TableName
|
|
jti := t.GetJTI()
|
|
|
|
query := fmt.Sprintf("SELECT 1 FROM %s WHERE jti = ? LIMIT 1", tableName)
|
|
rows, err := tx.QueryContext(context.Background(), query, jti.String())
|
|
if err != nil {
|
|
return false, errors.Wrap(err, "tx.QueryContext")
|
|
}
|
|
defer rows.Close()
|
|
|
|
exists := rows.Next()
|
|
if err := rows.Err(); err != nil {
|
|
return false, errors.Wrap(err, "rows iteration")
|
|
}
|
|
|
|
return !exists, nil
|
|
}
|