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

moves claims into models

Browse source
This commit is contained in:
dhax 2017-10-04 02:52:19 +02:00
parent 38722c9da5
commit f1c2249744
6 changed files with 57 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

15
auth/handler.go
View file

@ -144,7 +144,12 @@ func (rs *Resource) token(w http.ResponseWriter, r *http.Request) {
return
}
access, refresh := rs.Token.GenTokenPair(acc, token)
access, refresh, err := rs.Token.GenTokenPair(acc.Claims(), token.Claims())
if err != nil {
log(r).Error(err)
render.Render(w, r, ErrInternalServerError)
return
}
acc.LastLogin = time.Now()
if err := rs.store.UpdateAccount(acc); err != nil {
@ -183,7 +188,13 @@ func (rs *Resource) refresh(w http.ResponseWriter, r *http.Request) {
token.Expiry = time.Now().Add(time.Minute * rs.Token.jwtRefreshExpiry)
token.UpdatedAt = time.Now()
access, refresh := rs.Token.GenTokenPair(acc, token)
access, refresh, err := rs.Token.GenTokenPair(acc.Claims(), token.Claims())
if err != nil {
log(r).Error(err)
render.Render(w, r, ErrInternalServerError)
return
}
if err := rs.store.SaveRefreshToken(token); err != nil {
log(r).Error(err)
render.Render(w, r, ErrInternalServerError)