update go-chi/jwtauth to v4

auth/jwt/claims.go

@@ -2,18 +2,20 @@ package jwt
 
 import (
 	"errors"
-	"github.com/go-chi/jwtauth"
+
+	"github.com/dgrijalva/jwt-go"
 )
 
 // AppClaims represent the claims parsed from JWT access token.
 type AppClaims struct {
-	ID    int
-	Sub   string
-	Roles []string
+	ID    int      `json:"id,omitempty"`
+	Sub   string   `json:"sub,omitempty"`
+	Roles []string `json:"roles,omitempty"`
+	jwt.StandardClaims
 }
 
 // ParseClaims parses JWT claims into AppClaims.
-func (c *AppClaims) ParseClaims(claims jwtauth.Claims) error {
+func (c *AppClaims) ParseClaims(claims jwt.MapClaims) error {
 	id, ok := claims["id"]
 	if !ok {
 		return errors.New("could not parse claim id")
@@ -42,13 +44,15 @@ func (c *AppClaims) ParseClaims(claims jwtauth.Claims) error {
 	return nil
 }
 
-// RefreshClaims represent the claims parsed from JWT refresh token.
+// RefreshClaims represents the claims parsed from JWT refresh token.
 type RefreshClaims struct {
-	Token string
+	ID    int    `json:"id,omitempty"`
+	Token string `json:"token,omitempty"`
+	jwt.StandardClaims
 }
 
 // ParseClaims parses the JWT claims into RefreshClaims.
-func (c *RefreshClaims) ParseClaims(claims jwtauth.Claims) error {
+func (c *RefreshClaims) ParseClaims(claims jwt.MapClaims) error {
 	token, ok := claims["token"]
 	if !ok {
 		return errors.New("could not parse claim token")

auth/jwt/token.go

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

auth/jwt/tokenauth.go

@@ -38,12 +38,12 @@ func (a *TokenAuth) Verifier() func(http.Handler) http.Handler {
 }
 
 // GenTokenPair returns both an access token and a refresh token.
-func (a *TokenAuth) GenTokenPair(ca jwtauth.Claims, cr jwtauth.Claims) (string, string, error) {
-	access, err := a.CreateJWT(ca)
+func (a *TokenAuth) GenTokenPair(accessClaims AppClaims, refreshClaims RefreshClaims) (string, string, error) {
+	access, err := a.CreateJWT(accessClaims)
 	if err != nil {
 		return "", "", err
 	}
-	refresh, err := a.CreateRefreshJWT(cr)
+	refresh, err := a.CreateRefreshJWT(refreshClaims)
 	if err != nil {
 		return "", "", err
 	}
@@ -51,17 +51,17 @@ func (a *TokenAuth) GenTokenPair(ca jwtauth.Claims, cr jwtauth.Claims) (string,
 }
 
 // CreateJWT returns an access token for provided account claims.
-func (a *TokenAuth) CreateJWT(c jwtauth.Claims) (string, error) {
-	c.SetIssuedNow()
-	c.SetExpiryIn(a.JwtExpiry)
+func (a *TokenAuth) CreateJWT(c AppClaims) (string, error) {
+	c.IssuedAt = time.Now().Unix()
+	c.ExpiresAt = time.Now().Add(a.JwtExpiry).Unix()
 	_, tokenString, err := a.JwtAuth.Encode(c)
 	return tokenString, err
 }
 
 // CreateRefreshJWT returns a refresh token for provided token Claims.
-func (a *TokenAuth) CreateRefreshJWT(c jwtauth.Claims) (string, error) {
-	c.SetIssuedNow()
-	c.SetExpiryIn(a.JwtRefreshExpiry)
+func (a *TokenAuth) CreateRefreshJWT(c RefreshClaims) (string, error) {
+	c.IssuedAt = time.Now().Unix()
+	c.ExpiresAt = time.Now().Add(a.JwtExpiry).Unix()
 	_, tokenString, err := a.JwtAuth.Encode(c)
 	return tokenString, err
 }