提交 2df7d796 authored 作者: mooncake9527's avatar mooncake9527

change token trim prefix to index slice

上级 3a3ef000
...@@ -87,6 +87,7 @@ func ParseExtend() error { ...@@ -87,6 +87,7 @@ func ParseExtend() error {
return err return err
} }
extend.Unlock() extend.Unlock()
logger.Debug("[conf][extend]show:")
logger.Debug(ShowObj(extend)) logger.Debug(ShowObj(extend))
} }
} }
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
package middleware package middleware
import ( import (
"strings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab.wanzhuangkj.com/tush/xpkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
...@@ -124,7 +122,8 @@ func AuthCustom(verify VerifyCustomFn, opts ...JwtOption) gin.HandlerFunc { ...@@ -124,7 +122,8 @@ func AuthCustom(verify VerifyCustomFn, opts ...JwtOption) gin.HandlerFunc {
return func(c *gin.Context) { return func(c *gin.Context) {
authorization := c.GetHeader(HeaderAuthorizationKey) authorization := c.GetHeader(HeaderAuthorizationKey)
token := strings.TrimPrefix(authorization, "Bearer ") // token := strings.TrimPrefix(authorization, "Bearer ")
token := authorization[7:] // remove Bearer prefix
claims, err := jwt.ParseCustomToken(token) claims, err := jwt.ParseCustomToken(token)
if err != nil { if err != nil {
logger.Warn("ParseToken error", logger.Err(err)) logger.Warn("ParseToken error", logger.Err(err))
......
...@@ -78,6 +78,20 @@ func TestParseToken(t *testing.T) { ...@@ -78,6 +78,20 @@ func TestParseToken(t *testing.T) {
assert.True(t, errors.Is(err, ErrTokenExpired)) assert.True(t, errors.Is(err, ErrTokenExpired))
} }
func TestParse(t *testing.T) {
Init(
WithSigningKey("6m2KywHIPEaWWIxffGpp8Dfl3z5SjE5WeeDStc1T64klnpoAqHrHN01vneteCAGE"),
WithExpire(time.Second),
WithSigningMethod(HS256),
)
token := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJmaWVsZHMiOnsiY29tcGFueUlEIjoiNTIiLCJ1VHlwZSI6MiwidWlkIjoiMTMiLCJ1bmFtZSI6IuW8oOS4iSJ9LCJleHAiOjE3NTc2ODI2NzksImlhdCI6MTc1NzY2MTA3OX0.WqtvxF4XW52bC4mglFOg61i4D9mi7Bkb1ZZ00F4PB6k"
claims, err := ParseCustomToken(token)
if err != nil {
t.Error(err)
}
fmt.Println(claims)
}
func TestGenerateCustomToken(t *testing.T) { func TestGenerateCustomToken(t *testing.T) {
var ( var (
id uint64 = 20 id uint64 = 20
......
...@@ -36,3 +36,16 @@ func UnderscoreToCamel(s string, isUpperFirst bool) string { ...@@ -36,3 +36,16 @@ func UnderscoreToCamel(s string, isUpperFirst bool) string {
} }
return builder.String() return builder.String()
} }
func AllNotEmpty(rs ...string) bool {
if len(rs) == 0 {
return false
}
ret := true
for _, r := range rs {
if strings.TrimSpace(r) == "" {
ret = false
}
}
return ret
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论