Commit 7c697bb

committed

Fixed redis options

1 parent d1804af commit 7c697bbCopy full SHA for 7c697bb

File tree

+10

-167

lines changed

+10

-167

lines changed

Lines changed: 0 additions & 157 deletions

This file was deleted.

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ var (`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`// NewRedisStore create an instance of a redis store`
`21`		`-func NewRedisStore(opts Options) TokenStore {`
	`21`	`+func NewRedisStore(opts redis.Options, keyNamespace...string) TokenStore {`
`22`	`22`	`if opts == nil {`
`23`	`23`	`panic("options cannot be nil")`
`24`	`24`	`}`
`25`		`- return NewRedisStoreWithCli(redis.NewClient(opts.redisOptions()), opts.KeyNamespace)`
	`25`	`+ return NewRedisStoreWithCli(redis.NewClient(opts), keyNamespace...)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// NewRedisStoreWithCli create an instance of a redis store`
`@@ -38,11 +38,11 @@ func NewRedisStoreWithCli(cli redis.Client, keyNamespace ...string) TokenStore`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// NewRedisClusterStore create an instance of a redis cluster store`
`41`		`-func NewRedisClusterStore(opts ClusterOptions) TokenStore {`
	`41`	`+func NewRedisClusterStore(opts redis.ClusterOptions, keyNamespace...string) TokenStore {`
`42`	`42`	`if opts == nil {`
`43`	`43`	`panic("options cannot be nil")`
`44`	`44`	`}`
`45`		`- return NewRedisClusterStoreWithCli(redis.NewClusterClient(opts.redisClusterOptions()), opts.KeyNamespace)`
	`45`	`+ return NewRedisClusterStoreWithCli(redis.NewClusterClient(opts), keyNamespace...)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`// NewRedisClusterStoreWithCli create an instance of a redis cluster store`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`	`"time"`
`6`	`6`
	`7`	`+ "github.com/go-redis/redis"`
`7`	`8`	`"gopkg.in/oauth2.v3/models"`
`8`	`9`
`9`	`10`	`. "github.com/smartystreets/goconvey/convey"`
`@@ -16,7 +17,7 @@ const (`
`16`	`17`
`17`	`18`	`func TestTokenStore(t *testing.T) {`
`18`	`19`	`Convey("Test redis token store", t, func() {`
`19`		`- opts := &Options{`
	`20`	`+ opts := &redis.Options{`
`20`	`21`	`Addr: addr,`
`21`	`22`	`DB: db,`
`22`	`23`	`}`
`@@ -104,12 +105,11 @@ func TestTokenStore(t *testing.T) {`
`104`	`105`
`105`	`106`	`func TestTokenStoreWithKeyNamespace(t *testing.T) {`
`106`	`107`	`Convey("Test redis token store", t, func() {`
`107`		`- opts := &Options{`
`108`		`- Addr: addr,`
`109`		`- DB: db,`
`110`		`- KeyNamespace: "test:",`
	`108`	`+ opts := &redis.Options{`
	`109`	`+ Addr: addr,`
	`110`	`+ DB: db,`
`111`	`111`	`}`
`112`		`- store := NewRedisStore(opts)`
	`112`	`+ store := NewRedisStore(opts, "test:")`
`113`	`113`
`114`	`114`	`Convey("Test authorization code store", func() {`
`115`	`115`	`info := &models.Token{`

Comments

(0)