Calcium-Ion
0ab0202060
* feat(token): support custom auto group order * feat(keys): enhance auto group presentation * fix(keys): rework Auto flow border and compact inherited order The Auto group highlight previously tinted the whole control surface with a gradient and animated only a 1px top sweep, which read as a background color rather than a flowing border. Replace it with a border-only effect: an aria-hidden, pointer-events-none overlay whose conic gradient is masked down to a thin ring hugging the rounded perimeter, so the highlight travels around all four edges and corners every 3.2s. The interior stays neutral with a restrained static primary border and glow; prefers-reduced-motion hides the moving layer while keeping the static emphasis. The inherited global Auto order also rendered as spacious two-line rows with circular sequence markers, wasting drawer space. Render it as a compact wrapping strip of one-line chips (index, name, ratio badge) with descriptions kept accessible via title and sr-only text, scrolling only past a much smaller max height. Custom add/remove/reorder editing, empty-array inheritance semantics, and the submit payload are unchanged. * fix(keys): preserve Auto inheritance and unify effects * refactor(keys): temporarily disable AutoGroupBadge in api-key-group-cell
73 lines
2.7 KiB
Go
73 lines
2.7 KiB
Go
package service
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/setting"
|
|
"github.com/QuantumNous/new-api/setting/ratio_setting"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func configureRequestAutoGroupsTest(t *testing.T) {
|
|
t.Helper()
|
|
originalMax := setting.GetMaxTokenAutoGroups()
|
|
originalAutoGroups := setting.AutoGroups2JsonString()
|
|
originalUsableGroups := setting.UserUsableGroups2JSONString()
|
|
originalRatios := ratio_setting.GroupRatio2JSONString()
|
|
require.NoError(t, setting.UpdateMaxTokenAutoGroups("2"))
|
|
require.NoError(t, setting.UpdateAutoGroupsByJsonString(`["vip","default","svip"]`))
|
|
require.NoError(t, setting.UpdateUserUsableGroupsByJSONString(`{"default":"Default","vip":"VIP","svip":"SVIP"}`))
|
|
require.NoError(t, ratio_setting.UpdateGroupRatioByJSONString(`{"default":1,"vip":1,"svip":1}`))
|
|
t.Cleanup(func() {
|
|
require.NoError(t, setting.UpdateMaxTokenAutoGroups(fmt.Sprintf("%d", originalMax)))
|
|
require.NoError(t, setting.UpdateAutoGroupsByJsonString(originalAutoGroups))
|
|
require.NoError(t, setting.UpdateUserUsableGroupsByJSONString(originalUsableGroups))
|
|
require.NoError(t, ratio_setting.UpdateGroupRatioByJSONString(originalRatios))
|
|
})
|
|
}
|
|
|
|
func newRequestAutoGroupsContext() *gin.Context {
|
|
gin.SetMode(gin.TestMode)
|
|
ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
return ctx
|
|
}
|
|
|
|
func TestGetRequestAutoGroupsInheritedListIsNotLimited(t *testing.T) {
|
|
configureRequestAutoGroupsTest(t)
|
|
ctx := newRequestAutoGroupsContext()
|
|
|
|
groups := GetRequestAutoGroups(ctx, "default")
|
|
|
|
assert.Equal(t, []string{"vip", "default", "svip"}, groups)
|
|
}
|
|
|
|
func TestGetRequestAutoGroupsFiltersBeforeApplyingCurrentLimit(t *testing.T) {
|
|
configureRequestAutoGroupsTest(t)
|
|
ctx := newRequestAutoGroupsContext()
|
|
common.SetContextKey(ctx, constant.ContextKeyTokenAutoGroups, []string{"revoked", "vip", "default", "svip"})
|
|
require.NoError(t, setting.UpdateAutoGroupsByJsonString(`[]`))
|
|
|
|
groups := GetRequestAutoGroups(ctx, "default")
|
|
|
|
assert.Equal(t, []string{"vip", "default"}, groups)
|
|
require.NoError(t, setting.UpdateMaxTokenAutoGroups("1"))
|
|
assert.Equal(t, []string{"vip"}, GetRequestAutoGroups(ctx, "default"))
|
|
}
|
|
|
|
func TestGetRequestAutoGroupsDoesNotFallBackAfterPermissionChange(t *testing.T) {
|
|
configureRequestAutoGroupsTest(t)
|
|
ctx := newRequestAutoGroupsContext()
|
|
common.SetContextKey(ctx, constant.ContextKeyTokenAutoGroups, []string{"vip"})
|
|
require.NoError(t, setting.UpdateUserUsableGroupsByJSONString(`{"default":"Default"}`))
|
|
|
|
groups := GetRequestAutoGroups(ctx, "default")
|
|
|
|
assert.Empty(t, groups)
|
|
}
|