Skip to content

修改jwt配置toml标签错误，及简化代码 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jhStrive wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

修改jwt配置toml标签错误，及简化代码 #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conf/server/auth/jwt/jwt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ type JWTAuth struct {
Mode string `json:"mode,omitempty" valid:"in(HS256|HS384|HS512|RS256|ES256|ES384|ES512|RS384|RS512|PS256|PS384|PS512),required" toml:"mode,omitempty" label:"jwt认证方式"`
Secret string `json:"secret,omitempty" valid:"ascii,required" toml:"secret,omitempty" label:"jwt密钥"`
Source string `json:"source,omitempty" valid:"in(header|cookie|HEADER|COOKIE|H)" toml:"source,omitempty" label:"jwt存储方式"`
Excludes []string `json:"excludes,omitempty" toml:"exclude,omitempty"`
Excludes []string `json:"excludes,omitempty" toml:"excludes,omitempty"`
Domain string `json:"domain,omitempty" toml:"domain,omitempty"`
AuthURL string `json:"authURL,omitempty" valid:"ascii" toml:"authURL,omitempty" label:"jwt认证跳转地址"`
Disable bool `json:"disable,omitempty" toml:"disable,omitempty"`
Expand Down Expand Up @@ -129,7 +129,7 @@ func (j *JWTAuth) GetJWTForRspns(token string, expired ...bool) (string, string,
token = TokenBearerPrefix + token
switch strings.ToUpper(j.Source) {
case SourceHeader, SourceHeaderShort: //"HEADER", "H":
return AuthorizationHeader, token, isExpired == false
return AuthorizationHeader, token, !isExpired
default:
expireVal := j.getExpireTime(isExpired)
if j.Domain != "" {
Expand Down