diff --git a/server/cmd/server/main.go b/server/cmd/server/main.go index be86397..edf6f6f 100644 --- a/server/cmd/server/main.go +++ b/server/cmd/server/main.go @@ -173,6 +173,7 @@ func main() { // /v1/* — bearer-authenticated, OpenAI-compatible public surface. r.Route("/v1", func(r chi.Router) { r.Use(middleware.BearerAuth(q, v1.WriteError)) + r.Use(middleware.RequireActive(v1.WriteError)) r.Use(middleware.RateLimit(10, 20, v1.WriteError)) v1Srv.Mount(r) }) diff --git a/server/db/queries/pool_keys.sql b/server/db/queries/pool_keys.sql index 49ca7ae..90b7957 100644 --- a/server/db/queries/pool_keys.sql +++ b/server/db/queries/pool_keys.sql @@ -93,5 +93,6 @@ SELECT COALESCE(SUM(pk.request_count), 0) AS request_count FROM users u LEFT JOIN pool_keys pk ON pk.user_id = u.id AND pk.revoked_at IS NULL +WHERE u.status = 'active' GROUP BY u.id, u.display_name, u.email ORDER BY daily_limit_micros DESC, u.display_name ASC; diff --git a/server/internal/store/pool_keys.sql.go b/server/internal/store/pool_keys.sql.go index 946089f..bb163ec 100644 --- a/server/internal/store/pool_keys.sql.go +++ b/server/internal/store/pool_keys.sql.go @@ -139,6 +139,7 @@ SELECT COALESCE(SUM(pk.request_count), 0) AS request_count FROM users u LEFT JOIN pool_keys pk ON pk.user_id = u.id AND pk.revoked_at IS NULL +WHERE u.status = 'active' GROUP BY u.id, u.display_name, u.email ORDER BY daily_limit_micros DESC, u.display_name ASC `