h/oslstats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

big ole refactor

Browse Source
This commit is contained in:
Haelnorr
2026-02-14 19:48:59 +11:00
parent 0fc3bb0c94
commit 4a2396bca8
66 changed files with 989 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/rbac/checker.go
View File

@@ -13,11 +13,11 @@ import (
)
type Checker struct {
conn *bun.DB
conn *db.DB
s *hws.Server
}
func NewChecker(conn *bun.DB, s *hws.Server) (*Checker, error) {
func NewChecker(conn *db.DB, s *hws.Server) (*Checker, error) {
if conn == nil {
return nil, errors.New("conn cannot be nil")
}
@@ -56,7 +56,7 @@ func (c *Checker) UserHasPermission(ctx context.Context, user *db.User, permissi
// Not in preview mode: fallback to database for actual user permissions
var has bool
if err := db.WithTxFailSilently(ctx, c.conn, func(ctx context.Context, tx bun.Tx) error {
if err := c.conn.WithTxFailSilently(ctx, func(ctx context.Context, tx bun.Tx) error {
var err error
has, err = user.HasPermission(ctx, tx, permission)
if err != nil {
@@ -94,7 +94,7 @@ func (c *Checker) UserHasRole(ctx context.Context, user *db.User, role roles.Rol
// Not in preview mode: fallback to database for actual user roles
var has bool
if err := db.WithTxFailSilently(ctx, c.conn, func(ctx context.Context, tx bun.Tx) error {
if err := c.conn.WithTxFailSilently(ctx, func(ctx context.Context, tx bun.Tx) error {
var err error
has, err = user.HasRole(ctx, tx, role)
if err != nil {