Skip to content

support to reset refreshing time #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 16, 2016
Merged

support to reset refreshing time #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@ _testmain.go
# OSX
*.DS_Store
*.db
*.swp
/example/client/client
/example/server/server
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ Copyright (c) 2016 Lyric
[License-Image]: https://img.shields.io/npm/l/express.svg
[Build-Status-Url]: https://travis-ci.org/go-oauth2/oauth2
[Build-Status-Image]: https://travis-ci.org/go-oauth2/oauth2.svg?branch=master
[Release-Url]: https://github.com/go-oauth2/oauth2/releases/tag/v3.5.2
[Release-image]: http://img.shields.io/badge/release-v3.5.2-1eb0fc.svg
[Release-Url]: https://github.com/go-oauth2/oauth2/releases/tag/v3.5.3
[Release-image]: http://img.shields.io/badge/release-v3.5.3-1eb0fc.svg
[ReportCard-Url]: https://goreportcard.com/report/gopkg.in/oauth2.v3
[ReportCard-Image]: https://goreportcard.com/badge/gopkg.in/oauth2.v3
[GoDoc-Url]: https://godoc.org/gopkg.in/oauth2.v3
Expand Down
2 changes: 2 additions & 0 deletions manage/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ type Config struct {
RefreshTokenExp time.Duration
// whether to generate the refreshing token
IsGenerateRefresh bool
// whether to reset the refreshing expiration time
IsResetRefreshTime bool
}

// default configs
Expand Down
9 changes: 9 additions & 0 deletions manage/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,28 +341,36 @@ func (m *Manager) RefreshAccessToken(tgr *oauth2.TokenGenerateRequest) (accessTo
err = errors.ErrInvalidClient
return
}

ti, err := m.LoadRefreshToken(tgr.Refresh)
if err != nil {
return
} else if ti.GetClientID() != tgr.ClientID {
err = errors.ErrInvalidRefreshToken
return
}

oldAccess, oldRefresh := ti.GetAccess(), ti.GetRefresh()
_, ierr := m.injector.Invoke(func(stor oauth2.TokenStore, gen oauth2.AccessGenerate) {
td := &oauth2.GenerateBasic{
Client: cli,
UserID: ti.GetUserID(),
CreateAt: time.Now(),
}

rcfg := m.grantConfig(oauth2.Refreshing)

tv, rv, terr := gen.Token(td, rcfg.IsGenerateRefresh)
if terr != nil {
err = terr
return
}

ti.SetAccess(tv)
ti.SetAccessCreateAt(td.CreateAt)
if rcfg.IsResetRefreshTime {
ti.SetRefreshCreateAt(td.CreateAt)
}
if scope := tgr.Scope; scope != "" {
ti.SetScope(scope)
}
Expand All @@ -373,6 +381,7 @@ func (m *Manager) RefreshAccessToken(tgr *oauth2.TokenGenerateRequest) (accessTo
err = verr
return
}

// remove the old access token
if verr := stor.RemoveByAccess(oldAccess); verr != nil {
err = verr
Expand Down