improve New function

README.md

@@ -15,7 +15,7 @@ Advanced cookie library for Go, support signed cookies.
 
 ## API
 
-### cookie.New(w http.ResponseWriter, r *http.Request[, keys []string])
+### cookie.New(w http.ResponseWriter, r *http.Request[, keys ...string])
 It returns a Cookies instance with optional keygrip for signed cookies.
 
 ### cookies.Set(name, val string[, opts *Options])
@@ -46,7 +46,7 @@ import (
 
 func main() {
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		cookies := cookie.New(w, r, []string{"some key"})
+		cookies := cookie.New(w, r, "some key")
 
 		cookies.Set("test", "some cookie", &cookie.Options{
 			Signed:   true,

cookie.go

@@ -57,14 +57,14 @@ func SetHash(fn func(key, data string) []byte) {
 	hasher = fn
 }
 
-// New returns a Cookies instance with optional keygrip for signed cookies.
-func New(w http.ResponseWriter, r *http.Request, keys ...[]string) (cookie *Cookies) {
+// New returns a Cookies instance with optional keys for signed cookies.
+func New(w http.ResponseWriter, r *http.Request, keys ...string) (cookie *Cookies) {
 	c := &Cookies{
 		req: r,
 		w:   w,
 	}
-	if len(keys) > 0 && len(keys[0]) > 0 {
-		c.keys = keys[0]
+	if len(keys) > 0 {
+		c.keys = keys
 	}
 	return c
 }
@@ -139,11 +139,6 @@ func (c *Cookies) Set(name, val string, options ...*Options) *Cookies {
 	return c
 }
 
-// keygrip uses for signing and verifying data through a rotating credential system.
-type keygrip struct {
-	keys []string
-}
-
 // sign creates a summary with data and sha1 algorithm
 func sign(key, data string) string {
 	return base64.RawURLEncoding.EncodeToString(hasher(key, data))

cookie_test.go

@@ -48,10 +48,10 @@ func TestCookie(t *testing.T) {
 		cookievalue := "xxxxx"
 		recorder := httptest.NewRecorder()
 		handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			cookies := New(w, r, []string{})
+			cookies := New(w, r, []string{}...)
 			assert.Nil(cookies.keys)
 
-			cookies = New(w, r, keys)
+			cookies = New(w, r, keys...)
 			cookies.Set(cookiekey, cookievalue, &Options{
 				Signed:   true,
 				HTTPOnly: true,
@@ -85,7 +85,7 @@ func TestCookie(t *testing.T) {
 		cookievalue := "xxxxx"
 		recorder := httptest.NewRecorder()
 		handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			cookies := New(w, r, keys)
+			cookies := New(w, r, keys...)
 			cookies.Set(cookiekey, cookievalue, &Options{
 				Signed: false,
 			})
@@ -108,7 +108,7 @@ func TestCookie(t *testing.T) {
 		cookievalue := "xxxxx"
 		recorder := httptest.NewRecorder()
 		handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			cookies := New(w, r, keys)
+			cookies := New(w, r, keys...)
 			opts := &Options{
 				Signed: true,
 				MaxAge: -1,
@@ -132,7 +132,7 @@ func TestCookie(t *testing.T) {
 
 		handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			t.Log(r.Cookies())
-			cookies := New(w, r, keys)
+			cookies := New(w, r, keys...)
 
 			val, err := cookies.Get(cookiekey + "cc")
 			assert.NotNil(err)
@@ -161,7 +161,7 @@ func TestCookie(t *testing.T) {
 
 		handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			t.Log(r.Cookies())
-			cookies := New(w, r, keys)
+			cookies := New(w, r, keys...)
 			val, err := cookies.Get(cookiekey, true)
 			assert.Equal(err.Error(), "invalid signed cookie")
 			assert.NotEqual(val, cookievalue)
@@ -218,7 +218,7 @@ func TestCookie(t *testing.T) {
 		cookievalue := "xxxxx"
 		recorder := httptest.NewRecorder()
 		handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			cookies := New(w, r, keys)
+			cookies := New(w, r, keys...)
 			opts := &Options{
 				Signed: true,
 				MaxAge: -1,
@@ -243,7 +243,7 @@ func TestCookie(t *testing.T) {
 
 		handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			t.Log(r.Cookies())
-			cookies := New(w, r, keys)
+			cookies := New(w, r, keys...)
 			val, err := cookies.Get(cookiekey, true)
 			assert.Nil(err)
 			assert.Equal(val, cookievalue)
@@ -270,7 +270,7 @@ func TestCookie(t *testing.T) {
 
 		handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			t.Log(r.Cookies())
-			cookies := New(w, r, keys)
+			cookies := New(w, r, keys...)
 			val, err := cookies.Get(cookiekey, true)
 			assert.Equal(err.Error(), "invalid signed cookie")
 			assert.NotEqual(val, cookievalue)
@@ -291,7 +291,7 @@ func TestPillarjsCookie(t *testing.T) {
 		req.Header.Set("Cookie", "cookieKey=cookie value; cookieKey.sig=JROAKAAIUzC3_akvMb7PKF4l5h4")
 		recorder := httptest.NewRecorder()
 		handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			cookies := New(w, r, keys)
+			cookies := New(w, r, keys...)
 			val, err := cookies.Get("cookieKey")
 			assert.Nil(err)
 			assert.Equal("cookie value", val)
@@ -311,7 +311,7 @@ func TestPillarjsCookie(t *testing.T) {
 		req.Header.Set("Cookie", "cookieKey=cookie value1; cookieKey.sig=JROAKAAIUzC3_akvMb7PKF4l5h4")
 		recorder := httptest.NewRecorder()
 		handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			cookies := New(w, r, keys)
+			cookies := New(w, r, keys...)
 			val, err := cookies.Get("cookieKey")
 			assert.Nil(err)
 			assert.Equal("cookie value1", val)

example/main.go

@@ -8,7 +8,7 @@ import (
 
 func main() {
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		cookies := cookie.New(w, r, []string{"some key"})
+		cookies := cookie.New(w, r, "some key")
 
 		cookies.Set("test", "some cookie", &cookie.Options{
 			Signed:   true,