654cfb6480
Add a read-only aggregate view per channel: its linked groups and a deterministic wildcard-free supported-model list with pricing details. Backend - service.Channel.SupportedModels(): combine ModelMapping keys with same-platform ModelPricing.Models; trailing "*" keys expand via pricing prefix match; platforms without a mapping produce no entries (intentional "no mapping = not shown" rule). - Extract splitWildcardSuffix() shared with toModelEntry. - Build a per-call pricing lookup map (platform+lowerName -> *pricing) to avoid O(N*M) scans in SupportedModels. - ChannelService.ListAvailable() aggregates channels + active groups; filters out group IDs no longer active. - Admin route GET /api/v1/admin/channels/available returns the full DTO (id, status, billing_model_source, restrict_models, groups, supported_models). - User route GET /api/v1/channels/available applies three filters: Status==active, visible-group intersection, and platform filter on supported_models (prevents cross-platform leak when a channel links to both a user-accessible group and an inaccessible one on another platform). Response is a plain array (matches the /groups/available sibling shape). Field whitelist omits billing_model_source, restrict_models, ids, status, sort_order. Frontend - New /admin/available-channels and /available-channels views backed by a shared AvailableChannelsTable component (admin adds status + billing-source columns via slots). - PricingRow extracted to its own SFC; SupportedModelChip references shared billing-mode constants in constants/channel.ts. - Sidebar: new entry above "渠道管理" for admin; matching entry in user nav. - i18n: zh + en coverage for both namespaces. Tests - SupportedModels: wildcard-only pricing skipped, prefix-matches- nothing, cross-platform bleed, case-insensitive dedup, empty platform mapping. - ListAvailable: nil groupRepo, inactive-group-ID dropped, stable case-insensitive name sort. - User handler: 401 on unauthenticated, visible-group intersection, platform filter on supported_models, JSON whitelist. - Admin handler: full DTO including default BillingModelSource fallback. Refs: issue #1729
180 lines
6.0 KiB
Go
180 lines
6.0 KiB
Go
package handler
|
|
|
|
import (
|
|
"github.com/Wei-Shaw/sub2api/internal/handler/admin"
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
|
|
"github.com/google/wire"
|
|
)
|
|
|
|
// ProvideAdminHandlers creates the AdminHandlers struct
|
|
func ProvideAdminHandlers(
|
|
dashboardHandler *admin.DashboardHandler,
|
|
userHandler *admin.UserHandler,
|
|
groupHandler *admin.GroupHandler,
|
|
accountHandler *admin.AccountHandler,
|
|
announcementHandler *admin.AnnouncementHandler,
|
|
dataManagementHandler *admin.DataManagementHandler,
|
|
backupHandler *admin.BackupHandler,
|
|
oauthHandler *admin.OAuthHandler,
|
|
openaiOAuthHandler *admin.OpenAIOAuthHandler,
|
|
geminiOAuthHandler *admin.GeminiOAuthHandler,
|
|
antigravityOAuthHandler *admin.AntigravityOAuthHandler,
|
|
proxyHandler *admin.ProxyHandler,
|
|
redeemHandler *admin.RedeemHandler,
|
|
promoHandler *admin.PromoHandler,
|
|
settingHandler *admin.SettingHandler,
|
|
opsHandler *admin.OpsHandler,
|
|
systemHandler *admin.SystemHandler,
|
|
subscriptionHandler *admin.SubscriptionHandler,
|
|
usageHandler *admin.UsageHandler,
|
|
userAttributeHandler *admin.UserAttributeHandler,
|
|
errorPassthroughHandler *admin.ErrorPassthroughHandler,
|
|
tlsFingerprintProfileHandler *admin.TLSFingerprintProfileHandler,
|
|
apiKeyHandler *admin.AdminAPIKeyHandler,
|
|
scheduledTestHandler *admin.ScheduledTestHandler,
|
|
channelHandler *admin.ChannelHandler,
|
|
channelMonitorHandler *admin.ChannelMonitorHandler,
|
|
channelMonitorTemplateHandler *admin.ChannelMonitorRequestTemplateHandler,
|
|
availableChannelHandler *admin.AvailableChannelHandler,
|
|
paymentHandler *admin.PaymentHandler,
|
|
) *AdminHandlers {
|
|
return &AdminHandlers{
|
|
Dashboard: dashboardHandler,
|
|
User: userHandler,
|
|
Group: groupHandler,
|
|
Account: accountHandler,
|
|
Announcement: announcementHandler,
|
|
DataManagement: dataManagementHandler,
|
|
Backup: backupHandler,
|
|
OAuth: oauthHandler,
|
|
OpenAIOAuth: openaiOAuthHandler,
|
|
GeminiOAuth: geminiOAuthHandler,
|
|
AntigravityOAuth: antigravityOAuthHandler,
|
|
Proxy: proxyHandler,
|
|
Redeem: redeemHandler,
|
|
Promo: promoHandler,
|
|
Setting: settingHandler,
|
|
Ops: opsHandler,
|
|
System: systemHandler,
|
|
Subscription: subscriptionHandler,
|
|
Usage: usageHandler,
|
|
UserAttribute: userAttributeHandler,
|
|
ErrorPassthrough: errorPassthroughHandler,
|
|
TLSFingerprintProfile: tlsFingerprintProfileHandler,
|
|
APIKey: apiKeyHandler,
|
|
ScheduledTest: scheduledTestHandler,
|
|
Channel: channelHandler,
|
|
ChannelMonitor: channelMonitorHandler,
|
|
ChannelMonitorTemplate: channelMonitorTemplateHandler,
|
|
AvailableChannel: availableChannelHandler,
|
|
Payment: paymentHandler,
|
|
}
|
|
}
|
|
|
|
// ProvideSystemHandler creates admin.SystemHandler with UpdateService
|
|
func ProvideSystemHandler(updateService *service.UpdateService, lockService *service.SystemOperationLockService) *admin.SystemHandler {
|
|
return admin.NewSystemHandler(updateService, lockService)
|
|
}
|
|
|
|
// ProvideSettingHandler creates SettingHandler with version from BuildInfo
|
|
func ProvideSettingHandler(settingService *service.SettingService, buildInfo BuildInfo) *SettingHandler {
|
|
return NewSettingHandler(settingService, buildInfo.Version)
|
|
}
|
|
|
|
// ProvideHandlers creates the Handlers struct
|
|
func ProvideHandlers(
|
|
authHandler *AuthHandler,
|
|
userHandler *UserHandler,
|
|
apiKeyHandler *APIKeyHandler,
|
|
usageHandler *UsageHandler,
|
|
redeemHandler *RedeemHandler,
|
|
subscriptionHandler *SubscriptionHandler,
|
|
announcementHandler *AnnouncementHandler,
|
|
channelMonitorUserHandler *ChannelMonitorUserHandler,
|
|
adminHandlers *AdminHandlers,
|
|
gatewayHandler *GatewayHandler,
|
|
openaiGatewayHandler *OpenAIGatewayHandler,
|
|
settingHandler *SettingHandler,
|
|
totpHandler *TotpHandler,
|
|
paymentHandler *PaymentHandler,
|
|
paymentWebhookHandler *PaymentWebhookHandler,
|
|
availableChannelHandler *AvailableChannelHandler,
|
|
_ *service.IdempotencyCoordinator,
|
|
_ *service.IdempotencyCleanupService,
|
|
) *Handlers {
|
|
return &Handlers{
|
|
Auth: authHandler,
|
|
User: userHandler,
|
|
APIKey: apiKeyHandler,
|
|
Usage: usageHandler,
|
|
Redeem: redeemHandler,
|
|
Subscription: subscriptionHandler,
|
|
Announcement: announcementHandler,
|
|
ChannelMonitor: channelMonitorUserHandler,
|
|
Admin: adminHandlers,
|
|
Gateway: gatewayHandler,
|
|
OpenAIGateway: openaiGatewayHandler,
|
|
Setting: settingHandler,
|
|
Totp: totpHandler,
|
|
Payment: paymentHandler,
|
|
PaymentWebhook: paymentWebhookHandler,
|
|
AvailableChannel: availableChannelHandler,
|
|
}
|
|
}
|
|
|
|
// ProviderSet is the Wire provider set for all handlers
|
|
var ProviderSet = wire.NewSet(
|
|
// Top-level handlers
|
|
NewAuthHandler,
|
|
NewUserHandler,
|
|
NewAPIKeyHandler,
|
|
NewUsageHandler,
|
|
NewRedeemHandler,
|
|
NewSubscriptionHandler,
|
|
NewAnnouncementHandler,
|
|
NewChannelMonitorUserHandler,
|
|
NewGatewayHandler,
|
|
NewOpenAIGatewayHandler,
|
|
NewTotpHandler,
|
|
ProvideSettingHandler,
|
|
NewPaymentHandler,
|
|
NewPaymentWebhookHandler,
|
|
NewAvailableChannelHandler,
|
|
|
|
// Admin handlers
|
|
admin.NewDashboardHandler,
|
|
admin.NewUserHandler,
|
|
admin.NewGroupHandler,
|
|
admin.NewAccountHandler,
|
|
admin.NewAnnouncementHandler,
|
|
admin.NewDataManagementHandler,
|
|
admin.NewBackupHandler,
|
|
admin.NewOAuthHandler,
|
|
admin.NewOpenAIOAuthHandler,
|
|
admin.NewGeminiOAuthHandler,
|
|
admin.NewAntigravityOAuthHandler,
|
|
admin.NewProxyHandler,
|
|
admin.NewRedeemHandler,
|
|
admin.NewPromoHandler,
|
|
admin.NewSettingHandler,
|
|
admin.NewOpsHandler,
|
|
ProvideSystemHandler,
|
|
admin.NewSubscriptionHandler,
|
|
admin.NewUsageHandler,
|
|
admin.NewUserAttributeHandler,
|
|
admin.NewErrorPassthroughHandler,
|
|
admin.NewTLSFingerprintProfileHandler,
|
|
admin.NewAdminAPIKeyHandler,
|
|
admin.NewScheduledTestHandler,
|
|
admin.NewChannelHandler,
|
|
admin.NewChannelMonitorHandler,
|
|
admin.NewChannelMonitorRequestTemplateHandler,
|
|
admin.NewAvailableChannelHandler,
|
|
admin.NewPaymentHandler,
|
|
|
|
// AdminHandlers and Handlers constructors
|
|
ProvideAdminHandlers,
|
|
ProvideHandlers,
|
|
)
|