dearsky/ntfy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make user tests work for postgres and sqlite

Browse Source
This commit is contained in:
binwiederhier
2026-02-17 20:14:45 -05:00
parent 1abc1005d0
commit e3a402ed95
2 changed files with 1156 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2190
user/manager_test.go
View File

File diff suppressed because it is too large Load Diff

11
user/store.go
View File

@@ -19,6 +19,7 @@ type Store interface {
User(username string) (*User, error) User(username string) (*User, error)
UserByToken(token string) (*User, error) UserByToken(token string) (*User, error)
UserByStripeCustomer(customerID string) (*User, error) UserByStripeCustomer(customerID string) (*User, error)
UserIDByUsername(username string) (string, error)
Users() ([]*User, error) Users() ([]*User, error)
UsersCount() (int64, error) UsersCount() (int64, error)
AddUser(username, hash string, role Role, provisioned bool) error AddUser(username, hash string, role Role, provisioned bool) error
@@ -33,6 +34,7 @@ type Store interface {
ResetTier(username string) error ResetTier(username string) error
UpdateStats(userID string, stats *Stats) error UpdateStats(userID string, stats *Stats) error
ResetStats() error ResetStats() error
// Token operations // Token operations
CreateToken(userID, token, label string, lastAccess time.Time, lastOrigin netip.Addr, expires time.Time, provisioned bool) (*Token, error) CreateToken(userID, token, label string, lastAccess time.Time, lastOrigin netip.Addr, expires time.Time, provisioned bool) (*Token, error)
Token(userID, token string) (*Token, error) Token(userID, token string) (*Token, error)
@@ -45,6 +47,7 @@ type Store interface {
RemoveExpiredTokens() error RemoveExpiredTokens() error
TokenCount(userID string) (int, error) TokenCount(userID string) (int, error)
RemoveExcessTokens(userID string, maxCount int) error RemoveExcessTokens(userID string, maxCount int) error
// Access operations // Access operations
AuthorizeTopicAccess(usernameOrEveryone, topic string) (read, write, found bool, err error) AuthorizeTopicAccess(usernameOrEveryone, topic string) (read, write, found bool, err error)
AllGrants() (map[string][]Grant, error) AllGrants() (map[string][]Grant, error)
@@ -57,6 +60,7 @@ type Store interface {
ReservationsCount(username string) (int64, error) ReservationsCount(username string) (int64, error)
ReservationOwner(topic string) (string, error) ReservationOwner(topic string) (string, error)
OtherAccessCount(username, topic string) (int, error) OtherAccessCount(username, topic string) (int, error)
// Tier operations // Tier operations
AddTier(tier *Tier) error AddTier(tier *Tier) error
UpdateTier(tier *Tier) error UpdateTier(tier *Tier) error
@@ -64,15 +68,14 @@ type Store interface {
Tiers() ([]*Tier, error) Tiers() ([]*Tier, error)
Tier(code string) (*Tier, error) Tier(code string) (*Tier, error)
TierByStripePrice(priceID string) (*Tier, error) TierByStripePrice(priceID string) (*Tier, error)
// Phone operations // Phone operations
PhoneNumbers(userID string) ([]string, error) PhoneNumbers(userID string) ([]string, error)
AddPhoneNumber(userID, phoneNumber string) error AddPhoneNumber(userID, phoneNumber string) error
RemovePhoneNumber(userID, phoneNumber string) error RemovePhoneNumber(userID, phoneNumber string) error
// Billing
// Other stuff
ChangeBilling(username string, billing *Billing) error ChangeBilling(username string, billing *Billing) error
// Internal helpers
UserIDByUsername(username string) (string, error)
// System
Close() error Close() error
} }