Fix expire token in memory storage

Author: pr0head

storage/memory/memory_storage.go

@@ -15,7 +15,7 @@ const (
 
 type entry struct {
 	value    []byte
-	duration time.Duration
+	duration time.Time
 }
 
 type tokenStorageMemory struct {
@@ -32,7 +32,7 @@ func NewStorage(maxSize int) storage.Adapter {
 func (tsm tokenStorageMemory) Set(token string, expire int64, introspect []byte) error {
 	e := &entry{
 		value:    introspect,
-		duration: time.Unix(expire, 0).Sub(time.Now()),
+		duration: time.Unix(expire, 0),
 	}
 	tsm.cache.Add(token, e)
 	return nil
@@ -41,8 +41,7 @@ func (tsm tokenStorageMemory) Set(token string, expire int64, introspect []byte)
 func (tsm tokenStorageMemory) Get(token string) ([]byte, error) {
 	if e, ok := tsm.cache.Get(token); ok {
 		entry := e.(*entry)
-		exp := time.Now().Add(entry.duration)
-		if exp.Before(time.Now()) {
+		if entry.duration.Before(time.Now()) {
 			_ = tsm.Delete(token)
 			return nil, errors.New(ErrorTokenIsExpired)
 		}

storage/memory/memory_storage_test.go

@@ -28,12 +28,14 @@ func TestSetAndGetToken(t *testing.T) {
 func TestExpireToken(t *testing.T) {
 	st := createStorage(1)
 	tName := fmt.Sprintf("%d", time.Now().UnixNano())
-	exp := time.Now().Add(time.Second).Unix() - 1
+	exp := time.Now().Add(time.Second).Unix() + 2
 	token := []byte(tName)
 	if err := st.Set(tName, exp, token); err != nil {
 		t.Log("Unable to add token to the memory")
 	}
 
+	time.Sleep(3 * time.Second)
+
 	_, err := st.Get(tName)
 	if err == nil {
 		t.Error("An expired token should not be received")