feat(channels): add "Available Channels" aggregate view
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
This commit is contained in:
erio
99
backend/internal/handler/admin/available_channel_handler.go
Normal file
99
backend/internal/handler/admin/available_channel_handler.go
Normal file
@@ -0,0 +1,99 @@
|
||||
package admin
|
||||
|
||||
import (
|
||||
"github.com/Wei-Shaw/sub2api/internal/pkg/response"
|
||||
"github.com/Wei-Shaw/sub2api/internal/service"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
// AvailableChannelHandler 处理「可用渠道」聚合视图的管理员接口。
|
||||
//
|
||||
// 该视图以只读方式聚合渠道基础信息、关联分组与推导出的支持模型列表（无通配符）。
|
||||
type AvailableChannelHandler struct {
|
||||
channelService *service.ChannelService
|
||||
}
|
||||
|
||||
// NewAvailableChannelHandler 创建 AvailableChannelHandler 实例。
|
||||
func NewAvailableChannelHandler(channelService *service.ChannelService) *AvailableChannelHandler {
|
||||
return &AvailableChannelHandler{channelService: channelService}
|
||||
}
|
||||
|
||||
// availableGroupResponse 响应中的分组概要。
|
||||
type availableGroupResponse struct {
|
||||
ID int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Platform string `json:"platform"`
|
||||
}
|
||||
|
||||
// supportedModelResponse 响应中的支持模型条目。
|
||||
type supportedModelResponse struct {
|
||||
Name string `json:"name"`
|
||||
Platform string `json:"platform"`
|
||||
Pricing *channelModelPricingResponse `json:"pricing"`
|
||||
}
|
||||
|
||||
// availableChannelResponse 管理员视图完整字段集。
|
||||
type availableChannelResponse struct {
|
||||
ID int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
Status string `json:"status"`
|
||||
BillingModelSource string `json:"billing_model_source"`
|
||||
RestrictModels bool `json:"restrict_models"`
|
||||
Groups []availableGroupResponse `json:"groups"`
|
||||
SupportedModels []supportedModelResponse `json:"supported_models"`
|
||||
}
|
||||
|
||||
// AvailableChannelToAdminResponse 将 service 层的 AvailableChannel 转为管理员 DTO。
|
||||
// 导出供同 package 的复用；也用于构造测试 fixture。
|
||||
func AvailableChannelToAdminResponse(ch service.AvailableChannel) availableChannelResponse {
|
||||
groups := make([]availableGroupResponse, 0, len(ch.Groups))
|
||||
for _, g := range ch.Groups {
|
||||
groups = append(groups, availableGroupResponse{ID: g.ID, Name: g.Name, Platform: g.Platform})
|
||||
}
|
||||
models := make([]supportedModelResponse, 0, len(ch.SupportedModels))
|
||||
for i := range ch.SupportedModels {
|
||||
m := ch.SupportedModels[i]
|
||||
var pricing *channelModelPricingResponse
|
||||
if m.Pricing != nil {
|
||||
p := pricingToResponse(m.Pricing)
|
||||
pricing = &p
|
||||
}
|
||||
models = append(models, supportedModelResponse{
|
||||
Name: m.Name,
|
||||
Platform: m.Platform,
|
||||
Pricing: pricing,
|
||||
})
|
||||
}
|
||||
billingSource := ch.BillingModelSource
|
||||
if billingSource == "" {
|
||||
billingSource = service.BillingModelSourceChannelMapped
|
||||
}
|
||||
return availableChannelResponse{
|
||||
ID: ch.ID,
|
||||
Name: ch.Name,
|
||||
Description: ch.Description,
|
||||
Status: ch.Status,
|
||||
BillingModelSource: billingSource,
|
||||
RestrictModels: ch.RestrictModels,
|
||||
Groups: groups,
|
||||
SupportedModels: models,
|
||||
}
|
||||
}
|
||||
|
||||
// List 列出所有可用渠道（管理员视图）。
|
||||
// GET /api/v1/admin/channels/available
|
||||
func (h *AvailableChannelHandler) List(c *gin.Context) {
|
||||
channels, err := h.channelService.ListAvailable(c.Request.Context())
|
||||
if err != nil {
|
||||
response.ErrorFrom(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
out := make([]availableChannelResponse, 0, len(channels))
|
||||
for _, ch := range channels {
|
||||
out = append(out, AvailableChannelToAdminResponse(ch))
|
||||
}
|
||||
response.Success(c, gin.H{"items": out})
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
//go:build unit
|
||||
|
||||
package admin
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
|
||||
"github.com/Wei-Shaw/sub2api/internal/service"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestAvailableChannelToAdminResponse_IncludesFullDTO(t *testing.T) {
|
||||
// 管理员视图应包含 id / status / billing_model_source / restrict_models 等
|
||||
// 管理字段；BillingModelSource 为空时应默认回填 channel_mapped。
|
||||
input := service.AvailableChannel{
|
||||
ID: 42,
|
||||
Name: "ch",
|
||||
Description: "d",
|
||||
Status: service.StatusActive,
|
||||
BillingModelSource: "", // 验证默认值填充
|
||||
RestrictModels: true,
|
||||
Groups: []service.AvailableGroupRef{
|
||||
{ID: 1, Name: "g1", Platform: "anthropic"},
|
||||
},
|
||||
SupportedModels: []service.SupportedModel{
|
||||
{Name: "claude-sonnet-4-6", Platform: "anthropic"},
|
||||
},
|
||||
}
|
||||
|
||||
resp := AvailableChannelToAdminResponse(input)
|
||||
require.Equal(t, int64(42), resp.ID)
|
||||
require.Equal(t, "ch", resp.Name)
|
||||
require.Equal(t, service.StatusActive, resp.Status)
|
||||
require.Equal(t, service.BillingModelSourceChannelMapped, resp.BillingModelSource)
|
||||
require.True(t, resp.RestrictModels)
|
||||
require.Len(t, resp.Groups, 1)
|
||||
require.Len(t, resp.SupportedModels, 1)
|
||||
|
||||
// JSON 层验证管理字段确实会被序列化。
|
||||
raw, err := json.Marshal(resp)
|
||||
require.NoError(t, err)
|
||||
var decoded map[string]any
|
||||
require.NoError(t, json.Unmarshal(raw, &decoded))
|
||||
for _, key := range []string{"id", "status", "billing_model_source", "restrict_models", "groups", "supported_models"} {
|
||||
_, exists := decoded[key]
|
||||
require.Truef(t, exists, "admin DTO must expose %q", key)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAvailableChannelToAdminResponse_PreservesExplicitBillingSource(t *testing.T) {
|
||||
input := service.AvailableChannel{
|
||||
BillingModelSource: service.BillingModelSourceUpstream,
|
||||
}
|
||||
resp := AvailableChannelToAdminResponse(input)
|
||||
require.Equal(t, service.BillingModelSourceUpstream, resp.BillingModelSource)
|
||||
}
|
||||
216
backend/internal/handler/available_channel_handler.go
Normal file
216
backend/internal/handler/available_channel_handler.go
Normal file
@@ -0,0 +1,216 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"github.com/Wei-Shaw/sub2api/internal/pkg/response"
|
||||
middleware2 "github.com/Wei-Shaw/sub2api/internal/server/middleware"
|
||||
"github.com/Wei-Shaw/sub2api/internal/service"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
// AvailableChannelHandler 处理用户侧「可用渠道」查询。
|
||||
//
|
||||
// 用户侧接口委托 ChannelService.ListAvailable，并在返回前做三层过滤：
|
||||
// 1. 行过滤：只保留状态为 Active 且与当前用户可访问分组有交集的渠道；
|
||||
// 2. 分组过滤：渠道的 Groups 只保留用户可访问的那些；
|
||||
// 3. 平台过滤：渠道的 SupportedModels 只保留平台在用户可见 Groups 中出现过的模型，
|
||||
// 防止"渠道同时挂在 antigravity / anthropic 两个平台的分组上，用户只访问
|
||||
// antigravity，却看到 anthropic 模型"这类跨平台信息泄漏；
|
||||
// 4. 字段白名单：仅返回用户需要的字段（省略 BillingModelSource / RestrictModels
|
||||
// / 内部 ID / Status 等管理字段）。
|
||||
type AvailableChannelHandler struct {
|
||||
channelService *service.ChannelService
|
||||
apiKeyService *service.APIKeyService
|
||||
}
|
||||
|
||||
// NewAvailableChannelHandler 创建用户侧可用渠道 handler。
|
||||
func NewAvailableChannelHandler(
|
||||
channelService *service.ChannelService,
|
||||
apiKeyService *service.APIKeyService,
|
||||
) *AvailableChannelHandler {
|
||||
return &AvailableChannelHandler{
|
||||
channelService: channelService,
|
||||
apiKeyService: apiKeyService,
|
||||
}
|
||||
}
|
||||
|
||||
// userAvailableGroup 用户可见的分组概要（白名单字段）。
|
||||
type userAvailableGroup struct {
|
||||
ID int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Platform string `json:"platform"`
|
||||
}
|
||||
|
||||
// userSupportedModelPricing 用户可见的定价字段白名单。
|
||||
type userSupportedModelPricing struct {
|
||||
BillingMode string `json:"billing_mode"`
|
||||
InputPrice *float64 `json:"input_price"`
|
||||
OutputPrice *float64 `json:"output_price"`
|
||||
CacheWritePrice *float64 `json:"cache_write_price"`
|
||||
CacheReadPrice *float64 `json:"cache_read_price"`
|
||||
ImageOutputPrice *float64 `json:"image_output_price"`
|
||||
PerRequestPrice *float64 `json:"per_request_price"`
|
||||
Intervals []userPricingIntervalDTO `json:"intervals"`
|
||||
}
|
||||
|
||||
// userPricingIntervalDTO 定价区间白名单（去掉内部 ID、SortOrder 等前端不渲染的字段）。
|
||||
type userPricingIntervalDTO struct {
|
||||
MinTokens int `json:"min_tokens"`
|
||||
MaxTokens *int `json:"max_tokens"`
|
||||
TierLabel string `json:"tier_label,omitempty"`
|
||||
InputPrice *float64 `json:"input_price"`
|
||||
OutputPrice *float64 `json:"output_price"`
|
||||
CacheWritePrice *float64 `json:"cache_write_price"`
|
||||
CacheReadPrice *float64 `json:"cache_read_price"`
|
||||
PerRequestPrice *float64 `json:"per_request_price"`
|
||||
}
|
||||
|
||||
// userSupportedModel 用户可见的支持模型条目。
|
||||
type userSupportedModel struct {
|
||||
Name string `json:"name"`
|
||||
Platform string `json:"platform"`
|
||||
Pricing *userSupportedModelPricing `json:"pricing"`
|
||||
}
|
||||
|
||||
// userAvailableChannel 用户可见的渠道条目（白名单字段）。
|
||||
type userAvailableChannel struct {
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
Groups []userAvailableGroup `json:"groups"`
|
||||
SupportedModels []userSupportedModel `json:"supported_models"`
|
||||
}
|
||||
|
||||
// List 列出当前用户可见的「可用渠道」。
|
||||
// GET /api/v1/channels/available
|
||||
func (h *AvailableChannelHandler) List(c *gin.Context) {
|
||||
subject, ok := middleware2.GetAuthSubjectFromContext(c)
|
||||
if !ok {
|
||||
response.Unauthorized(c, "User not authenticated")
|
||||
return
|
||||
}
|
||||
|
||||
userGroups, err := h.apiKeyService.GetAvailableGroups(c.Request.Context(), subject.UserID)
|
||||
if err != nil {
|
||||
response.ErrorFrom(c, err)
|
||||
return
|
||||
}
|
||||
allowedGroupIDs := make(map[int64]struct{}, len(userGroups))
|
||||
for i := range userGroups {
|
||||
allowedGroupIDs[userGroups[i].ID] = struct{}{}
|
||||
}
|
||||
|
||||
channels, err := h.channelService.ListAvailable(c.Request.Context())
|
||||
if err != nil {
|
||||
response.ErrorFrom(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
out := make([]userAvailableChannel, 0, len(channels))
|
||||
for _, ch := range channels {
|
||||
if ch.Status != service.StatusActive {
|
||||
continue
|
||||
}
|
||||
visibleGroups := filterUserVisibleGroups(ch.Groups, allowedGroupIDs)
|
||||
if len(visibleGroups) == 0 {
|
||||
continue
|
||||
}
|
||||
allowedPlatforms := collectGroupPlatforms(visibleGroups)
|
||||
out = append(out, userAvailableChannel{
|
||||
Name: ch.Name,
|
||||
Description: ch.Description,
|
||||
Groups: visibleGroups,
|
||||
SupportedModels: toUserSupportedModels(ch.SupportedModels, allowedPlatforms),
|
||||
})
|
||||
}
|
||||
|
||||
response.Success(c, out)
|
||||
}
|
||||
|
||||
// collectGroupPlatforms 聚合 visible groups 覆盖的平台集合，用于过滤 SupportedModels。
|
||||
func collectGroupPlatforms(groups []userAvailableGroup) map[string]struct{} {
|
||||
set := make(map[string]struct{}, len(groups))
|
||||
for _, g := range groups {
|
||||
if g.Platform == "" {
|
||||
continue
|
||||
}
|
||||
set[g.Platform] = struct{}{}
|
||||
}
|
||||
return set
|
||||
}
|
||||
|
||||
// filterUserVisibleGroups 仅保留用户可访问的分组。
|
||||
func filterUserVisibleGroups(
|
||||
groups []service.AvailableGroupRef,
|
||||
allowed map[int64]struct{},
|
||||
) []userAvailableGroup {
|
||||
visible := make([]userAvailableGroup, 0, len(groups))
|
||||
for _, g := range groups {
|
||||
if _, ok := allowed[g.ID]; !ok {
|
||||
continue
|
||||
}
|
||||
visible = append(visible, userAvailableGroup{
|
||||
ID: g.ID,
|
||||
Name: g.Name,
|
||||
Platform: g.Platform,
|
||||
})
|
||||
}
|
||||
return visible
|
||||
}
|
||||
|
||||
// toUserSupportedModels 将 service 层支持模型转换为用户 DTO（字段白名单）。
|
||||
// 仅保留平台在 allowedPlatforms 中的条目，防止跨平台模型信息泄漏。
|
||||
// allowedPlatforms 为 nil 时不做平台过滤（保留全部，供测试或明确无过滤场景使用）。
|
||||
func toUserSupportedModels(
|
||||
src []service.SupportedModel,
|
||||
allowedPlatforms map[string]struct{},
|
||||
) []userSupportedModel {
|
||||
out := make([]userSupportedModel, 0, len(src))
|
||||
for i := range src {
|
||||
m := src[i]
|
||||
if allowedPlatforms != nil {
|
||||
if _, ok := allowedPlatforms[m.Platform]; !ok {
|
||||
continue
|
||||
}
|
||||
}
|
||||
out = append(out, userSupportedModel{
|
||||
Name: m.Name,
|
||||
Platform: m.Platform,
|
||||
Pricing: toUserPricing(m.Pricing),
|
||||
})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// toUserPricing 将 service 层定价转换为用户 DTO；入参为 nil 时返回 nil。
|
||||
func toUserPricing(p *service.ChannelModelPricing) *userSupportedModelPricing {
|
||||
if p == nil {
|
||||
return nil
|
||||
}
|
||||
intervals := make([]userPricingIntervalDTO, 0, len(p.Intervals))
|
||||
for _, iv := range p.Intervals {
|
||||
intervals = append(intervals, userPricingIntervalDTO{
|
||||
MinTokens: iv.MinTokens,
|
||||
MaxTokens: iv.MaxTokens,
|
||||
TierLabel: iv.TierLabel,
|
||||
InputPrice: iv.InputPrice,
|
||||
OutputPrice: iv.OutputPrice,
|
||||
CacheWritePrice: iv.CacheWritePrice,
|
||||
CacheReadPrice: iv.CacheReadPrice,
|
||||
PerRequestPrice: iv.PerRequestPrice,
|
||||
})
|
||||
}
|
||||
billingMode := string(p.BillingMode)
|
||||
if billingMode == "" {
|
||||
billingMode = string(service.BillingModeToken)
|
||||
}
|
||||
return &userSupportedModelPricing{
|
||||
BillingMode: billingMode,
|
||||
InputPrice: p.InputPrice,
|
||||
OutputPrice: p.OutputPrice,
|
||||
CacheWritePrice: p.CacheWritePrice,
|
||||
CacheReadPrice: p.CacheReadPrice,
|
||||
ImageOutputPrice: p.ImageOutputPrice,
|
||||
PerRequestPrice: p.PerRequestPrice,
|
||||
Intervals: intervals,
|
||||
}
|
||||
}
|
||||
121
backend/internal/handler/available_channel_handler_test.go
Normal file
121
backend/internal/handler/available_channel_handler_test.go
Normal file
@@ -0,0 +1,121 @@
|
||||
//go:build unit
|
||||
|
||||
package handler
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"github.com/Wei-Shaw/sub2api/internal/service"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestUserAvailableChannel_Unauthenticated401(t *testing.T) {
|
||||
// 没有 AuthSubject 注入时，handler 应返回 401 且不触达 service 依赖。
|
||||
gin.SetMode(gin.TestMode)
|
||||
h := &AvailableChannelHandler{} // nil services — 401 路径不会调用它们
|
||||
w := httptest.NewRecorder()
|
||||
c, _ := gin.CreateTestContext(w)
|
||||
c.Request = httptest.NewRequest(http.MethodGet, "/api/v1/channels/available", nil)
|
||||
|
||||
h.List(c)
|
||||
|
||||
require.Equal(t, http.StatusUnauthorized, w.Code)
|
||||
}
|
||||
|
||||
func TestFilterUserVisibleGroups_IntersectionOnly(t *testing.T) {
|
||||
// 渠道挂在 {g1, g2, g3}，用户只允许 {g1, g3} —— 响应必须仅含 g1/g3。
|
||||
groups := []service.AvailableGroupRef{
|
||||
{ID: 1, Name: "g1", Platform: "anthropic"},
|
||||
{ID: 2, Name: "g2", Platform: "anthropic"},
|
||||
{ID: 3, Name: "g3", Platform: "openai"},
|
||||
}
|
||||
allowed := map[int64]struct{}{1: {}, 3: {}}
|
||||
|
||||
visible := filterUserVisibleGroups(groups, allowed)
|
||||
require.Len(t, visible, 2)
|
||||
ids := []int64{visible[0].ID, visible[1].ID}
|
||||
require.ElementsMatch(t, []int64{1, 3}, ids)
|
||||
}
|
||||
|
||||
func TestCollectGroupPlatforms_DerivesAllowedSet(t *testing.T) {
|
||||
groups := []userAvailableGroup{
|
||||
{ID: 1, Platform: "anthropic"},
|
||||
{ID: 2, Platform: "openai"},
|
||||
{ID: 3, Platform: "anthropic"}, // 去重
|
||||
{ID: 4, Platform: ""}, // 空平台忽略
|
||||
}
|
||||
got := collectGroupPlatforms(groups)
|
||||
require.Len(t, got, 2)
|
||||
_, hasAnt := got["anthropic"]
|
||||
_, hasOA := got["openai"]
|
||||
require.True(t, hasAnt)
|
||||
require.True(t, hasOA)
|
||||
}
|
||||
|
||||
func TestToUserSupportedModels_FiltersByAllowedPlatforms(t *testing.T) {
|
||||
// 用户可访问分组只覆盖 anthropic；anthropic 平台的模型保留，openai 模型被剔除。
|
||||
src := []service.SupportedModel{
|
||||
{Name: "claude-sonnet-4-6", Platform: "anthropic", Pricing: nil},
|
||||
{Name: "gpt-4o", Platform: "openai", Pricing: nil},
|
||||
}
|
||||
allowed := map[string]struct{}{"anthropic": {}}
|
||||
out := toUserSupportedModels(src, allowed)
|
||||
require.Len(t, out, 1)
|
||||
require.Equal(t, "claude-sonnet-4-6", out[0].Name)
|
||||
}
|
||||
|
||||
func TestToUserSupportedModels_NilAllowedPlatformsKeepsAll(t *testing.T) {
|
||||
// 显式传 nil allowedPlatforms 表示不做过滤。
|
||||
src := []service.SupportedModel{
|
||||
{Name: "a", Platform: "anthropic"},
|
||||
{Name: "b", Platform: "openai"},
|
||||
}
|
||||
require.Len(t, toUserSupportedModels(src, nil), 2)
|
||||
}
|
||||
|
||||
func TestUserAvailableChannel_FieldWhitelist(t *testing.T) {
|
||||
// 通过序列化 userAvailableChannel 结构体验证响应形状：
|
||||
// 只有 name / description / groups / supported_models；不含管理端字段。
|
||||
row := userAvailableChannel{
|
||||
Name: "ch",
|
||||
Description: "d",
|
||||
Groups: []userAvailableGroup{{ID: 1, Name: "g1", Platform: "anthropic"}},
|
||||
SupportedModels: []userSupportedModel{},
|
||||
}
|
||||
raw, err := json.Marshal(row)
|
||||
require.NoError(t, err)
|
||||
var decoded map[string]any
|
||||
require.NoError(t, json.Unmarshal(raw, &decoded))
|
||||
|
||||
for _, key := range []string{"id", "status", "billing_model_source", "restrict_models"} {
|
||||
_, exists := decoded[key]
|
||||
require.Falsef(t, exists, "user DTO must not expose %q", key)
|
||||
}
|
||||
for _, key := range []string{"name", "description", "groups", "supported_models"} {
|
||||
_, exists := decoded[key]
|
||||
require.Truef(t, exists, "user DTO must expose %q", key)
|
||||
}
|
||||
|
||||
// pricing interval 白名单：不应暴露 id / sort_order。
|
||||
pricing := toUserPricing(&service.ChannelModelPricing{
|
||||
BillingMode: service.BillingModeToken,
|
||||
Intervals: []service.PricingInterval{
|
||||
{ID: 7, MinTokens: 0, MaxTokens: nil, SortOrder: 3},
|
||||
},
|
||||
})
|
||||
require.NotNil(t, pricing)
|
||||
require.Len(t, pricing.Intervals, 1)
|
||||
rawIv, err := json.Marshal(pricing.Intervals[0])
|
||||
require.NoError(t, err)
|
||||
var ivDecoded map[string]any
|
||||
require.NoError(t, json.Unmarshal(rawIv, &ivDecoded))
|
||||
for _, key := range []string{"id", "pricing_id", "sort_order"} {
|
||||
_, exists := ivDecoded[key]
|
||||
require.Falsef(t, exists, "user pricing interval must not expose %q", key)
|
||||
}
|
||||
}
|
||||
@@ -33,26 +33,28 @@ type AdminHandlers struct {
|
||||
Channel *admin.ChannelHandler
|
||||
ChannelMonitor *admin.ChannelMonitorHandler
|
||||
ChannelMonitorTemplate *admin.ChannelMonitorRequestTemplateHandler
|
||||
AvailableChannel *admin.AvailableChannelHandler
|
||||
Payment *admin.PaymentHandler
|
||||
}
|
||||
|
||||
// Handlers contains all HTTP handlers
|
||||
type Handlers struct {
|
||||
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
|
||||
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
|
||||
}
|
||||
|
||||
// BuildInfo contains build-time information
|
||||
|
||||
@@ -36,6 +36,7 @@ func ProvideAdminHandlers(
|
||||
channelHandler *admin.ChannelHandler,
|
||||
channelMonitorHandler *admin.ChannelMonitorHandler,
|
||||
channelMonitorTemplateHandler *admin.ChannelMonitorRequestTemplateHandler,
|
||||
availableChannelHandler *admin.AvailableChannelHandler,
|
||||
paymentHandler *admin.PaymentHandler,
|
||||
) *AdminHandlers {
|
||||
return &AdminHandlers{
|
||||
@@ -66,6 +67,7 @@ func ProvideAdminHandlers(
|
||||
Channel: channelHandler,
|
||||
ChannelMonitor: channelMonitorHandler,
|
||||
ChannelMonitorTemplate: channelMonitorTemplateHandler,
|
||||
AvailableChannel: availableChannelHandler,
|
||||
Payment: paymentHandler,
|
||||
}
|
||||
}
|
||||
@@ -97,25 +99,27 @@ func ProvideHandlers(
|
||||
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,
|
||||
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,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,6 +140,7 @@ var ProviderSet = wire.NewSet(
|
||||
ProvideSettingHandler,
|
||||
NewPaymentHandler,
|
||||
NewPaymentWebhookHandler,
|
||||
NewAvailableChannelHandler,
|
||||
|
||||
// Admin handlers
|
||||
admin.NewDashboardHandler,
|
||||
@@ -165,6 +170,7 @@ var ProviderSet = wire.NewSet(
|
||||
admin.NewChannelHandler,
|
||||
admin.NewChannelMonitorHandler,
|
||||
admin.NewChannelMonitorRequestTemplateHandler,
|
||||
admin.NewAvailableChannelHandler,
|
||||
admin.NewPaymentHandler,
|
||||
|
||||
// AdminHandlers and Handlers constructors
|
||||
|
||||
Reference in New Issue
Block a user