Merge pull request #5 from Tazer/master

added support for key prefix / namespacing

Author: LyricTian

config.go

@@ -66,6 +66,9 @@ type Config struct {
 
 	// TLS Config to use. When set TLS will be negotiated.
 	TLSConfig *tls.Config
+
+	//KeyNamespace used for prefixing/namespacing keys.
+	KeyNamespace string
 }
 
 func (o *Config) redisOptions() *redis.Options {

token.go

@@ -20,13 +20,14 @@ func NewTokenStore(cfg *Config) (ts oauth2.TokenStore, err error) {
 		err = verr
 		return
 	}
-	ts = &TokenStore{cli: cli}
+	ts = &TokenStore{cli: cli, KeyNamespace: cfg.KeyNamespace}
 	return
 }
 
 // TokenStore redis token store
 type TokenStore struct {
-	cli *redis.Client
+	cli          *redis.Client
+	KeyNamespace string
 }
 
 // Create Create and store the new token information
@@ -39,7 +40,7 @@ func (rs *TokenStore) Create(info oauth2.TokenInfo) (err error) {
 
 	pipe := rs.cli.Pipeline()
 	if code := info.GetCode(); code != "" {
-		pipe.Set(code, jv, info.GetCodeExpiresIn())
+		pipe.Set(rs.KeyNamespace+code, jv, info.GetCodeExpiresIn())
 	} else {
 		basicID := uuid.Must(uuid.NewV4()).String()
 		aexp := info.GetAccessExpiresIn()
@@ -50,11 +51,11 @@ func (rs *TokenStore) Create(info oauth2.TokenInfo) (err error) {
 			if aexp.Seconds() > rexp.Seconds() {
 				aexp = rexp
 			}
-			pipe.Set(refresh, basicID, rexp)
+			pipe.Set(rs.KeyNamespace+refresh, basicID, rexp)
 		}
 
-		pipe.Set(info.GetAccess(), basicID, aexp)
-		pipe.Set(basicID, jv, rexp)
+		pipe.Set(rs.KeyNamespace+info.GetAccess(), basicID, aexp)
+		pipe.Set(rs.KeyNamespace+basicID, jv, rexp)
 	}
 
 	if _, verr := pipe.Exec(); verr != nil {
@@ -65,7 +66,7 @@ func (rs *TokenStore) Create(info oauth2.TokenInfo) (err error) {
 
 // remove
 func (rs *TokenStore) remove(key string) (err error) {
-	_, verr := rs.cli.Del(key).Result()
+	_, verr := rs.cli.Del(rs.KeyNamespace + key).Result()
 	if verr != redis.Nil {
 		err = verr
 	}
@@ -91,7 +92,7 @@ func (rs *TokenStore) RemoveByRefresh(refresh string) (err error) {
 }
 
 func (rs *TokenStore) getData(key string) (ti oauth2.TokenInfo, err error) {
-	result := rs.cli.Get(key)
+	result := rs.cli.Get(rs.KeyNamespace + key)
 	if verr := result.Err(); verr != nil {
 		if verr == redis.Nil {
 			return
@@ -113,7 +114,7 @@ func (rs *TokenStore) getData(key string) (ti oauth2.TokenInfo, err error) {
 }
 
 func (rs *TokenStore) getBasicID(token string) (basicID string, err error) {
-	tv, verr := rs.cli.Get(token).Result()
+	tv, verr := rs.cli.Get(rs.KeyNamespace + token).Result()
 	if verr != nil {
 		if verr == redis.Nil {
 			return

token_test.go

@@ -97,3 +97,92 @@ func TestTokenStore(t *testing.T) {
 		})
 	})
 }
+
+func TestTokenStoreWithKeyNamespace(t *testing.T) {
+	Convey("Test redis token store", t, func() {
+		cfg := &redis.Config{
+			Addr:         "127.0.0.1:6379",
+			KeyNamespace: "test:",
+		}
+		store, err := redis.NewTokenStore(cfg)
+		So(err, ShouldBeNil)
+
+		Convey("Test authorization code store", func() {
+			info := &models.Token{
+				ClientID:      "1",
+				UserID:        "1_1",
+				RedirectURI:   "http://localhost/",
+				Scope:         "all",
+				Code:          "11_11_11",
+				CodeCreateAt:  time.Now(),
+				CodeExpiresIn: time.Second * 5,
+			}
+			err := store.Create(info)
+			So(err, ShouldBeNil)
+
+			cinfo, err := store.GetByCode(info.Code)
+			So(err, ShouldBeNil)
+			So(cinfo.GetUserID(), ShouldEqual, info.UserID)
+
+			err = store.RemoveByCode(info.Code)
+			So(err, ShouldBeNil)
+
+			cinfo, err = store.GetByCode(info.Code)
+			So(err, ShouldBeNil)
+			So(cinfo, ShouldBeNil)
+		})
+
+		Convey("Test access token store", func() {
+			info := &models.Token{
+				ClientID:        "1",
+				UserID:          "1_1",
+				RedirectURI:     "http://localhost/",
+				Scope:           "all",
+				Access:          "1_1_1",
+				AccessCreateAt:  time.Now(),
+				AccessExpiresIn: time.Second * 5,
+			}
+			err := store.Create(info)
+			So(err, ShouldBeNil)
+
+			ainfo, err := store.GetByAccess(info.GetAccess())
+			So(err, ShouldBeNil)
+			So(ainfo.GetUserID(), ShouldEqual, info.GetUserID())
+
+			err = store.RemoveByAccess(info.GetAccess())
+			So(err, ShouldBeNil)
+
+			ainfo, err = store.GetByAccess(info.GetAccess())
+			So(err, ShouldBeNil)
+			So(ainfo, ShouldBeNil)
+		})
+
+		Convey("Test refresh token store", func() {
+			info := &models.Token{
+				ClientID:         "1",
+				UserID:           "1_2",
+				RedirectURI:      "http://localhost/",
+				Scope:            "all",
+				Access:           "1_2_1",
+				AccessCreateAt:   time.Now(),
+				AccessExpiresIn:  time.Second * 5,
+				Refresh:          "1_2_2",
+				RefreshCreateAt:  time.Now(),
+				RefreshExpiresIn: time.Second * 15,
+			}
+			err := store.Create(info)
+			So(err, ShouldBeNil)
+
+			rinfo, err := store.GetByRefresh(info.GetRefresh())
+			So(err, ShouldBeNil)
+			So(rinfo.GetUserID(), ShouldEqual, info.GetUserID())
+
+			err = store.RemoveByRefresh(info.GetRefresh())
+			So(err, ShouldBeNil)
+
+			rinfo, err = store.GetByRefresh(info.GetRefresh())
+			So(err, ShouldBeNil)
+			So(rinfo, ShouldBeNil)
+		})
+	})
+}