update LoadAccessToken to consider refresh exp

Author: dmcinnes

manage/manage_test.go

@@ -2,6 +2,7 @@ package manage_test
 
 import (
 	"testing"
+	"time"
 
 	"gopkg.in/oauth2.v3"
 	"gopkg.in/oauth2.v3/manage"
@@ -128,10 +129,11 @@ func testZeroRefreshExpirationManager(tgr *oauth2.TokenGenerateRequest, manager
 	So(code, ShouldNotBeEmpty)
 
 	atParams := &oauth2.TokenGenerateRequest{
-		ClientID:     tgr.ClientID,
-		ClientSecret: "11",
-		RedirectURI:  tgr.RedirectURI,
-		Code:         code,
+		ClientID:       tgr.ClientID,
+		ClientSecret:   "11",
+		RedirectURI:    tgr.RedirectURI,
+		AccessTokenExp: time.Hour,
+		Code:           code,
 	}
 	ati, err := manager.GenerateAccessToken(oauth2.AuthorizationCode, atParams)
 	So(err, ShouldBeNil)
@@ -145,4 +147,11 @@ func testZeroRefreshExpirationManager(tgr *oauth2.TokenGenerateRequest, manager
 	So(tokenInfo, ShouldNotBeNil)
 	So(tokenInfo.GetRefresh(), ShouldEqual, refreshToken)
 	So(tokenInfo.GetRefreshExpiresIn(), ShouldEqual, 0)
+
+	// LoadAccessToken also checks refresh expiry
+	tokenInfo, err = manager.LoadAccessToken(accessToken)
+	So(err, ShouldBeNil)
+	So(tokenInfo, ShouldNotBeNil)
+	So(tokenInfo.GetRefresh(), ShouldEqual, refreshToken)
+	So(tokenInfo.GetRefreshExpiresIn(), ShouldEqual, 0)
 }

manage/manager.go

@@ -464,7 +464,8 @@ func (m *Manager) LoadAccessToken(access string) (info oauth2.TokenInfo, err err
 	} else if ti == nil || ti.GetAccess() != access {
 		err = errors.ErrInvalidAccessToken
 		return
-	} else if ti.GetRefresh() != "" && ti.GetRefreshCreateAt().Add(ti.GetRefreshExpiresIn()).Before(ct) {
+	} else if ti.GetRefresh() != "" && ti.GetRefreshExpiresIn() != 0 &&
+		ti.GetRefreshCreateAt().Add(ti.GetRefreshExpiresIn()).Before(ct) {
 		err = errors.ErrExpiredRefreshToken
 		return
 	} else if ti.GetAccessCreateAt().Add(ti.GetAccessExpiresIn()).Before(ct) {

store/token.go

@@ -63,7 +63,7 @@ func (ts *TokenStore) Create(info oauth2.TokenInfo) (err error) {
 		if err != nil {
 			return
 		}
-		_, _, err = tx.Set(info.GetAccess(), basicID, &buntdb.SetOptions{Expires: true, TTL: aexp})
+		_, _, err = tx.Set(info.GetAccess(), basicID, &buntdb.SetOptions{Expires: expires, TTL: aexp})
 		return
 	})
 	return