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

Merge branch 'FrankSantoso-master'

Browse source
This commit is contained in:
dhax 2019-03-09 13:39:33 +01:00
commit bc565a4008
7 changed files with 24 additions and 26 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 ( import (
"errors" "errors"
"github.com/go-chi/jwtauth"
"github.com/dgrijalva/jwt-go"
) )
// AppClaims represent the claims parsed from JWT access token. // AppClaims represent the claims parsed from JWT access token.
@ -14,7 +13,7 @@ type AppClaims struct {
} }
// ParseClaims parses JWT claims into AppClaims. // 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"] id, ok := claims["id"]
if !ok { if !ok {
return errors.New("could not parse claim id") return errors.New("could not parse claim id")
@ -49,7 +48,7 @@ type RefreshClaims struct {
} }
// ParseClaims parses the JWT claims into RefreshClaims. // 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"] token, ok := claims["token"]
if !ok { if !ok {
return errors.New("could not parse claim token") return errors.New("could not parse claim token")

6
auth/jwt/token.go
View file

@ -3,7 +3,7 @@ package jwt
import ( import (
"time" "time"
"github.com/dgrijalva/jwt-go" "github.com/go-chi/jwtauth"
"github.com/go-pg/pg/orm" "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 // Claims returns the token claims to be signed
func (t *Token) Claims() jwt.MapClaims { func (t *Token) Claims() jwtauth.Claims {
return jwt.MapClaims{ return jwtauth.Claims{
"id": t.ID, "id": t.ID,
"token": t.Token, "token": t.Token,
} }

15
auth/jwt/tokenauth.go
View file

@ -5,7 +5,6 @@ import (
"net/http" "net/http"
"time" "time"
jwt "github.com/dgrijalva/jwt-go"
"github.com/go-chi/jwtauth" "github.com/go-chi/jwtauth"
"github.com/spf13/viper" "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. // 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) access, err := a.CreateJWT(ca)
if err != nil { if err != nil {
return "", "", err 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. // CreateJWT returns an access token for provided account claims.
func (a *TokenAuth) CreateJWT(c jwt.MapClaims) (string, error) { func (a *TokenAuth) CreateJWT(c jwtauth.Claims) (string, error) {
jwtauth.SetIssuedNow(c) c.SetIssuedNow()
jwtauth.SetExpiryIn(c, a.JwtExpiry) c.SetExpiryIn(a.JwtExpiry)
_, tokenString, err := a.JwtAuth.Encode(c) _, tokenString, err := a.JwtAuth.Encode(c)
return tokenString, err return tokenString, err
} }
// CreateRefreshJWT returns a refresh token for provided token Claims. // CreateRefreshJWT returns a refresh token for provided token Claims.
func (a *TokenAuth) CreateRefreshJWT(c jwt.MapClaims) (string, error) { func (a *TokenAuth) CreateRefreshJWT(c jwtauth.Claims) (string, error) {
jwtauth.SetIssuedNow(c) c.SetIssuedNow()
jwtauth.SetExpiryIn(c, a.JwtRefreshExpiry) c.SetExpiryIn(a.JwtRefreshExpiry)
_, tokenString, err := a.JwtAuth.Encode(c) _, tokenString, err := a.JwtAuth.Encode(c)
return tokenString, err return tokenString, err
} }

6
auth/pwdless/account.go
View file

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

8
auth/pwdless/api_test.go
View file

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

4
go.mod
View file

@ -5,11 +5,11 @@ require (
github.com/PuerkitoBio/goquery v1.4.1 // indirect github.com/PuerkitoBio/goquery v1.4.1 // indirect
github.com/andybalholm/cascadia v1.0.0 // indirect github.com/andybalholm/cascadia v1.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf // indirect github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/go-chi/chi v4.0.0+incompatible github.com/go-chi/chi v4.0.0+incompatible
github.com/go-chi/cors v1.0.0 github.com/go-chi/cors v1.0.0
github.com/go-chi/docgen v1.0.2 github.com/go-chi/docgen v1.0.2
github.com/go-chi/jwtauth v0.0.0-20190109153619-47840abb19b3 github.com/go-chi/jwtauth v3.3.0+incompatible
github.com/go-chi/render v1.0.1 github.com/go-chi/render v1.0.1
github.com/go-mail/mail v2.3.1+incompatible github.com/go-mail/mail v2.3.1+incompatible
github.com/go-ozzo/ozzo-validation v3.5.0+incompatible github.com/go-ozzo/ozzo-validation v3.5.0+incompatible

4
go.sum
View file

@ -23,8 +23,8 @@ github.com/go-chi/cors v1.0.0 h1:e6x8k7uWbUwYs+aXDoiUzeQFT6l0cygBYyNhD7/1Tg0=
github.com/go-chi/cors v1.0.0/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= github.com/go-chi/cors v1.0.0/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I=
github.com/go-chi/docgen v1.0.2 h1:BL7Y/SQlZMlhEI8dgukaEvF0AqdqG7axNdJsUVAzbRE= github.com/go-chi/docgen v1.0.2 h1:BL7Y/SQlZMlhEI8dgukaEvF0AqdqG7axNdJsUVAzbRE=
github.com/go-chi/docgen v1.0.2/go.mod h1:n7Wqcp0XCeIb/IHrd6hxqtFJzCklt0pKeo7uVUXkrdY= github.com/go-chi/docgen v1.0.2/go.mod h1:n7Wqcp0XCeIb/IHrd6hxqtFJzCklt0pKeo7uVUXkrdY=
github.com/go-chi/jwtauth v0.0.0-20190109153619-47840abb19b3 h1:cFmETtRzAus3IXaJbth19NdbGOrgjCP86WVK7E8xONM= github.com/go-chi/jwtauth v3.3.0+incompatible h1:BEOEx6OueP61EfhuOTDqgroY0SYdcFsFsbY/n4f5+Kk=
github.com/go-chi/jwtauth v0.0.0-20190109153619-47840abb19b3/go.mod h1:ZdbLUuUBAgS2xbrMtdm0EXaHZ2uruR+RMdGn2bnlUtU= github.com/go-chi/jwtauth v3.3.0+incompatible/go.mod h1:Q5EIArY/QnD6BdS+IyDw7B2m6iNbnPxtfd6/BcmtWbs=
github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
github.com/go-mail/mail v2.3.1+incompatible h1:UzNOn0k5lpfVtO31cK3hn6I4VEVGhe3lX8AJBAxXExM= github.com/go-mail/mail v2.3.1+incompatible h1:UzNOn0k5lpfVtO31cK3hn6I4VEVGhe3lX8AJBAxXExM=