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

fix jwt auth

Browse source
This commit is contained in:
Kochan 2018-11-26 21:09:42 +01:00
parent 9b27282ee3
commit 1b261b983c
5 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

15
auth/jwt/tokenauth.go
View file

@ -6,6 +6,7 @@ import (
"time"
"github.com/go-chi/jwtauth"
"github.com/dgrijalva/jwt-go"
"github.com/spf13/viper"
)
@ -38,7 +39,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 jwtauth.Claims, cr jwtauth.Claims) (string, string, error) {
func (a *TokenAuth) GenTokenPair(ca jwt.MapClaims, cr jwt.MapClaims) (string, string, error) {
access, err := a.CreateJWT(ca)
if err != nil {
return "", "", err
@ -51,17 +52,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 jwt.MapClaims) (string, error) {
jwtauth.SetIssuedNow(c)
jwtauth.SetExpiryIn(c, 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 jwtauth.Claims) (string, error) {
c.SetIssuedNow()
c.SetExpiryIn(a.JwtRefreshExpiry)
func (a *TokenAuth) CreateRefreshJWT(c jwt.MapClaims) (string, error) {
jwtauth.SetIssuedNow(c)
jwtauth.SetExpiryIn(c, a.JwtRefreshExpiry)
_, tokenString, err := a.JwtAuth.Encode(c)
return tokenString, err
}