fix: Adding cache-control header to fix generated payload etag

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · May 18, 2022 · 118fc2d · 118fc2d
1 parent 1f959fc
commit 118fc2d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/pkg/crud/get.go b/pkg/crud/get.go
@@ -170,6 +170,8 @@ func (a App) serveGeoJSON(w http.ResponseWriter, r *http.Request, request provid
 		hash = a.exifHash(ctx, items)
 	} else if exifs, err := a.exifApp.ListDir(ctx, item); err == nil {
 		hash = sha.New(exifs)
+	} else if err != nil {
+		logger.Error("unable to list geojson directory: %s", err)
 	}
 
 	etag, ok := provider.EtagMatch(w, r, hash)
@@ -178,6 +180,7 @@ func (a App) serveGeoJSON(w http.ResponseWriter, r *http.Request, request provid
 	}
 
 	w.Header().Add("Content-Type", "application/json; charset=utf-8")
+	w.Header().Add("Cache-Control", "max-age=60, must-revalidate")
 	w.Header().Add("Etag", etag)
 	w.WriteHeader(http.StatusOK)
 

diff --git a/pkg/provider/utils.go b/pkg/provider/utils.go
@@ -277,13 +277,13 @@ func WriteToStorage(ctx context.Context, storageApp absto.Storage, output string
 }
 
 // EtagMatch check that given hash match the existing etag
-func EtagMatch(w http.ResponseWriter, r *http.Request, hash string) (string, bool) {
-	etag := fmt.Sprintf(`W/"%s"`, hash)
+func EtagMatch(w http.ResponseWriter, r *http.Request, hash string) (etag string, match bool) {
+	etag = fmt.Sprintf(`W/"%s"`, hash)
 
 	if r.Header.Get("If-None-Match") == etag {
 		w.WriteHeader(http.StatusNotModified)
-		return etag, true
+		match = true
 	}
 
-	return etag, false
+	return
 }
diff --git a/pkg/thumbnail/thumbnail.go b/pkg/thumbnail/thumbnail.go
@@ -217,6 +217,7 @@ func (a App) List(w http.ResponseWriter, r *http.Request, item absto.Item, items
 	}
 
 	w.Header().Add("Content-Type", "text/plain; charset=utf-8")
+	w.Header().Add("Cache-Control", "max-age=60, must-revalidate")
 	w.Header().Add("Etag", etag)
 	w.WriteHeader(http.StatusOK)