Files
new-api/model/user_update_test.go
T
Calcium-Ion 86ac0f7745 refactor: extract protocol conversion layer into standalone relaykit module (#6369)
* test(relayconvert): add golden snapshot matrix and relaykit boundary guard

Phase 0 of the relaykit extraction plan: pin byte-level output of every
registered (from,to) request/response/stream conversion route, and
forbid kit-bound packages from growing host-only imports.

* wip(relayconvert): drop gin.Context from converter signatures; add convmeta draft

Phase 1 in progress: relayconvert now takes context.Context; host media
resolver adapts gin.Context back at the service boundary.

* refactor(relayconvert): decouple converters from RelayInfo, gin, and settings

Phase 1 of the relaykit extraction plan:
- converters now depend on convmeta.Meta (implemented by RelayInfo) instead
  of *relaycommon.RelayInfo; ClaudeConvertInfo and the format guesser move
  to convmeta with aliases left behind
- host settings reach converters via a convmeta.Options snapshot built in
  RelayInfo.ConvOptions; no more model_setting/reasoning global reads inside
  the conversion layer
- effort-suffix helpers move to service/relayconvert/reasoning (old package
  forwards); chat-to-responses upgrade policy moves to service (host routing
  logic, not conversion)
- golden conversion matrix unchanged

* test(relayconvert): tighten boundary — kit packages now free of gin/setting imports

* refactor(dto): drop gin and logger dependencies

Phase 2 (part 1): dto.Request.IsStream now takes *http.Request instead of
*gin.Context (Gemini's impl reads query/path off the std request); dto's
three logger calls become common.SysError. Boundary test allowlist is now
empty — kit-bound packages import no gin/setting/logger/model.

* refactor(kit): extract dependency-free kitutil; dto/types/relayconvert stop importing common

Phase 2 of the relaykit extraction plan:
- new service/relayconvert/kitutil holds the pure helpers the kit needs
  (JSON wrappers, pointer/string/uuid/timestamp utils, MaskSensitiveInfo,
  pluggable LogInfo/LogError hooks, Debug flag)
- dto, types, and all relayconvert packages now use kitutil; their only
  remaining internal deps are dto/types/constant
- common keeps every original symbol (MaskSensitiveInfo delegates to
  kitutil) so host code is untouched; main.go routes kit logging into
  common.SysLog/SysError and mirrors DebugEnabled
- golden conversion matrix unchanged

* refactor(kit): move EndpointType/FinishReason to types; OpenRouter dialect via Options

Kit packages (dto/types/relayconvert/reasonmap) no longer import constant:
- EndpointType and finish-reason values live in types; constant re-exports
- the OpenRouter special-case in claude->openai request conversion reads
  Options.OpenRouterDialect, set by the host from the channel type;
  InitChannelMeta invalidates the cached snapshot on channel switch

* refactor: extract relaykit submodule (dto/types/relayconvert/reasonmap)

Phase 3 of the relaykit extraction plan:
- new go module github.com/QuantumNous/new-api/relaykit containing dto
  (minus task family), types, relayconvert (with convmeta/kitutil/reasoning),
  and reasonmap; host consumes it via require + replace, go.work for dev
- task-family dto (task/suno/midjourney/video) stays in the host dto
  package; dual-consumer host files alias it as taskdto
- relaykit builds and tests standalone (GOWORK=off): no host imports,
  no gin, no DB, no settings
- golden conversion matrix unchanged

* build(docker): copy relaykit/go.mod before go mod download

The local-replace submodule's go.mod must exist inside the build context
for the main module graph to resolve.

* fix: address relaykit extraction regressions

* fix: address relaykit review regressions

* docs: document Meta nil receiver contract

* fix(relaykit): fail OpenAI→Claude conversion without max_tokens; reject negative default_max_tokens

The Claude Messages API requires max_tokens (omitting it is a 400
"Field required"), but with a nil Options.Claude.DefaultMaxTokens hook
the converters silently emitted a request the upstream is guaranteed to
reject. Both OpenAI Chat and Responses → Claude conversions now return
sharedclaude.ErrMissingMaxTokens when no path (client value, default
hook, thinking-adapter floor) supplied one. Unreachable in the host,
which always configures the hook.

Host side, claude.default_max_tokens now rejects negative values at the
option API before persisting — they would wrap into huge unsigned values
during conversion. Zero stays allowed: the current API treats
max_tokens: 0 as cache pre-warming.

* fix: make Gemini safety settings read path race-free
2026-07-27 15:56:21 +08:00

221 lines
6.0 KiB
Go

package model
import (
"errors"
"testing"
"github.com/QuantumNous/new-api/common"
"github.com/QuantumNous/new-api/relaykit/dto"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
)
func setupUserUpdateTestState(t *testing.T) {
t.Helper()
truncateTables(t)
require.NoError(t, DB.Exec("DELETE FROM users").Error)
oldRedisEnabled := common.RedisEnabled
oldBatchUpdateEnabled := common.BatchUpdateEnabled
common.RedisEnabled = false
common.BatchUpdateEnabled = false
t.Cleanup(func() {
common.RedisEnabled = oldRedisEnabled
common.BatchUpdateEnabled = oldBatchUpdateEnabled
})
}
func TestUserUpdateDoesNotOverwriteAccountingFields(t *testing.T) {
setupUserUpdateTestState(t)
user := User{
Id: 1,
Username: "quota-race-user",
Password: "password",
DisplayName: "before",
Status: common.UserStatusEnabled,
Quota: 1000,
UsedQuota: 20,
RequestCount: 3,
}
require.NoError(t, DB.Create(&user).Error)
staleUser, err := GetUserById(user.Id, true)
require.NoError(t, err)
require.NoError(t, DB.Model(&User{}).Where("id = ?", user.Id).Updates(map[string]interface{}{
"quota": gorm.Expr("quota - ?", 400),
"used_quota": gorm.Expr("used_quota + ?", 400),
"request_count": gorm.Expr("request_count + ?", 1),
}).Error)
staleUser.DisplayName = "after"
require.NoError(t, staleUser.Update(false))
var got User
require.NoError(t, DB.First(&got, user.Id).Error)
assert.Equal(t, "after", got.DisplayName)
assert.Equal(t, 600, got.Quota)
assert.Equal(t, 420, got.UsedQuota)
assert.Equal(t, 4, got.RequestCount)
}
func TestUpdateUserSettingOnlyUpdatesSetting(t *testing.T) {
setupUserUpdateTestState(t)
user := User{
Id: 2,
Username: "setting-user",
Password: "password",
Status: common.UserStatusEnabled,
Quota: 1000,
UsedQuota: 20,
RequestCount: 3,
}
require.NoError(t, DB.Create(&user).Error)
require.NoError(t, DB.Model(&User{}).Where("id = ?", user.Id).Updates(map[string]interface{}{
"quota": gorm.Expr("quota - ?", 250),
"used_quota": gorm.Expr("used_quota + ?", 250),
"request_count": gorm.Expr("request_count + ?", 1),
}).Error)
require.NoError(t, UpdateUserSetting(user.Id, dto.UserSetting{Language: "zh"}))
var got User
require.NoError(t, DB.First(&got, user.Id).Error)
assert.Equal(t, 750, got.Quota)
assert.Equal(t, 270, got.UsedQuota)
assert.Equal(t, 4, got.RequestCount)
assert.Equal(t, "zh", got.GetSetting().Language)
}
func TestEnsureEmailAvailableRejectsExistingEmailCaseInsensitive(t *testing.T) {
setupUserUpdateTestState(t)
require.NoError(t, DB.Create(&User{
Username: "existing",
Password: "old-password",
Email: "Taken@Example.com",
Status: common.UserStatusEnabled,
}).Error)
err := EnsureEmailAvailable(" taken@example.COM ", 0)
require.ErrorIs(t, err, ErrEmailAlreadyTaken)
user, err := GetUniqueUserByEmail("TAKEN@example.com")
require.NoError(t, err)
assert.Equal(t, "existing", user.Username)
require.NoError(t, EnsureEmailAvailable("taken@example.com", user.Id))
}
func TestInsertRejectsDuplicateEmailWithoutUniqueIndex(t *testing.T) {
setupUserUpdateTestState(t)
require.NoError(t, DB.Create(&User{
Username: "existing",
Password: "old-password",
Email: "taken@example.com",
Status: common.UserStatusEnabled,
}).Error)
user := &User{
Username: "oauth-user",
Email: "TAKEN@example.com",
Role: common.RoleCommonUser,
Status: common.UserStatusEnabled,
}
err := user.Insert(0)
require.ErrorIs(t, err, ErrEmailAlreadyTaken)
var count int64
require.NoError(t, DB.Model(&User{}).Where("username = ?", "oauth-user").Count(&count).Error)
assert.Zero(t, count)
}
func TestInsertKeepsBlankPasswordForPasswordlessUser(t *testing.T) {
setupUserUpdateTestState(t)
user := &User{
Username: "passwordless-user",
Role: common.RoleCommonUser,
Status: common.UserStatusEnabled,
}
require.NoError(t, user.Insert(0))
var stored User
require.NoError(t, DB.Where("username = ?", user.Username).First(&stored).Error)
assert.Empty(t, stored.Password)
}
func TestValidateAndFillRejectsPasswordlessUser(t *testing.T) {
setupUserUpdateTestState(t)
require.NoError(t, DB.Create(&User{
Username: "passwordless-user",
Password: "",
Status: common.UserStatusEnabled,
}).Error)
loginUser := User{
Username: "passwordless-user",
Password: "NewPassword123",
}
err := loginUser.ValidateAndFill()
require.ErrorIs(t, err, ErrInvalidCredentials)
var stored User
require.NoError(t, DB.Where("username = ?", "passwordless-user").First(&stored).Error)
assert.Empty(t, stored.Password)
}
func TestResetUserPasswordByEmailRequiresSingleActiveMatch(t *testing.T) {
setupUserUpdateTestState(t)
require.NoError(t, DB.Create(&User{
Username: "duplicate-1",
Password: "old-1",
Email: "legacy@example.com",
AffCode: "dupe1",
Status: common.UserStatusEnabled,
}).Error)
require.NoError(t, DB.Create(&User{
Username: "duplicate-2",
Password: "old-2",
Email: "LEGACY@example.com",
AffCode: "dupe2",
Status: common.UserStatusEnabled,
}).Error)
err := ResetUserPasswordByEmail("legacy@example.com", "NewPassword123")
require.ErrorIs(t, err, ErrEmailAmbiguous)
var duplicates []User
require.NoError(t, DB.Where("LOWER(email) = ?", "legacy@example.com").Order("username asc").Find(&duplicates).Error)
require.Len(t, duplicates, 2)
assert.Equal(t, "old-1", duplicates[0].Password)
assert.Equal(t, "old-2", duplicates[1].Password)
require.NoError(t, DB.Create(&User{
Username: "unique",
Password: "old",
Email: "unique@example.com",
AffCode: "unique",
Status: common.UserStatusEnabled,
}).Error)
require.NoError(t, ResetUserPasswordByEmail("UNIQUE@example.com", "NewPassword123"))
var unique User
require.NoError(t, DB.Where("username = ?", "unique").First(&unique).Error)
assert.True(t, common.ValidatePasswordAndHash("NewPassword123", unique.Password))
err = ResetUserPasswordByEmail("missing@example.com", "NewPassword123")
require.True(t, errors.Is(err, ErrEmailNotFound))
}