GenerateBasic add *http.Request support

Author: LyricTian

generate.go

@@ -1,6 +1,9 @@
 package oauth2
 
-import "time"
+import (
+	"net/http"
+	"time"
+)
 
 type (
 	// GenerateBasic provide the basis of the generated token data
@@ -9,6 +12,7 @@ type (
 		UserID    string
 		CreateAt  time.Time
 		TokenInfo TokenInfo
+		Request   *http.Request
 	}
 
 	// AuthorizeGenerate generate the authorization code interface

manage.go

@@ -1,6 +1,7 @@
 package oauth2
 
 import (
+	"net/http"
 	"time"
 )
 
@@ -14,6 +15,7 @@ type TokenGenerateRequest struct {
 	Code           string
 	Refresh        string
 	AccessTokenExp time.Duration
+	Request        *http.Request
 }
 
 // Manager authorization management interface

manage/manager.go

@@ -175,49 +175,56 @@ func (m *Manager) GenerateAuthToken(rt oauth2.ResponseType, tgr *oauth2.TokenGen
 		ti.SetRedirectURI(tgr.RedirectURI)
 		ti.SetScope(tgr.Scope)
 
+		createAt := time.Now()
 		td := &oauth2.GenerateBasic{
 			Client:    cli,
 			UserID:    tgr.UserID,
-			CreateAt:  time.Now(),
+			CreateAt:  createAt,
 			TokenInfo: ti,
+			Request:   tgr.Request,
 		}
 		switch rt {
 		case oauth2.Code:
-			tv, terr := gen.Token(td)
-			if terr != nil {
-				err = terr
-				return
-			}
-			ti.SetCode(tv)
 			codeExp := m.codeExp
 			if codeExp == 0 {
 				codeExp = DefaultCodeExp
 			}
+			ti.SetCodeCreateAt(createAt)
 			ti.SetCodeExpiresIn(codeExp)
-			ti.SetCodeCreateAt(td.CreateAt)
 			if exp := tgr.AccessTokenExp; exp > 0 {
 				ti.SetAccessExpiresIn(exp)
 			}
-		case oauth2.Token:
-			icfg := m.grantConfig(oauth2.Implicit)
-			tv, rv, terr := tgen.Token(td, icfg.IsGenerateRefresh)
+
+			tv, terr := gen.Token(td)
 			if terr != nil {
 				err = terr
 				return
 			}
-			ti.SetAccess(tv)
-			ti.SetAccessCreateAt(td.CreateAt)
+			ti.SetCode(tv)
+		case oauth2.Token:
 			// set access token expires
+			icfg := m.grantConfig(oauth2.Implicit)
 			aexp := icfg.AccessTokenExp
 			if exp := tgr.AccessTokenExp; exp > 0 {
 				aexp = exp
 			}
+			ti.SetAccessCreateAt(createAt)
 			ti.SetAccessExpiresIn(aexp)
 
+			if icfg.IsGenerateRefresh {
+				ti.SetRefreshCreateAt(createAt)
+				ti.SetRefreshExpiresIn(icfg.RefreshTokenExp)
+			}
+
+			tv, rv, terr := tgen.Token(td, icfg.IsGenerateRefresh)
+			if terr != nil {
+				err = terr
+				return
+			}
+			ti.SetAccess(tv)
+
 			if rv != "" {
 				ti.SetRefresh(rv)
-				ti.SetRefreshCreateAt(td.CreateAt)
-				ti.SetRefreshExpiresIn(icfg.RefreshTokenExp)
 			}
 		}
 
@@ -298,31 +305,38 @@ func (m *Manager) GenerateAccessToken(gt oauth2.GrantType, tgr *oauth2.TokenGene
 		ti.SetRedirectURI(tgr.RedirectURI)
 		ti.SetScope(tgr.Scope)
 
+		createAt := time.Now()
+		ti.SetAccessCreateAt(createAt)
+
+		// set access token expires
+		gcfg := m.grantConfig(gt)
+		aexp := gcfg.AccessTokenExp
+		if exp := tgr.AccessTokenExp; exp > 0 {
+			aexp = exp
+		}
+		ti.SetAccessExpiresIn(aexp)
+		if gcfg.IsGenerateRefresh {
+			ti.SetRefreshCreateAt(createAt)
+			ti.SetRefreshExpiresIn(gcfg.RefreshTokenExp)
+		}
+
 		td := &oauth2.GenerateBasic{
 			Client:    cli,
 			UserID:    tgr.UserID,
-			CreateAt:  time.Now(),
+			CreateAt:  createAt,
 			TokenInfo: ti,
+			Request:   tgr.Request,
 		}
-		gcfg := m.grantConfig(gt)
 
 		av, rv, terr := gen.Token(td, gcfg.IsGenerateRefresh)
 		if terr != nil {
 			err = terr
 			return
 		}
-		ti.SetAccessCreateAt(td.CreateAt)
 		ti.SetAccess(av)
-		// set access token expires
-		aexp := gcfg.AccessTokenExp
-		if exp := tgr.AccessTokenExp; exp > 0 {
-			aexp = exp
-		}
-		ti.SetAccessExpiresIn(aexp)
+
 		if rv != "" {
 			ti.SetRefresh(rv)
-			ti.SetRefreshCreateAt(td.CreateAt)
-			ti.SetRefreshExpiresIn(gcfg.RefreshTokenExp)
 		}
 
 		err = stor.Create(ti)
@@ -362,6 +376,7 @@ func (m *Manager) RefreshAccessToken(tgr *oauth2.TokenGenerateRequest) (accessTo
 			UserID:    ti.GetUserID(),
 			CreateAt:  time.Now(),
 			TokenInfo: ti,
+			Request:   tgr.Request,
 		}
 
 		rcfg := DefaultRefreshTokenCfg

server/config.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"net/http"
 	"time"
 
 	"gopkg.in/oauth2.v3"
@@ -37,4 +38,5 @@ type AuthorizeRequest struct {
 	State          string
 	UserID         string
 	AccessTokenExp time.Duration
+	Request        *http.Request
 }

server/server.go

@@ -178,6 +178,7 @@ func (s *Server) ValidationAuthorizeRequest(r *http.Request) (req *AuthorizeRequ
 		ClientID:     clientID,
 		State:        r.FormValue("state"),
 		Scope:        r.FormValue("scope"),
+		Request:      r,
 	}
 	return
 }
@@ -221,6 +222,7 @@ func (s *Server) GetAuthorizeToken(req *AuthorizeRequest) (ti oauth2.TokenInfo,
 		RedirectURI:    req.RedirectURI,
 		Scope:          req.Scope,
 		AccessTokenExp: req.AccessTokenExp,
+		Request:        req.Request,
 	}
 
 	ti, err = s.Manager.GenerateAuthToken(req.ResponseType, tgr)
@@ -315,6 +317,7 @@ func (s *Server) ValidationTokenRequest(r *http.Request) (gt oauth2.GrantType, t
 	tgr = &oauth2.TokenGenerateRequest{
 		ClientID:     clientID,
 		ClientSecret: clientSecret,
+		Request:      r,
 	}
 
 	switch gt {