annika/jwtauth
1
0
Fork 0
mirror of https://forgejo.merr.is/annika/jwtauth.git synced 2025-12-13 05:38:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unnecessary code. (#69)

Browse source
This commit is contained in:
kvii 2022-02-09 19:21:49 +08:00 • committed by GitHub
parent 6047f9231e
commit 137d669fb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jwtauth.go
View file

@ -61,9 +61,7 @@ func New(alg string, signKey interface{}, verifyKey interface{}) *JWTAuth {
// which checks the request context jwt token and error to prepare a custom // which checks the request context jwt token and error to prepare a custom
// http response. // http response.
func Verifier(ja *JWTAuth) func(http.Handler) http.Handler { func Verifier(ja *JWTAuth) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler { return Verify(ja, TokenFromHeader, TokenFromCookie)
return Verify(ja, TokenFromHeader, TokenFromCookie)(next)
}
} }
func Verify(ja *JWTAuth, findTokenFns ...func(r *http.Request) string) func(http.Handler) http.Handler { func Verify(ja *JWTAuth, findTokenFns ...func(r *http.Request) string) func(http.Handler) http.Handler {
@ -165,12 +163,12 @@ func Authenticator(next http.Handler) http.Handler {
token, _, err := FromContext(r.Context()) token, _, err := FromContext(r.Context())
if err != nil { if err != nil {
http.Error(w, err.Error(), 401) http.Error(w, err.Error(), http.StatusUnauthorized)
return return
} }
if token == nil || jwt.Validate(token) != nil { if token == nil || jwt.Validate(token) != nil {
http.Error(w, http.StatusText(401), 401) http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
return return
} }

10
jwtauth_test.go
View file

@ -153,12 +153,12 @@ func TestMore(t *testing.T) {
token, _, err := jwtauth.FromContext(r.Context()) token, _, err := jwtauth.FromContext(r.Context())
if err != nil { if err != nil {
http.Error(w, jwtauth.ErrorReason(err).Error(), 401) http.Error(w, jwtauth.ErrorReason(err).Error(), http.StatusUnauthorized)
return return
} }
if err := jwt.Validate(token); err != nil { if err := jwt.Validate(token); err != nil {
http.Error(w, jwtauth.ErrorReason(err).Error(), 401) http.Error(w, jwtauth.ErrorReason(err).Error(), http.StatusUnauthorized)
return return
} }
@ -242,10 +242,8 @@ func testRequest(t *testing.T, ts *httptest.Server, method, path string, header
return 0, "" return 0, ""
} }
if header != nil { for k, v := range header {
for k, v := range header { req.Header.Set(k, v[0])
req.Header.Set(k, v[0])
}
} }
resp, err := http.DefaultClient.Do(req) resp, err := http.DefaultClient.Do(req)