From 09b11b7560a17c89053b8cd0ec8892b19b7a594f Mon Sep 17 00:00:00 2001
From: darkweak <darkweak@protonmail.com>
Date: Sat, 17 Aug 2024 21:49:00 +0200
Subject: [PATCH] wip(surrogate): invalidate

---
 pkg/storage/defaultProvider.go    | 3 +++
 pkg/surrogate/providers/common.go | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/storage/defaultProvider.go b/pkg/storage/defaultProvider.go
index ee5b7a808..e280d85e0 100644
--- a/pkg/storage/defaultProvider.go
+++ b/pkg/storage/defaultProvider.go
@@ -2,6 +2,7 @@ package storage
 
 import (
 	"bytes"
+	"fmt"
 	"net/http"
 	"regexp"
 	"strings"
@@ -56,6 +57,8 @@ func (provider *Default) MapKeys(prefix string) map[string]string {
 
 				return true
 			}
+
+			keys[key.(string)] = fmt.Sprint(value)
 			if v, ok := value.(*core.StorageMapper); ok {
 				for _, v := range v.Mapping {
 					if v.StaleTime.AsTime().After(now) {
diff --git a/pkg/surrogate/providers/common.go b/pkg/surrogate/providers/common.go
index aaf88b610..688c09662 100644
--- a/pkg/surrogate/providers/common.go
+++ b/pkg/surrogate/providers/common.go
@@ -237,6 +237,7 @@ func (s *baseStorage) Store(response *http.Response, cacheKey, uri, basekey stri
 
 	urlRegexp = regexp.MustCompile("(^|" + regexp.QuoteMeta(souinStorageSeparator) + ")" + regexp.QuoteMeta(basekey) + "(" + regexp.QuoteMeta(souinStorageSeparator) + "|$)")
 	s.storeTag(uri, basekey, urlRegexp)
+	s.storeTag(uri, cacheKey, urlRegexp)
 
 	return nil
 }
@@ -266,7 +267,7 @@ func (s *baseStorage) Invalidate(method string, headers http.Header) {
 
 // List returns the stored keys associated to resources
 func (s *baseStorage) List() map[string]string {
-	return s.Storage.MapKeys(surrogatePrefix)
+	return s.Storage.MapKeys("")
 }
 
 // Destruct method will shutdown properly the provider