kris/Go-Back-Skeleton
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update go-chi/jwtauth to v3.3 and remove dgrijalva from direct dependencies

Browse source
This commit is contained in:
Alex Frank Adhyatma 2019-03-07 11:55:45 +00:00
parent 83b738e298
commit a2d51bbfd8
No known key found for this signature in database
GPG key ID: 3AE15EAFE5BAFD5E
7 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
auth/jwt/claims.go
View file

@ -2,8 +2,7 @@ package jwt
import (
"errors"
"github.com/dgrijalva/jwt-go"
"github.com/go-chi/jwtauth"
)
// AppClaims represent the claims parsed from JWT access token.
@ -14,7 +13,7 @@ type AppClaims struct {
}
// ParseClaims parses JWT claims into AppClaims.
func (c *AppClaims) ParseClaims(claims jwt.MapClaims) error {
func (c *AppClaims) ParseClaims(claims jwtauth.Claims) error {
id, ok := claims["id"]
if !ok {
return errors.New("could not parse claim id")
@ -49,7 +48,7 @@ type RefreshClaims struct {
}
// ParseClaims parses the JWT claims into RefreshClaims.
func (c *RefreshClaims) ParseClaims(claims jwt.MapClaims) error {
func (c *RefreshClaims) ParseClaims(claims jwtauth.Claims) error {
token, ok := claims["token"]
if !ok {
return errors.New("could not parse claim token")

6
auth/jwt/token.go
View file

@ -3,7 +3,7 @@ package jwt
import (
"time"
"github.com/dgrijalva/jwt-go"
"github.com/go-chi/jwtauth"
"github.com/go-pg/pg/orm"
)
@ -37,8 +37,8 @@ func (t *Token) BeforeUpdate(db orm.DB) error {
}
// Claims returns the token claims to be signed
func (t *Token) Claims() jwt.MapClaims {
return jwt.MapClaims{
func (t *Token) Claims() jwtauth.Claims {
return jwtauth.Claims{
"id": t.ID,
"token": t.Token,
}

15
auth/jwt/tokenauth.go
View file

@ -5,7 +5,6 @@ import (
"net/http"
"time"
jwt "github.com/dgrijalva/jwt-go"
"github.com/go-chi/jwtauth"
"github.com/spf13/viper"
)
@ -39,7 +38,7 @@ func (a *TokenAuth) Verifier() func(http.Handler) http.Handler {
}
// GenTokenPair returns both an access token and a refresh token.
func (a *TokenAuth) GenTokenPair(ca jwt.MapClaims, cr jwt.MapClaims) (string, string, error) {
func (a *TokenAuth) GenTokenPair(ca jwtauth.Claims, cr jwtauth.Claims) (string, string, error) {
access, err := a.CreateJWT(ca)
if err != nil {
return "", "", err
@ -52,17 +51,17 @@ func (a *TokenAuth) GenTokenPair(ca jwt.MapClaims, cr jwt.MapClaims) (string, st
}
// CreateJWT returns an access token for provided account claims.
func (a *TokenAuth) CreateJWT(c jwt.MapClaims) (string, error) {
jwtauth.SetIssuedNow(c)
jwtauth.SetExpiryIn(c, a.JwtExpiry)
func (a *TokenAuth) CreateJWT(c jwtauth.Claims) (string, error) {
c.SetIssuedNow()
c.SetExpiryIn(a.JwtExpiry)
_, tokenString, err := a.JwtAuth.Encode(c)
return tokenString, err
}
// CreateRefreshJWT returns a refresh token for provided token Claims.
func (a *TokenAuth) CreateRefreshJWT(c jwt.MapClaims) (string, error) {
jwtauth.SetIssuedNow(c)
jwtauth.SetExpiryIn(c, a.JwtRefreshExpiry)
func (a *TokenAuth) CreateRefreshJWT(c jwtauth.Claims) (string, error) {
c.SetIssuedNow()
c.SetExpiryIn(a.JwtRefreshExpiry)
_, tokenString, err := a.JwtAuth.Encode(c)
return tokenString, err
}

6
auth/pwdless/account.go
View file

@ -5,7 +5,7 @@ import (
"time"
"github.com/dhax/go-base/auth/jwt"
jwtgo "github.com/dgrijalva/jwt-go"
"github.com/go-chi/jwtauth"
validation "github.com/go-ozzo/ozzo-validation"
"github.com/go-ozzo/ozzo-validation/is"
"github.com/go-pg/pg/orm"
@ -65,8 +65,8 @@ func (a *Account) CanLogin() bool {
}
// Claims returns the account's claims to be signed
func (a *Account) Claims() jwtgo.MapClaims {
return jwtgo.MapClaims{
func (a *Account) Claims() jwtauth.Claims {
return jwtauth.Claims{
"id": a.ID,
"sub": a.Name,
"roles": a.Roles,

8
auth/pwdless/api_test.go
View file

@ -14,8 +14,8 @@ import (
"testing"
"time"
jwtgo "github.com/dgrijalva/jwt-go"
"github.com/go-chi/chi"
"github.com/go-chi/jwtauth"
"github.com/spf13/viper"
"github.com/dhax/go-base/auth/jwt"
@ -240,7 +240,7 @@ func TestAuthResource_refresh(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
jwt := genJWT(jwtgo.MapClaims{"token": tc.token, "exp": time.Minute * tc.exp})
jwt := genJWT(jwtauth.Claims{"token": tc.token, "exp": time.Minute * tc.exp})
res, body := testRequest(t, ts, "POST", "/refresh", nil, jwt)
if res.StatusCode != tc.status {
t.Errorf("got http status %d, want: %d", res.StatusCode, tc.status)
@ -300,7 +300,7 @@ func TestAuthResource_logout(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
jwt := genJWT(jwtgo.MapClaims{"token": tc.token, "exp": time.Minute * tc.exp})
jwt := genJWT(jwtauth.Claims{"token": tc.token, "exp": time.Minute * tc.exp})
res, body := testRequest(t, ts, "POST", "/logout", nil, jwt)
if res.StatusCode != tc.status {
t.Errorf("got http status %d, want: %d", res.StatusCode, tc.status)
@ -343,7 +343,7 @@ func testRequest(t *testing.T, ts *httptest.Server, method, path string, body io
return resp, string(respBody)
}
func genJWT(c jwtgo.MapClaims) string {
func genJWT(c jwtauth.Claims) string {
_, tokenString, _ := auth.TokenAuth.JwtAuth.Encode(c)
return tokenString
}