add session.Destroy method.

Author: zensh

.travis.yml

@@ -6,6 +6,11 @@ go:
   - 1.8.1
   - 1.8.2
   - 1.8.3
+  - 1.8.4
+  - 1.8.5
+  - 1.9
+  - 1.9.1
+  - 1.9.2
 before_install:
   - go get -t -v ./...
   - go get github.com/mattn/goveralls

README.md

@@ -44,6 +44,10 @@ func (s *Session) Save() error {
   return s.GetStore().Save(s)
 }
 
+func (s *Session) Destroy() error {
+  return s.GetStore().Destroy(s)
+}
+
 func main() {
   SessionName := "Sess"
   SessionKeys := []string{"keyxxx"}

cookiestore.go

@@ -57,3 +57,9 @@ func (c *CookieStore) Save(session Sessions) (err error) {
 	}
 	return
 }
+
+// Destroy destroy the session
+func (c *CookieStore) Destroy(session Sessions) (err error) {
+	session.GetCookie().Remove(session.GetName(), c.opts)
+	return
+}

example/main.go

@@ -21,6 +21,11 @@ func (s *Session) Save() error {
 	return s.GetStore().Save(s)
 }
 
+// Destroy ...
+func (s *Session) Destroy() error {
+	return s.GetStore().Destroy(s)
+}
+
 func main() {
 	SessionName := "Sess"
 	SessionKeys := []string{"keyxxx"}

memorystore.go

@@ -16,7 +16,7 @@ func NewMemoryStore(options ...*Options) (store *MemoryStore) {
 	opts := &cookie.Options{
 		Path:     "/",
 		HTTPOnly: true,
-		Signed:   true,
+		Signed:   false, // not necessary
 		MaxAge:   24 * 60 * 60,
 	}
 	if len(options) > 0 && options[0] != nil {
@@ -90,15 +90,27 @@ func (m *MemoryStore) Save(session Sessions) (err error) {
 	return
 }
 
+// Destroy destroy the session
+func (m *MemoryStore) Destroy(session Sessions) (err error) {
+	sid := session.GetSID()
+	if sid != "" {
+		m.lock.Lock()
+		defer m.lock.Unlock()
+		delete(m.store, sid)
+	}
+	session.GetCookie().Remove(session.GetName(), m.opts)
+	return
+}
+
 // Len ...
 func (m *MemoryStore) Len() int {
 	m.lock.Lock()
 	defer m.lock.Unlock()
 	return len(m.store)
 }
 
-// Destroy goroutine cleanCache thread
-func (m *MemoryStore) Destroy() {
+// Close goroutine cleanCache thread
+func (m *MemoryStore) Close() {
 	close(m.done)
 }
 
@@ -113,6 +125,7 @@ func (m *MemoryStore) cleanCache() {
 		}
 	}
 }
+
 func (m *MemoryStore) clean() {
 	m.lock.Lock()
 	defer m.lock.Unlock()

memorystore_test.go

@@ -59,25 +59,25 @@ func TestMemoryStore(t *testing.T) {
 			assert.Equal(int64(useage), session.Age)
 			assert.False(session.IsNew())
 			assert.True(session.GetSID() != "")
+			assert.Nil(session.Destroy())
 		})
+		recorder = httptest.NewRecorder()
 		handler.ServeHTTP(recorder, req)
 
-		//====== reuse session=====
-
+		//====== destroy session=====
 		req, err = http.NewRequest("GET", "/", nil)
 		migrateCookies(recorder, req)
 
 		handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			session := &Session{Meta: &sessions.Meta{}}
-			store.Load(SessionName, session, cookie.New(w, r, SessionKeys...))
-
-			assert.Equal(username, session.Name)
-			assert.Equal(useage, session.Age)
-			assert.False(session.IsNew())
-			assert.True(session.GetSID() != "")
+			err := store.Load(SessionName, session, cookie.New(w, r, SessionKeys...))
+			assert.NotNil(err)
+			assert.True(session.IsNew())
 		})
+		recorder = httptest.NewRecorder()
 		handler.ServeHTTP(recorder, req)
 	})
+
 	t.Run("Sessions with sign session that should be", func(t *testing.T) {
 		assert := assert.New(t)
 		recorder := httptest.NewRecorder()
@@ -117,9 +117,10 @@ func TestMemoryStore(t *testing.T) {
 			assert.Equal(secondUsage, session.Age)
 
 		})
+		recorder = httptest.NewRecorder()
 		handler.ServeHTTP(recorder, req)
-
 	})
+
 	t.Run("Sessions with Name() and Store()  that should be", func(t *testing.T) {
 		assert := assert.New(t)
 		recorder := httptest.NewRecorder()
@@ -155,6 +156,7 @@ func TestMemoryStore(t *testing.T) {
 		assert.Equal(true, cookies.Secure)
 
 	})
+
 	t.Run("Sessions donn't override old value when seting same value that should be", func(t *testing.T) {
 		assert := assert.New(t)
 		req, err := http.NewRequest("GET", "/", nil)
@@ -184,6 +186,7 @@ func TestMemoryStore(t *testing.T) {
 		})
 		handler.ServeHTTP(recorder, req)
 	})
+
 	t.Run("Sessions with high goroutine should be", func(t *testing.T) {
 		assert := assert.New(t)
 		req, err := http.NewRequest("GET", "/", nil)
@@ -237,9 +240,10 @@ func TestMemoryStore(t *testing.T) {
 		})
 		handler.ServeHTTP(recorder, req)
 
-		store.Destroy()
+		store.Close()
 	})
 }
+
 func genID() string {
 	buf := make([]byte, 12)
 	_, err := rand.Read(buf)

sessions.go

@@ -18,12 +18,14 @@ type Store interface {
 	Load(name string, session Sessions, cookie *cookie.Cookies) error
 	// Save should persist session to the underlying store implementation.
 	Save(session Sessions) error
+	// Destroy should destroy the session.
+	Destroy(session Sessions) error
 }
 
 // Sessions ...
 type Sessions interface {
 	// Init sets current cookie.Cookies and Store to the session instance.
-	Init(name, sid string, c *cookie.Cookies, store Store, lastvalue string)
+	Init(name, sid string, c *cookie.Cookies, store Store, lastValue string)
 	// GetSID returns the session' sid
 	GetSID() string
 	// GetName returns the session' name
@@ -41,20 +43,20 @@ type Sessions interface {
 // Meta stores the values and optional configuration for a session.
 type Meta struct {
 	// Values map[string]interface{}
-	sid      string
-	store    Store
-	name     string
-	cookie   *cookie.Cookies
-	lastvale string
+	sid       string
+	store     Store
+	name      string
+	cookie    *cookie.Cookies
+	lastValue string
 }
 
 // Init sets current cookie.Cookies and Store to the session instance.
-func (s *Meta) Init(name, sid string, c *cookie.Cookies, store Store, lastvalue string) {
+func (s *Meta) Init(name, sid string, c *cookie.Cookies, store Store, lastValue string) {
 	s.name = name
 	s.sid = sid
 	s.cookie = c
 	s.store = store
-	s.lastvale = lastvalue
+	s.lastValue = lastValue
 }
 
 // GetSID returns the session' sid
@@ -79,7 +81,7 @@ func (s *Meta) GetCookie() *cookie.Cookies {
 
 // IsChanged to check current session's value whether is changed
 func (s *Meta) IsChanged(val string) bool {
-	return s.lastvale != val
+	return s.lastValue != val
 }
 
 // IsNew to check the current session whether it's new user

sessions_test.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
+	"time"
 
 	"github.com/go-http-utils/cookie"
 	"github.com/go-http-utils/cookie-session"
@@ -22,6 +23,11 @@ type Session struct {
 func (s *Session) Save() error {
 	return s.GetStore().Save(s)
 }
+
+func (s *Session) Destroy() error {
+	return s.GetStore().Destroy(s)
+}
+
 func TestSessions(t *testing.T) {
 
 	SessionName := "teambition"
@@ -80,6 +86,7 @@ func TestSessions(t *testing.T) {
 		})
 		handler.ServeHTTP(recorder, req)
 	})
+
 	t.Run("Sessions with sign session that should be", func(t *testing.T) {
 		assert := assert.New(t)
 		recorder := httptest.NewRecorder()
@@ -124,6 +131,7 @@ func TestSessions(t *testing.T) {
 		handler.ServeHTTP(recorder, req)
 
 	})
+
 	t.Run("Sessions with Name() and Store()  that should be", func(t *testing.T) {
 		assert := assert.New(t)
 		recorder := httptest.NewRecorder()
@@ -159,6 +167,7 @@ func TestSessions(t *testing.T) {
 		assert.Equal(true, cookies.Secure)
 
 	})
+
 	t.Run("Sessions with Encode() and Decode()  that should be", func(t *testing.T) {
 		assert := assert.New(t)
 		dt := make(map[string]interface{})
@@ -168,7 +177,8 @@ func TestSessions(t *testing.T) {
 		_, err = sessions.Encode(make(chan int))
 		assert.NotNil(err)
 	})
-	t.Run("Sessions donn't override old value when seting same value that should be", func(t *testing.T) {
+
+	t.Run("Sessions don't override old value when seting same value that should be", func(t *testing.T) {
 		assert := assert.New(t)
 		req, err := http.NewRequest("GET", "/", nil)
 		assert.Nil(err)
@@ -247,6 +257,7 @@ func TestSessionCompatible(t *testing.T) {
 		handler.ServeHTTP(recorder, req)
 	})
 }
+
 func getCookie(name string, recorder *httptest.ResponseRecorder) (*http.Cookie, error) {
 	var err error
 	res := &http.Response{Header: http.Header{"Set-Cookie": recorder.HeaderMap["Set-Cookie"]}}
@@ -257,8 +268,11 @@ func getCookie(name string, recorder *httptest.ResponseRecorder) (*http.Cookie,
 	}
 	return nil, err
 }
+
 func migrateCookies(recorder *httptest.ResponseRecorder, req *http.Request) {
 	for _, cookie := range recorder.Result().Cookies() {
-		req.AddCookie(cookie)
+		if !cookie.Expires.IsZero() && !cookie.Expires.Before(time.Now()) {
+			req.AddCookie(cookie)
+		}
 	}
 }