Add manager test file

Author: LyricTian

manage/manage_test.go

@@ -4,24 +4,96 @@ import (
 	"testing"
 
 	. "github.com/smartystreets/goconvey/convey"
+	"gopkg.in/oauth2.v2"
 	"gopkg.in/oauth2.v2/generates"
 	"gopkg.in/oauth2.v2/models"
 	"gopkg.in/oauth2.v2/store/client"
 	"gopkg.in/oauth2.v2/store/token"
 )
 
 func TestManager(t *testing.T) {
-	Convey("Manager Test", t, func() {
+	Convey("Manager test", t, func() {
 		manager := NewManager()
 
 		manager.MapClientModel(models.NewClient())
 		manager.MapTokenModel(models.NewToken())
 		manager.MapAuthorizeGenerate(generates.NewAuthorizeGenerate())
 		manager.MapAccessGenerate(generates.NewAccessGenerate())
 		manager.MapClientStorage(client.NewTempStore())
-		manager.MustTokenStorage(token.NewRedisStore(
-			&token.RedisConfig{Addr: "192.168.33.70:6379"},
-		))
+
+		Convey("GetClient test", func() {
+			cli, err := manager.GetClient("1")
+			So(err, ShouldBeNil)
+			So(cli.GetSecret(), ShouldEqual, "11")
+		})
+
+		Convey("Redis store test", func() {
+			manager.MustTokenStorage(token.NewRedisStore(
+				&token.RedisConfig{Addr: "192.168.33.70:6379"},
+			))
+			testManager(manager)
+		})
+
+		Convey("MongoDB store test", func() {
+			manager.MustTokenStorage(token.NewMongoStore(
+				&token.MongoConfig{URL: "mongodb://admin:[email protected]:27017"},
+			))
+			testManager(manager)
+		})
 
 	})
 }
+
+func testManager(manager oauth2.Manager) {
+	reqParams := &oauth2.TokenGenerateRequest{
+		ClientID:    "1",
+		UserID:      "123456",
+		RedirectURI: "http://localhost/oauth2",
+		Scope:       "all",
+	}
+	code, err := manager.GenerateAuthToken(oauth2.Code, reqParams)
+	So(err, ShouldBeNil)
+	So(code, ShouldNotBeEmpty)
+
+	atParams := &oauth2.TokenGenerateRequest{
+		ClientID:          "1",
+		RedirectURI:       "http://localhost/oauth2",
+		Code:              code,
+		IsGenerateRefresh: true,
+	}
+	accessToken, refreshToken, err := manager.GenerateAccessToken(oauth2.AuthorizationCodeCredentials, atParams)
+	So(err, ShouldBeNil)
+	So(accessToken, ShouldNotBeEmpty)
+	So(refreshToken, ShouldNotBeEmpty)
+
+	_, err = manager.LoadAccessToken(code)
+	So(err, ShouldNotBeNil)
+
+	ainfo, err := manager.LoadAccessToken(accessToken)
+	So(err, ShouldBeNil)
+	So(ainfo.GetClientID(), ShouldEqual, atParams.ClientID)
+
+	rinfo, err := manager.LoadRefreshToken(refreshToken)
+	So(err, ShouldBeNil)
+	So(rinfo.GetClientID(), ShouldEqual, atParams.ClientID)
+
+	refreshAT, err := manager.RefreshAccessToken(refreshToken, "owner")
+	So(err, ShouldBeNil)
+	So(refreshAT, ShouldNotBeEmpty)
+
+	_, err = manager.LoadAccessToken(accessToken)
+	So(err, ShouldNotBeNil)
+
+	refreshAInfo, err := manager.LoadAccessToken(refreshAT)
+	So(err, ShouldBeNil)
+	So(refreshAInfo.GetScope(), ShouldEqual, "owner")
+
+	err = manager.RemoveRefreshToken(refreshToken)
+	So(err, ShouldBeNil)
+
+	_, err = manager.LoadAccessToken(refreshAT)
+	So(err, ShouldNotBeNil)
+
+	_, err = manager.LoadRefreshToken(refreshToken)
+	So(err, ShouldNotBeNil)
+}

manage/manager.go

@@ -17,6 +17,8 @@ type Config struct {
 func NewManager() *Manager {
 	m := &Manager{
 		injector: inject.New(),
+		rtcfg:    make(map[oauth2.ResponseType]*Config),
+		gtcfg:    make(map[oauth2.GrantType]*Config),
 	}
 	// 设定参数默认值
 	// 设定授权码的有效期为10分钟
@@ -126,14 +128,17 @@ func (m *Manager) MustTokenStorage(stor oauth2.TokenStore, err error) {
 
 // GetClient 获取客户端信息
 func (m *Manager) GetClient(clientID string) (cli oauth2.ClientInfo, err error) {
-	err = m.injector.Apply(func(stor oauth2.ClientStore) {
+	_, ierr := m.injector.Invoke(func(stor oauth2.ClientStore) {
 		cli, err = stor.GetByID(clientID)
 		if err != nil {
 			return
 		} else if cli == nil {
 			err = ErrClientNotFound
 		}
 	})
+	if err == nil && ierr != nil {
+		err = ierr
+	}
 	return
 }
 
@@ -182,7 +187,7 @@ func (m *Manager) GenerateAuthToken(rt oauth2.ResponseType, tgr *oauth2.TokenGen
 // GenerateAccessToken 生成访问令牌、更新令牌
 // gt 授权模式
 // tgr 生成令牌的参数
-func (m *Manager) GenerateAccessToken(gt oauth2.GrantType, tgr *oauth2.TokenGenerateRequest) (token, refresh string, err error) {
+func (m *Manager) GenerateAccessToken(gt oauth2.GrantType, tgr *oauth2.TokenGenerateRequest) (access, refresh string, err error) {
 	if gt == oauth2.AuthorizationCodeCredentials { // 授权码模式
 		ti, terr := m.LoadAccessToken(tgr.Code)
 		if terr != nil {
@@ -211,7 +216,7 @@ func (m *Manager) GenerateAccessToken(gt oauth2.GrantType, tgr *oauth2.TokenGene
 			UserID:   tgr.UserID,
 			CreateAt: time.Now(),
 		}
-		tv, rv, terr := gen.Token(td, tgr.IsGenerateRefresh)
+		av, rv, terr := gen.Token(td, tgr.IsGenerateRefresh)
 		if terr != nil {
 			err = terr
 			return
@@ -223,7 +228,7 @@ func (m *Manager) GenerateAccessToken(gt oauth2.GrantType, tgr *oauth2.TokenGene
 		ti.SetAuthType(gt.String())
 		ti.SetAccessCreateAt(td.CreateAt)
 		ti.SetAccessExpiresIn(m.gtcfg[gt].TokenExp)
-		ti.SetAccess(tv)
+		ti.SetAccess(av)
 		if rv != "" {
 			ti.SetRefreshCreateAt(td.CreateAt)
 			ti.SetRefreshExpiresIn(m.gtcfg[gt].RefreshExp)
@@ -233,7 +238,8 @@ func (m *Manager) GenerateAccessToken(gt oauth2.GrantType, tgr *oauth2.TokenGene
 		if err != nil {
 			return
 		}
-		token = tv
+		access = av
+		refresh = rv
 	})
 	if ierr != nil && err == nil {
 		err = ierr
@@ -269,11 +275,11 @@ func (m *Manager) RefreshAccessToken(refresh, scope string) (token string, err e
 		if scope != "" {
 			ti.SetScope(scope)
 		}
-		if verr := stor.Create(ti); verr != nil {
+		if verr := stor.RemoveByAccess(access); verr != nil {
 			err = verr
 			return
 		}
-		if verr := stor.RemoveByAccess(access); verr != nil {
+		if verr := stor.Create(ti); verr != nil {
 			err = verr
 			return
 		}

store/token/redis.go

@@ -70,8 +70,16 @@ func (rs *RedisStore) Create(info oauth2.TokenInfo) (err error) {
 
 // remove
 func (rs *RedisStore) remove(key string) (err error) {
-	del := rs.cli.Del(key)
-	if verr := del.Err(); verr != nil {
+	info, err := rs.get(key)
+	if err != nil || info == nil {
+		return
+	}
+	pipe := rs.cli.Pipeline()
+	pipe.Del(info.GetAccess())
+	if v := info.GetRefresh(); v != "" {
+		pipe.Del(v)
+	}
+	if _, verr := pipe.Exec(); verr != nil {
 		err = verr
 	}
 	return