Fix redis nil error

clevergo · Mar 29, 2020 · 3786d00 · 3786d00
1 parent 0870ae0
commit 3786d00
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/stores/redisstore/store.go b/stores/redisstore/store.go
@@ -65,16 +65,16 @@ func (s *Store) Get(id string, clear bool) (string, error) {
 	}
 	_, err := tx.Exec()
 	if err != nil {
-		return "", err
+		return "", s.handleError(err)
 	}
 	val, err := get.Result()
 	isNil := false
 	if err != nil {
 		isNil = err == redis.Nil
-		if isNil {
+		if err == redis.Nil {
 			return "", captchas.ErrCaptchaIncorrect
 		}
-		return "", err
+		return "", s.handleError(err)
 	}
 
 	if clear && !isNil {
@@ -95,3 +95,11 @@ func (s *Store) Set(id string, value string) error {
 	}
 	return nil
 }
+
+func (s *Store) handleError(err error) error {
+	if err == redis.Nil {
+		return captchas.ErrCaptchaIncorrect
+	}
+
+	return err
+}
diff --git a/stores/redisstore/store_test.go b/stores/redisstore/store_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/clevergo/captchas"
 	"github.com/go-redis/redis/v7"
 )
 
@@ -79,6 +80,9 @@ func TestStoreGet(t *testing.T) {
 	if err == nil {
 		t.Error("expected a non-nil error, got nil")
 	}
+	if err != captchas.ErrCaptchaIncorrect {
+		t.Errorf("expected error %v, got %v", captchas.ErrCaptchaIncorrect, err)
+	}
 }
 
 func TestStoreSet(t *testing.T) {