fix: Use skipmap as memory storage

LyricTian · LyricTian · commit 38cb0525c80b · 2023-02-13T11:37:57.000+08:00
diff --git a/context.go b/context.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 )
 
-// Define the key in the context
+// Define the keys in the context
 type (
 	ctxResKey struct{}
 	ctxReqKey struct{}
diff --git a/context_test.go b/context_test.go
@@ -3,7 +3,7 @@ package session
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
@@ -48,7 +48,7 @@ func TestContext(t *testing.T) {
 		return
 	}
 
-	buf, _ := ioutil.ReadAll(res.Body)
+	buf, _ := io.ReadAll(res.Body)
 	res.Body.Close()
 	if string(buf) != "ok" {
 		t.Error("Not expected value:", string(buf))
diff --git a/default.go b/default.go
@@ -18,7 +18,7 @@ func manager(opt ...Option) *Manager {
 	return internalManager
 }
 
-// InitManager initialize the global session management instance
+// Initialize the global session management instance
 func InitManager(opt ...Option) {
 	manager(opt...)
 }
@@ -33,7 +33,7 @@ func Destroy(ctx context.Context, w http.ResponseWriter, r *http.Request) error
 	return manager().Destroy(ctx, w, r)
 }
 
-// Refresh a session and return to session storage
+// Refresh and return session storage
 func Refresh(ctx context.Context, w http.ResponseWriter, r *http.Request) (Store, error) {
 	return manager().Refresh(ctx, w, r)
 }
diff --git a/default_test.go b/default_test.go
@@ -2,7 +2,7 @@ package session
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -59,7 +59,7 @@ func TestDefaultStart(t *testing.T) {
 		So(err, ShouldBeNil)
 		So(res, ShouldNotBeNil)
 
-		buf, err := ioutil.ReadAll(res.Body)
+		buf, err := io.ReadAll(res.Body)
 		So(err, ShouldBeNil)
 		res.Body.Close()
 		So(string(buf), ShouldEqual, "bar:true")
@@ -124,7 +124,7 @@ func TestDefaultDestroy(t *testing.T) {
 		So(err, ShouldBeNil)
 		So(res, ShouldNotBeNil)
 
-		buf, err := ioutil.ReadAll(res.Body)
+		buf, err := io.ReadAll(res.Body)
 		So(err, ShouldBeNil)
 		res.Body.Close()
 		So(string(buf), ShouldEqual, "<nil>:false")
@@ -185,7 +185,7 @@ func TestDefaultRefresh(t *testing.T) {
 		So(len(res.Cookies()), ShouldBeGreaterThan, 0)
 		So(res.Cookies()[0].Value, ShouldNotEqual, cookie.Value)
 
-		buf, err := ioutil.ReadAll(res.Body)
+		buf, err := io.ReadAll(res.Body)
 		So(err, ShouldBeNil)
 		res.Body.Close()
 		So(string(buf), ShouldEqual, "bar:true")
diff --git a/go.mod b/go.mod
@@ -5,6 +5,7 @@ go 1.17
 require github.com/smartystreets/goconvey v1.6.4
 
 require (
+	github.com/bytedance/gopkg v0.0.0-20221122125632-68358b8ecec6 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/smartystreets/assertions v1.1.0 // indirect
diff --git a/go.sum b/go.sum
@@ -1,15 +1,25 @@
+github.com/bytedance/gopkg v0.0.0-20221122125632-68358b8ecec6 h1:FCLDGi1EmB7JzjVVYNZiqc/zAJj2BQ5M0lfkVOxbfs8=
+github.com/bytedance/gopkg v0.0.0-20221122125632-68358b8ecec6/go.mod h1:5FoAH5xUHHCMDvQPy1rnj8moqLkLHFaDVBjHhcFwEi0=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v1.1.0 h1:MkTeG1DMwsrdH7QtLXy5W+fUxWq+vmb6cLmyJ7aRtF0=
 github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/session.go b/session.go
@@ -18,11 +18,10 @@ import (
 const Version = "3.1.4"
 
 var (
-	// ErrInvalidSessionID invalid session id
-	ErrInvalidSessionID = errors.New("invalid session id")
+	ErrInvalidSessionID = errors.New("Invalid session id")
 )
 
-// IDHandlerFunc Define the handler to get the session id
+// Define the handler to get the session id
 type IDHandlerFunc func(context.Context) string
 
 // Define default options
@@ -55,103 +54,102 @@ type options struct {
 	store                   ManagerStore
 }
 
-// Option A session parameter options
 type Option func(*options)
 
-// SetSign Set the session id signature value
+// Set the session id signature value
 func SetSign(sign []byte) Option {
 	return func(o *options) {
 		o.sign = sign
 	}
 }
 
-// SetCookieName Set the cookie name
+// Set the cookie name
 func SetCookieName(cookieName string) Option {
 	return func(o *options) {
 		o.cookieName = cookieName
 	}
 }
 
-// SetCookieLifeTime Set the cookie expiration time (in seconds)
+// Set the cookie expiration time (in seconds)
 func SetCookieLifeTime(cookieLifeTime int) Option {
 	return func(o *options) {
 		o.cookieLifeTime = cookieLifeTime
 	}
 }
 
-// SetDomain Set the domain name of the cookie
+// Set the domain name of the cookie
 func SetDomain(domain string) Option {
 	return func(o *options) {
 		o.domain = domain
 	}
 }
 
-// SetSecure Set cookie security
+// Set cookie security
 func SetSecure(secure bool) Option {
 	return func(o *options) {
 		o.secure = secure
 	}
 }
 
-// SetSameSite Set SameSite attribute of the cookie
+// Set SameSite attribute of the cookie
 func SetSameSite(sameSite http.SameSite) Option {
 	return func(o *options) {
 		o.sameSite = sameSite
 	}
 }
 
-// SetExpired Set session expiration time (in seconds)
+// Set session expiration time (in seconds)
 func SetExpired(expired int64) Option {
 	return func(o *options) {
 		o.expired = expired
 	}
 }
 
-// SetSessionID Set callback function to generate session id
+// Set callback function to generate session id
 func SetSessionID(handler IDHandlerFunc) Option {
 	return func(o *options) {
 		o.sessionID = handler
 	}
 }
 
-// SetEnableSetCookie Enable writing session id to cookie
+// Enable writing session id to cookie
 // (enabled by default, can be turned off if no cookie is written)
 func SetEnableSetCookie(enableSetCookie bool) Option {
 	return func(o *options) {
 		o.enableSetCookie = enableSetCookie
 	}
 }
 
-// SetEnableSIDInURLQuery Allow session id from URL query parameters (enabled by default)
+// Allow session id from URL query parameters (enabled by default)
 func SetEnableSIDInURLQuery(enableSIDInURLQuery bool) Option {
 	return func(o *options) {
 		o.enableSIDInURLQuery = enableSIDInURLQuery
 	}
 }
 
-// SetEnableSIDInHTTPHeader Allow session id to be obtained from the request header
+// Allow session id to be obtained from the request header
 func SetEnableSIDInHTTPHeader(enableSIDInHTTPHeader bool) Option {
 	return func(o *options) {
 		o.enableSIDInHTTPHeader = enableSIDInHTTPHeader
 	}
 }
 
-// SetSessionNameInHTTPHeader The key name in the request header where the session ID is stored
+// The key name in the request header where the session ID is stored
 // (if it is empty, the default is the cookie name)
 func SetSessionNameInHTTPHeader(sessionNameInHTTPHeader string) Option {
 	return func(o *options) {
 		o.sessionNameInHTTPHeader = sessionNameInHTTPHeader
 	}
 }
 
-// SetStore Set session management storage
+// Set session management storage
 func SetStore(store ManagerStore) Option {
 	return func(o *options) {
 		o.store = store
 	}
 }
 
-// NewManager Create a session management instance
+// Create a session management instance
 func NewManager(opt ...Option) *Manager {
 	opts := defaultOptions
 	for _, o := range opt {
@@ -168,7 +166,7 @@ func NewManager(opt ...Option) *Manager {
 	return &Manager{opts: &opts}
 }
 
-// Manager A session management instance, including start and destroy operations
+// A session management instance, including start and destroy operations
 type Manager struct {
 	opts *options
 }
@@ -305,8 +303,8 @@ func (m *Manager) Start(ctx context.Context, w http.ResponseWriter, r *http.Requ
 	}
 
 	if sid != "" {
-		if exists, verr := m.opts.store.Check(ctx, sid); verr != nil {
-			return nil, verr
+		if exists, err := m.opts.store.Check(ctx, sid); err != nil {
+			return nil, err
 		} else if exists {
 			return m.opts.store.Update(ctx, sid, m.opts.expired)
 		}
@@ -322,19 +320,19 @@ func (m *Manager) Start(ctx context.Context, w http.ResponseWriter, r *http.Requ
 	return store, nil
 }
 
-// Refresh a session and return to session storage
+// Refresh and return session storage
 func (m *Manager) Refresh(ctx context.Context, w http.ResponseWriter, r *http.Request) (Store, error) {
 	ctx = m.getContext(ctx, w, r)
 
-	oldsid, err := m.sessionID(r)
+	oldSID, err := m.sessionID(r)
 	if err != nil {
 		return nil, err
-	} else if oldsid == "" {
-		oldsid = m.opts.sessionID(ctx)
+	} else if oldSID == "" {
+		oldSID = m.opts.sessionID(ctx)
 	}
 
 	sid := m.opts.sessionID(ctx)
-	store, err := m.opts.store.Refresh(ctx, oldsid, sid, m.opts.expired)
+	store, err := m.opts.store.Refresh(ctx, oldSID, sid, m.opts.expired)
 	if err != nil {
 		return nil, err
 	}
@@ -354,8 +352,7 @@ func (m *Manager) Destroy(ctx context.Context, w http.ResponseWriter, r *http.Re
 		return nil
 	}
 
-	exists, err := m.opts.store.Check(ctx, sid)
-	if err != nil {
+	if exists, err := m.opts.store.Check(ctx, sid); err != nil {
 		return err
 	} else if !exists {
 		return nil
diff --git a/session_test.go b/session_test.go
@@ -2,7 +2,7 @@ package session
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -56,7 +56,7 @@ func TestSessionStart(t *testing.T) {
 		So(err, ShouldBeNil)
 		So(res, ShouldNotBeNil)
 
-		buf, err := ioutil.ReadAll(res.Body)
+		buf, err := io.ReadAll(res.Body)
 		So(err, ShouldBeNil)
 		res.Body.Close()
 		So(string(buf), ShouldEqual, "bar:true")
@@ -127,7 +127,7 @@ func TestSessionDestroy(t *testing.T) {
 		So(err, ShouldBeNil)
 		So(res, ShouldNotBeNil)
 
-		buf, err := ioutil.ReadAll(res.Body)
+		buf, err := io.ReadAll(res.Body)
 		So(err, ShouldBeNil)
 		res.Body.Close()
 		So(string(buf), ShouldEqual, "<nil>:false")
@@ -194,7 +194,7 @@ func TestSessionRefresh(t *testing.T) {
 		So(len(res.Cookies()), ShouldBeGreaterThan, 0)
 		So(res.Cookies()[0].Value, ShouldNotEqual, cookie.Value)
 
-		buf, err := ioutil.ReadAll(res.Body)
+		buf, err := io.ReadAll(res.Body)
 		So(err, ShouldBeNil)
 		res.Body.Close()
 		So(string(buf), ShouldEqual, "bar:true")
diff --git a/store.go b/store.go
diff --git a/util.go b/util.go

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"net/http"`
`6`	`6`	`)`
`7`	`7`
`8`		`-// Define the key in the context`
	`8`	`+// Define the keys in the context`
`9`	`9`	`type (`
`10`	`10`	`ctxResKey struct{}`
`11`	`11`	`ctxReqKey struct{}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func manager(opt ...Option) *Manager {`
`18`	`18`	`return internalManager`
`19`	`19`	`}`
`20`	`20`
`21`		`-// InitManager initialize the global session management instance`
	`21`	`+// Initialize the global session management instance`
`22`	`22`	`func InitManager(opt ...Option) {`
`23`	`23`	`manager(opt...)`
`24`	`24`	`}`
`@@ -33,7 +33,7 @@ func Destroy(ctx context.Context, w http.ResponseWriter, r *http.Request) error`
`33`	`33`	`return manager().Destroy(ctx, w, r)`
`34`	`34`	`}`
`35`	`35`
`36`		`-// Refresh a session and return to session storage`
	`36`	`+// Refresh and return session storage`
`37`	`37`	`func Refresh(ctx context.Context, w http.ResponseWriter, r *http.Request) (Store, error) {`
`38`	`38`	`return manager().Refresh(ctx, w, r)`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,10 @@ import (`
`18`	`18`	`const Version = "3.1.4"`
`19`	`19`
`20`	`20`	`var (`
`21`		`- // ErrInvalidSessionID invalid session id`
`22`		`- ErrInvalidSessionID = errors.New("invalid session id")`
	`21`	`+ ErrInvalidSessionID = errors.New("Invalid session id")`
`23`	`22`	`)`
`24`	`23`
`25`		`-// IDHandlerFunc Define the handler to get the session id`
	`24`	`+// Define the handler to get the session id`
`26`	`25`	`type IDHandlerFunc func(context.Context) string`
`27`	`26`
`28`	`27`	`// Define default options`
`@@ -55,103 +54,102 @@ type options struct {`
`55`	`54`	`store ManagerStore`
`56`	`55`	`}`
`57`	`56`
`58`		`-// Option A session parameter options`
`59`	`57`	`type Option func(*options)`
`60`	`58`
`61`		`-// SetSign Set the session id signature value`
	`59`	`+// Set the session id signature value`
`62`	`60`	`func SetSign(sign []byte) Option {`
`63`	`61`	`return func(o *options) {`
`64`	`62`	`o.sign = sign`
`65`	`63`	`}`
`66`	`64`	`}`
`67`	`65`
`68`		`-// SetCookieName Set the cookie name`
	`66`	`+// Set the cookie name`
`69`	`67`	`func SetCookieName(cookieName string) Option {`
`70`	`68`	`return func(o *options) {`
`71`	`69`	`o.cookieName = cookieName`
`72`	`70`	`}`
`73`	`71`	`}`
`74`	`72`
`75`		`-// SetCookieLifeTime Set the cookie expiration time (in seconds)`
	`73`	`+// Set the cookie expiration time (in seconds)`
`76`	`74`	`func SetCookieLifeTime(cookieLifeTime int) Option {`
`77`	`75`	`return func(o *options) {`
`78`	`76`	`o.cookieLifeTime = cookieLifeTime`
`79`	`77`	`}`
`80`	`78`	`}`
`81`	`79`
`82`		`-// SetDomain Set the domain name of the cookie`
	`80`	`+// Set the domain name of the cookie`
`83`	`81`	`func SetDomain(domain string) Option {`
`84`	`82`	`return func(o *options) {`
`85`	`83`	`o.domain = domain`
`86`	`84`	`}`
`87`	`85`	`}`
`88`	`86`
`89`		`-// SetSecure Set cookie security`
	`87`	`+// Set cookie security`
`90`	`88`	`func SetSecure(secure bool) Option {`
`91`	`89`	`return func(o *options) {`
`92`	`90`	`o.secure = secure`
`93`	`91`	`}`
`94`	`92`	`}`
`95`	`93`
`96`		`-// SetSameSite Set SameSite attribute of the cookie`
	`94`	`+// Set SameSite attribute of the cookie`
`97`	`95`	`func SetSameSite(sameSite http.SameSite) Option {`
`98`	`96`	`return func(o *options) {`
`99`	`97`	`o.sameSite = sameSite`
`100`	`98`	`}`
`101`	`99`	`}`
`102`	`100`
`103`		`-// SetExpired Set session expiration time (in seconds)`
	`101`	`+// Set session expiration time (in seconds)`
`104`	`102`	`func SetExpired(expired int64) Option {`
`105`	`103`	`return func(o *options) {`
`106`	`104`	`o.expired = expired`
`107`	`105`	`}`
`108`	`106`	`}`
`109`	`107`
`110`		`-// SetSessionID Set callback function to generate session id`
	`108`	`+// Set callback function to generate session id`
`111`	`109`	`func SetSessionID(handler IDHandlerFunc) Option {`
`112`	`110`	`return func(o *options) {`
`113`	`111`	`o.sessionID = handler`
`114`	`112`	`}`
`115`	`113`	`}`
`116`	`114`
`117`		`-// SetEnableSetCookie Enable writing session id to cookie`
	`115`	`+// Enable writing session id to cookie`
`118`	`116`	`// (enabled by default, can be turned off if no cookie is written)`
`119`	`117`	`func SetEnableSetCookie(enableSetCookie bool) Option {`
`120`	`118`	`return func(o *options) {`
`121`	`119`	`o.enableSetCookie = enableSetCookie`
`122`	`120`	`}`
`123`	`121`	`}`
`124`	`122`
`125`		`-// SetEnableSIDInURLQuery Allow session id from URL query parameters (enabled by default)`
	`123`	`+// Allow session id from URL query parameters (enabled by default)`
`126`	`124`	`func SetEnableSIDInURLQuery(enableSIDInURLQuery bool) Option {`
`127`	`125`	`return func(o *options) {`
`128`	`126`	`o.enableSIDInURLQuery = enableSIDInURLQuery`
`129`	`127`	`}`
`130`	`128`	`}`
`131`	`129`
`132`		`-// SetEnableSIDInHTTPHeader Allow session id to be obtained from the request header`
	`130`	`+// Allow session id to be obtained from the request header`
`133`	`131`	`func SetEnableSIDInHTTPHeader(enableSIDInHTTPHeader bool) Option {`
`134`	`132`	`return func(o *options) {`
`135`	`133`	`o.enableSIDInHTTPHeader = enableSIDInHTTPHeader`
`136`	`134`	`}`
`137`	`135`	`}`
`138`	`136`
`139`		`-// SetSessionNameInHTTPHeader The key name in the request header where the session ID is stored`
	`137`	`+// The key name in the request header where the session ID is stored`
`140`	`138`	`// (if it is empty, the default is the cookie name)`
`141`	`139`	`func SetSessionNameInHTTPHeader(sessionNameInHTTPHeader string) Option {`
`142`	`140`	`return func(o *options) {`
`143`	`141`	`o.sessionNameInHTTPHeader = sessionNameInHTTPHeader`
`144`	`142`	`}`
`145`	`143`	`}`
`146`	`144`
`147`		`-// SetStore Set session management storage`
	`145`	`+// Set session management storage`
`148`	`146`	`func SetStore(store ManagerStore) Option {`
`149`	`147`	`return func(o *options) {`
`150`	`148`	`o.store = store`
`151`	`149`	`}`
`152`	`150`	`}`
`153`	`151`
`154`		`-// NewManager Create a session management instance`
	`152`	`+// Create a session management instance`
`155`	`153`	`func NewManager(opt ...Option) *Manager {`
`156`	`154`	`opts := defaultOptions`
`157`	`155`	`for _, o := range opt {`
`@@ -168,7 +166,7 @@ func NewManager(opt ...Option) *Manager {`
`168`	`166`	`return &Manager{opts: &opts}`
`169`	`167`	`}`
`170`	`168`
`171`		`-// Manager A session management instance, including start and destroy operations`
	`169`	`+// A session management instance, including start and destroy operations`
`172`	`170`	`type Manager struct {`
`173`	`171`	`opts *options`
`174`	`172`	`}`
`@@ -305,8 +303,8 @@ func (m Manager) Start(ctx context.Context, w http.ResponseWriter, r http.Requ`
`305`	`303`	`}`
`306`	`304`
`307`	`305`	`if sid != "" {`
`308`		`- if exists, verr := m.opts.store.Check(ctx, sid); verr != nil {`
`309`		`- return nil, verr`
	`306`	`+ if exists, err := m.opts.store.Check(ctx, sid); err != nil {`
	`307`	`+ return nil, err`
`310`	`308`	`} else if exists {`
`311`	`309`	`return m.opts.store.Update(ctx, sid, m.opts.expired)`
`312`	`310`	`}`
`@@ -322,19 +320,19 @@ func (m Manager) Start(ctx context.Context, w http.ResponseWriter, r http.Requ`
`322`	`320`	`return store, nil`
`323`	`321`	`}`
`324`	`322`
`325`		`-// Refresh a session and return to session storage`
	`323`	`+// Refresh and return session storage`
`326`	`324`	`func (m Manager) Refresh(ctx context.Context, w http.ResponseWriter, r http.Request) (Store, error) {`
`327`	`325`	`ctx = m.getContext(ctx, w, r)`
`328`	`326`
`329`		`- oldsid, err := m.sessionID(r)`
	`327`	`+ oldSID, err := m.sessionID(r)`
`330`	`328`	`if err != nil {`
`331`	`329`	`return nil, err`
`332`		`- } else if oldsid == "" {`
`333`		`- oldsid = m.opts.sessionID(ctx)`
	`330`	`+ } else if oldSID == "" {`
	`331`	`+ oldSID = m.opts.sessionID(ctx)`
`334`	`332`	`}`
`335`	`333`
`336`	`334`	`sid := m.opts.sessionID(ctx)`
`337`		`- store, err := m.opts.store.Refresh(ctx, oldsid, sid, m.opts.expired)`
	`335`	`+ store, err := m.opts.store.Refresh(ctx, oldSID, sid, m.opts.expired)`
`338`	`336`	`if err != nil {`
`339`	`337`	`return nil, err`
`340`	`338`	`}`
`@@ -354,8 +352,7 @@ func (m Manager) Destroy(ctx context.Context, w http.ResponseWriter, r http.Re`
`354`	`352`	`return nil`
`355`	`353`	`}`
`356`	`354`
`357`		`- exists, err := m.opts.store.Check(ctx, sid)`
`358`		`- if err != nil {`
	`355`	`+ if exists, err := m.opts.store.Check(ctx, sid); err != nil {`
`359`	`356`	`return err`
`360`	`357`	`} else if !exists {`
`361`	`358`	`return nil`