Merge branch 'main' into feat/api-key-ip-restriction

f6f072cb · Edric Li · 5265b12c · ff087586 · f6f072cb · f6f072cb
Commit f6f072cb authored Jan 10, 2026 by Edric Li
--- a/backend/ent/user/where.go
+++ b/backend/ent/user/where.go
--- a/backend/ent/user_create.go
+++ b/backend/ent/user_create.go
--- a/backend/ent/user_query.go
+++ b/backend/ent/user_query.go
--- a/backend/ent/user_update.go
+++ b/backend/ent/user_update.go
--- a/backend/ent/userallowedgroup_query.go
+++ b/backend/ent/userallowedgroup_query.go
--- a/backend/ent/userattributedefinition_query.go
+++ b/backend/ent/userattributedefinition_query.go
--- a/backend/ent/userattributevalue_query.go
+++ b/backend/ent/userattributevalue_query.go
--- a/backend/ent/usersubscription_query.go
+++ b/backend/ent/usersubscription_query.go
--- a/backend/internal/config/config.go
+++ b/backend/internal/config/config.go
--- a/backend/internal/handler/admin/promo_handler.go
+++ b/backend/internal/handler/admin/promo_handler.go
--- a/backend/internal/handler/auth_handler.go
+++ b/backend/internal/handler/auth_handler.go
--- a/backend/internal/handler/dto/mappers.go
+++ b/backend/internal/handler/dto/mappers.go
--- a/backend/internal/handler/dto/types.go
+++ b/backend/internal/handler/dto/types.go
--- a/backend/internal/handler/handler.go
+++ b/backend/internal/handler/handler.go
@@ -16,6 +16,7 @@ type AdminHandlers struct {
 	AntigravityOAuth *admin.AntigravityOAuthHandler
 	Proxy            *admin.ProxyHandler
 	Redeem           *admin.RedeemHandler
+	Promo            *admin.PromoHandler
 	Setting          *admin.SettingHandler
 	System           *admin.SystemHandler
 	Subscription     *admin.SubscriptionHandler

--- a/backend/internal/handler/wire.go
+++ b/backend/internal/handler/wire.go
--- a/backend/internal/middleware/rate_limiter.go
+++ b/backend/internal/middleware/rate_limiter.go
--- a/backend/internal/pkg/ctxkey/ctxkey.go
+++ b/backend/internal/pkg/ctxkey/ctxkey.go
--- a/backend/internal/repository/account_repo.go
+++ b/backend/internal/repository/account_repo.go
--- a/backend/internal/repository/api_key_repo.go
+++ b/backend/internal/repository/api_key_repo.go
--- a/backend/internal/repository/group_repo.go
+++ b/backend/internal/repository/group_repo.go