diff --git a/routers/auto_signin_filter.go b/routers/auto_signin_filter.go index 345a8583..fd0c6cd1 100644 --- a/routers/auto_signin_filter.go +++ b/routers/auto_signin_filter.go @@ -29,7 +29,13 @@ func AutoSigninFilter(ctx *context.Context) { // GET parameter like "/page?access_token=123" or // HTTP Bearer token like "Authorization: Bearer 123" - accessToken := util.GetMaxLenStr(ctx.Input.Query("accessToken"), ctx.Input.Query("access_token"), parseBearerToken(ctx)) + accessToken := ctx.Input.Query("accessToken") + if accessToken == "" { + accessToken = ctx.Input.Query("access_token") + } + if accessToken == "" { + accessToken = parseBearerToken(ctx) + } if accessToken != "" { token, err := object.GetTokenByAccessToken(accessToken) diff --git a/util/string.go b/util/string.go index e3eb8843..fccc8848 100644 --- a/util/string.go +++ b/util/string.go @@ -187,32 +187,6 @@ func IsStringsEmpty(strs ...string) bool { return false } -func GetMaxLenStr(strs ...string) string { - m := 0 - i := 0 - for j, str := range strs { - l := len(str) - if l > m { - m = l - i = j - } - } - return strs[i] -} - -func GetMinLenStr(strs ...string) string { - m := int(^uint(0) >> 1) - i := 0 - for j, str := range strs { - l := len(str) - if l < m { - m = l - i = j - } - } - return strs[i] -} - func ReadStringFromPath(path string) string { data, err := os.ReadFile(filepath.Clean(path)) if err != nil { diff --git a/util/string_test.go b/util/string_test.go index c3027e77..e2b74c48 100644 --- a/util/string_test.go +++ b/util/string_test.go @@ -189,45 +189,6 @@ func TestIsStrsEmpty(t *testing.T) { } } -func TestGetMaxLenStr(t *testing.T) { - scenarios := []struct { - description string - input []string - expected interface{} - }{ - {"Should be return casdoor", []string{"", "casdoor", "casbin"}, "casdoor"}, - {"Should be return casdoor_jdk", []string{"", "casdoor", "casbin", "casdoor_jdk"}, "casdoor_jdk"}, - {"Should be return empty string", []string{""}, ""}, - } - for _, scenery := range scenarios { - t.Run(scenery.description, func(t *testing.T) { - actual := GetMaxLenStr(scenery.input...) - assert.Equal(t, scenery.expected, actual, "The returned value not is expected") - }) - } -} - -func TestGetMinLenStr(t *testing.T) { - scenarios := []struct { - description string - input []string - expected interface{} - }{ - {"Should be return casbin", []string{"casdoor", "casbin"}, "casbin"}, - {"Should be return casbin", []string{"casdoor", "casbin", "casdoor_jdk"}, "casbin"}, - {"Should be return empty string", []string{"a", "", "casbin"}, ""}, - {"Should be return a", []string{"a", "casdoor", "casbin"}, "a"}, - {"Should be return a", []string{"casdoor", "a", "casbin"}, "a"}, - {"Should be return a", []string{"casbin", "casdoor", "a"}, "a"}, - } - for _, scenery := range scenarios { - t.Run(scenery.description, func(t *testing.T) { - actual := GetMinLenStr(scenery.input...) - assert.Equal(t, scenery.expected, actual, "The returned value not is expected") - }) - } -} - func TestSnakeString(t *testing.T) { scenarios := []struct { description string