a42105881f
- Add claude_code_only field to restrict groups to Claude Code clients only - Add fallback_group_id for non-Claude Code requests to use alternate group - Implement ClaudeCodeValidator for User-Agent detection - Add group-level session binding isolation (groupID in Redis key) - Prevent cross-group sticky session pollution - Update frontend with Claude Code restriction controls
365 lines
10 KiB
Go
365 lines
10 KiB
Go
// Package dto provides data transfer objects for HTTP handlers.
|
|
package dto
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
)
|
|
|
|
func UserFromServiceShallow(u *service.User) *User {
|
|
if u == nil {
|
|
return nil
|
|
}
|
|
return &User{
|
|
ID: u.ID,
|
|
Email: u.Email,
|
|
Username: u.Username,
|
|
Notes: u.Notes,
|
|
Role: u.Role,
|
|
Balance: u.Balance,
|
|
Concurrency: u.Concurrency,
|
|
Status: u.Status,
|
|
AllowedGroups: u.AllowedGroups,
|
|
CreatedAt: u.CreatedAt,
|
|
UpdatedAt: u.UpdatedAt,
|
|
}
|
|
}
|
|
|
|
func UserFromService(u *service.User) *User {
|
|
if u == nil {
|
|
return nil
|
|
}
|
|
out := UserFromServiceShallow(u)
|
|
if len(u.APIKeys) > 0 {
|
|
out.APIKeys = make([]APIKey, 0, len(u.APIKeys))
|
|
for i := range u.APIKeys {
|
|
k := u.APIKeys[i]
|
|
out.APIKeys = append(out.APIKeys, *APIKeyFromService(&k))
|
|
}
|
|
}
|
|
if len(u.Subscriptions) > 0 {
|
|
out.Subscriptions = make([]UserSubscription, 0, len(u.Subscriptions))
|
|
for i := range u.Subscriptions {
|
|
s := u.Subscriptions[i]
|
|
out.Subscriptions = append(out.Subscriptions, *UserSubscriptionFromService(&s))
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func APIKeyFromService(k *service.APIKey) *APIKey {
|
|
if k == nil {
|
|
return nil
|
|
}
|
|
return &APIKey{
|
|
ID: k.ID,
|
|
UserID: k.UserID,
|
|
Key: k.Key,
|
|
Name: k.Name,
|
|
GroupID: k.GroupID,
|
|
Status: k.Status,
|
|
CreatedAt: k.CreatedAt,
|
|
UpdatedAt: k.UpdatedAt,
|
|
User: UserFromServiceShallow(k.User),
|
|
Group: GroupFromServiceShallow(k.Group),
|
|
}
|
|
}
|
|
|
|
func GroupFromServiceShallow(g *service.Group) *Group {
|
|
if g == nil {
|
|
return nil
|
|
}
|
|
return &Group{
|
|
ID: g.ID,
|
|
Name: g.Name,
|
|
Description: g.Description,
|
|
Platform: g.Platform,
|
|
RateMultiplier: g.RateMultiplier,
|
|
IsExclusive: g.IsExclusive,
|
|
Status: g.Status,
|
|
SubscriptionType: g.SubscriptionType,
|
|
DailyLimitUSD: g.DailyLimitUSD,
|
|
WeeklyLimitUSD: g.WeeklyLimitUSD,
|
|
MonthlyLimitUSD: g.MonthlyLimitUSD,
|
|
ImagePrice1K: g.ImagePrice1K,
|
|
ImagePrice2K: g.ImagePrice2K,
|
|
ImagePrice4K: g.ImagePrice4K,
|
|
ClaudeCodeOnly: g.ClaudeCodeOnly,
|
|
FallbackGroupID: g.FallbackGroupID,
|
|
CreatedAt: g.CreatedAt,
|
|
UpdatedAt: g.UpdatedAt,
|
|
AccountCount: g.AccountCount,
|
|
}
|
|
}
|
|
|
|
func GroupFromService(g *service.Group) *Group {
|
|
if g == nil {
|
|
return nil
|
|
}
|
|
out := GroupFromServiceShallow(g)
|
|
if len(g.AccountGroups) > 0 {
|
|
out.AccountGroups = make([]AccountGroup, 0, len(g.AccountGroups))
|
|
for i := range g.AccountGroups {
|
|
ag := g.AccountGroups[i]
|
|
out.AccountGroups = append(out.AccountGroups, *AccountGroupFromService(&ag))
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func AccountFromServiceShallow(a *service.Account) *Account {
|
|
if a == nil {
|
|
return nil
|
|
}
|
|
return &Account{
|
|
ID: a.ID,
|
|
Name: a.Name,
|
|
Notes: a.Notes,
|
|
Platform: a.Platform,
|
|
Type: a.Type,
|
|
Credentials: a.Credentials,
|
|
Extra: a.Extra,
|
|
ProxyID: a.ProxyID,
|
|
Concurrency: a.Concurrency,
|
|
Priority: a.Priority,
|
|
Status: a.Status,
|
|
ErrorMessage: a.ErrorMessage,
|
|
LastUsedAt: a.LastUsedAt,
|
|
ExpiresAt: timeToUnixSeconds(a.ExpiresAt),
|
|
AutoPauseOnExpired: a.AutoPauseOnExpired,
|
|
CreatedAt: a.CreatedAt,
|
|
UpdatedAt: a.UpdatedAt,
|
|
Schedulable: a.Schedulable,
|
|
RateLimitedAt: a.RateLimitedAt,
|
|
RateLimitResetAt: a.RateLimitResetAt,
|
|
OverloadUntil: a.OverloadUntil,
|
|
TempUnschedulableUntil: a.TempUnschedulableUntil,
|
|
TempUnschedulableReason: a.TempUnschedulableReason,
|
|
SessionWindowStart: a.SessionWindowStart,
|
|
SessionWindowEnd: a.SessionWindowEnd,
|
|
SessionWindowStatus: a.SessionWindowStatus,
|
|
GroupIDs: a.GroupIDs,
|
|
}
|
|
}
|
|
|
|
func AccountFromService(a *service.Account) *Account {
|
|
if a == nil {
|
|
return nil
|
|
}
|
|
out := AccountFromServiceShallow(a)
|
|
out.Proxy = ProxyFromService(a.Proxy)
|
|
if len(a.AccountGroups) > 0 {
|
|
out.AccountGroups = make([]AccountGroup, 0, len(a.AccountGroups))
|
|
for i := range a.AccountGroups {
|
|
ag := a.AccountGroups[i]
|
|
out.AccountGroups = append(out.AccountGroups, *AccountGroupFromService(&ag))
|
|
}
|
|
}
|
|
if len(a.Groups) > 0 {
|
|
out.Groups = make([]*Group, 0, len(a.Groups))
|
|
for _, g := range a.Groups {
|
|
out.Groups = append(out.Groups, GroupFromServiceShallow(g))
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func timeToUnixSeconds(value *time.Time) *int64 {
|
|
if value == nil {
|
|
return nil
|
|
}
|
|
ts := value.Unix()
|
|
return &ts
|
|
}
|
|
|
|
func AccountGroupFromService(ag *service.AccountGroup) *AccountGroup {
|
|
if ag == nil {
|
|
return nil
|
|
}
|
|
return &AccountGroup{
|
|
AccountID: ag.AccountID,
|
|
GroupID: ag.GroupID,
|
|
Priority: ag.Priority,
|
|
CreatedAt: ag.CreatedAt,
|
|
Account: AccountFromServiceShallow(ag.Account),
|
|
Group: GroupFromServiceShallow(ag.Group),
|
|
}
|
|
}
|
|
|
|
func ProxyFromService(p *service.Proxy) *Proxy {
|
|
if p == nil {
|
|
return nil
|
|
}
|
|
return &Proxy{
|
|
ID: p.ID,
|
|
Name: p.Name,
|
|
Protocol: p.Protocol,
|
|
Host: p.Host,
|
|
Port: p.Port,
|
|
Username: p.Username,
|
|
Password: p.Password,
|
|
Status: p.Status,
|
|
CreatedAt: p.CreatedAt,
|
|
UpdatedAt: p.UpdatedAt,
|
|
}
|
|
}
|
|
|
|
func ProxyWithAccountCountFromService(p *service.ProxyWithAccountCount) *ProxyWithAccountCount {
|
|
if p == nil {
|
|
return nil
|
|
}
|
|
return &ProxyWithAccountCount{
|
|
Proxy: *ProxyFromService(&p.Proxy),
|
|
AccountCount: p.AccountCount,
|
|
}
|
|
}
|
|
|
|
func RedeemCodeFromService(rc *service.RedeemCode) *RedeemCode {
|
|
if rc == nil {
|
|
return nil
|
|
}
|
|
return &RedeemCode{
|
|
ID: rc.ID,
|
|
Code: rc.Code,
|
|
Type: rc.Type,
|
|
Value: rc.Value,
|
|
Status: rc.Status,
|
|
UsedBy: rc.UsedBy,
|
|
UsedAt: rc.UsedAt,
|
|
Notes: rc.Notes,
|
|
CreatedAt: rc.CreatedAt,
|
|
GroupID: rc.GroupID,
|
|
ValidityDays: rc.ValidityDays,
|
|
User: UserFromServiceShallow(rc.User),
|
|
Group: GroupFromServiceShallow(rc.Group),
|
|
}
|
|
}
|
|
|
|
// AccountSummaryFromService returns a minimal AccountSummary for usage log display.
|
|
// Only includes ID and Name - no sensitive fields like Credentials, Proxy, etc.
|
|
func AccountSummaryFromService(a *service.Account) *AccountSummary {
|
|
if a == nil {
|
|
return nil
|
|
}
|
|
return &AccountSummary{
|
|
ID: a.ID,
|
|
Name: a.Name,
|
|
}
|
|
}
|
|
|
|
// usageLogFromServiceBase is a helper that converts service UsageLog to DTO.
|
|
// The account parameter allows caller to control what Account info is included.
|
|
func usageLogFromServiceBase(l *service.UsageLog, account *AccountSummary) *UsageLog {
|
|
if l == nil {
|
|
return nil
|
|
}
|
|
return &UsageLog{
|
|
ID: l.ID,
|
|
UserID: l.UserID,
|
|
APIKeyID: l.APIKeyID,
|
|
AccountID: l.AccountID,
|
|
RequestID: l.RequestID,
|
|
Model: l.Model,
|
|
GroupID: l.GroupID,
|
|
SubscriptionID: l.SubscriptionID,
|
|
InputTokens: l.InputTokens,
|
|
OutputTokens: l.OutputTokens,
|
|
CacheCreationTokens: l.CacheCreationTokens,
|
|
CacheReadTokens: l.CacheReadTokens,
|
|
CacheCreation5mTokens: l.CacheCreation5mTokens,
|
|
CacheCreation1hTokens: l.CacheCreation1hTokens,
|
|
InputCost: l.InputCost,
|
|
OutputCost: l.OutputCost,
|
|
CacheCreationCost: l.CacheCreationCost,
|
|
CacheReadCost: l.CacheReadCost,
|
|
TotalCost: l.TotalCost,
|
|
ActualCost: l.ActualCost,
|
|
RateMultiplier: l.RateMultiplier,
|
|
BillingType: l.BillingType,
|
|
Stream: l.Stream,
|
|
DurationMs: l.DurationMs,
|
|
FirstTokenMs: l.FirstTokenMs,
|
|
ImageCount: l.ImageCount,
|
|
ImageSize: l.ImageSize,
|
|
UserAgent: l.UserAgent,
|
|
CreatedAt: l.CreatedAt,
|
|
User: UserFromServiceShallow(l.User),
|
|
APIKey: APIKeyFromService(l.APIKey),
|
|
Account: account,
|
|
Group: GroupFromServiceShallow(l.Group),
|
|
Subscription: UserSubscriptionFromService(l.Subscription),
|
|
}
|
|
}
|
|
|
|
// UsageLogFromService converts a service UsageLog to DTO for regular users.
|
|
// It excludes Account details - users should not see account information.
|
|
func UsageLogFromService(l *service.UsageLog) *UsageLog {
|
|
return usageLogFromServiceBase(l, nil)
|
|
}
|
|
|
|
// UsageLogFromServiceAdmin converts a service UsageLog to DTO for admin users.
|
|
// It includes minimal Account info (ID, Name only).
|
|
func UsageLogFromServiceAdmin(l *service.UsageLog) *UsageLog {
|
|
if l == nil {
|
|
return nil
|
|
}
|
|
return usageLogFromServiceBase(l, AccountSummaryFromService(l.Account))
|
|
}
|
|
|
|
func SettingFromService(s *service.Setting) *Setting {
|
|
if s == nil {
|
|
return nil
|
|
}
|
|
return &Setting{
|
|
ID: s.ID,
|
|
Key: s.Key,
|
|
Value: s.Value,
|
|
UpdatedAt: s.UpdatedAt,
|
|
}
|
|
}
|
|
|
|
func UserSubscriptionFromService(sub *service.UserSubscription) *UserSubscription {
|
|
if sub == nil {
|
|
return nil
|
|
}
|
|
return &UserSubscription{
|
|
ID: sub.ID,
|
|
UserID: sub.UserID,
|
|
GroupID: sub.GroupID,
|
|
StartsAt: sub.StartsAt,
|
|
ExpiresAt: sub.ExpiresAt,
|
|
Status: sub.Status,
|
|
DailyWindowStart: sub.DailyWindowStart,
|
|
WeeklyWindowStart: sub.WeeklyWindowStart,
|
|
MonthlyWindowStart: sub.MonthlyWindowStart,
|
|
DailyUsageUSD: sub.DailyUsageUSD,
|
|
WeeklyUsageUSD: sub.WeeklyUsageUSD,
|
|
MonthlyUsageUSD: sub.MonthlyUsageUSD,
|
|
AssignedBy: sub.AssignedBy,
|
|
AssignedAt: sub.AssignedAt,
|
|
Notes: sub.Notes,
|
|
CreatedAt: sub.CreatedAt,
|
|
UpdatedAt: sub.UpdatedAt,
|
|
User: UserFromServiceShallow(sub.User),
|
|
Group: GroupFromServiceShallow(sub.Group),
|
|
AssignedByUser: UserFromServiceShallow(sub.AssignedByUser),
|
|
}
|
|
}
|
|
|
|
func BulkAssignResultFromService(r *service.BulkAssignResult) *BulkAssignResult {
|
|
if r == nil {
|
|
return nil
|
|
}
|
|
subs := make([]UserSubscription, 0, len(r.Subscriptions))
|
|
for i := range r.Subscriptions {
|
|
subs = append(subs, *UserSubscriptionFromService(&r.Subscriptions[i]))
|
|
}
|
|
return &BulkAssignResult{
|
|
SuccessCount: r.SuccessCount,
|
|
FailedCount: r.FailedCount,
|
|
Subscriptions: subs,
|
|
Errors: r.Errors,
|
|
}
|
|
}
|