From 39712475b117991bc08a67710c5be5ef1e7f2e49 Mon Sep 17 00:00:00 2001
From: Witoo Harianto <witoo@plimble.com>
Date: Wed, 16 Aug 2017 18:19:44 +0700
Subject: [PATCH] fix refreshtoken expired

---
 oauth2/token/grant_password.go | 14 ++++++++------
 oauth2/token/grant_refresh.go  | 14 +++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/oauth2/token/grant_password.go b/oauth2/token/grant_password.go
index 1e9f5be..ef0dce8 100644
--- a/oauth2/token/grant_password.go
+++ b/oauth2/token/grant_password.go
@@ -96,12 +96,14 @@ func (g *PassowrdGrantType) createRefreshToken(grantData *GrantData, client *oau
 	rtoken := tokenGen.CreateRefreshToken()
 
 	rt := &oauth2.RefreshToken{
-		RefreshToken: rtoken,
-		ClientID:     client.ID,
-		UserID:       grantData.UserID,
-		Scopes:       grantData.Scopes,
-		Expired:      time.Now().UTC().Add(time.Second * time.Duration(grantData.RefreshTokenLifespan)).Unix(),
-		Extras:       grantData.Extras,
+		RefreshToken:         rtoken,
+		ClientID:             client.ID,
+		UserID:               grantData.UserID,
+		Scopes:               grantData.Scopes,
+		Expired:              time.Now().UTC().Add(time.Second * time.Duration(grantData.RefreshTokenLifespan)).Unix(),
+		Extras:               grantData.Extras,
+		AccessTokenLifespan:  grantData.AccessTokenLifespan,
+		RefreshTokenLifespan: grantData.RefreshTokenLifespan,
 	}
 
 	if err := storage.SaveRefreshToken(rt); err != nil {
diff --git a/oauth2/token/grant_refresh.go b/oauth2/token/grant_refresh.go
index 722e51a..7c75deb 100644
--- a/oauth2/token/grant_refresh.go
+++ b/oauth2/token/grant_refresh.go
@@ -80,6 +80,7 @@ func (g *RefreshTokenGrantType) createAccessToken(grantData *GrantData, client *
 		AccessToken: atoken,
 		ClientID:    client.ID,
 		Scopes:      grantData.Scopes,
+		UserID:      grantData.UserID,
 		Expired:     time.Now().UTC().Add(time.Second * time.Duration(grantData.AccessTokenLifespan)).Unix(),
 		ExpiresIn:   grantData.AccessTokenLifespan,
 		Extras:      grantData.Extras,
@@ -96,11 +97,14 @@ func (g *RefreshTokenGrantType) createRefreshToken(grantData *GrantData, client
 	rtoken := tokenGen.CreateRefreshToken()
 
 	rt := &oauth2.RefreshToken{
-		RefreshToken: rtoken,
-		ClientID:     client.ID,
-		Scopes:       grantData.Scopes,
-		Expired:      time.Now().UTC().Add(time.Second * time.Duration(grantData.RefreshTokenLifespan)).Unix(),
-		Extras:       grantData.Extras,
+		RefreshToken:         rtoken,
+		ClientID:             client.ID,
+		Scopes:               grantData.Scopes,
+		UserID:               grantData.UserID,
+		Expired:              time.Now().UTC().Add(time.Second * time.Duration(grantData.RefreshTokenLifespan)).Unix(),
+		Extras:               grantData.Extras,
+		AccessTokenLifespan:  grantData.AccessTokenLifespan,
+		RefreshTokenLifespan: grantData.RefreshTokenLifespan,
 	}
 
 	if err := storage.SaveRefreshToken(rt); err != nil {