Set cache-control header non-cache for assets not found

Signed-off-by: Scott Windsor <[email protected]>
argoproj · Sep 2, 2023 · 6336fde · 6336fde
1 parent 01e0727
commit 6336fde
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/server/server.go b/server/server.go
@@ -1218,7 +1218,11 @@ func (server *ArgoCDServer) newStaticAssetsHandler() func(http.ResponseWriter, *
 			http.ServeContent(w, r, "index.html", modTime, io.NewByteReadSeeker(data))
 		} else {
 			if isMainJsBundle(r.URL) {
-				w.Header().Set("Cache-Control", "public, max-age=31536000, immutable")
+				cacheControl := "public, max-age=31536000, immutable"
+				if !fileRequest {
+					cacheControl = "no-cache"
+				}
+				w.Header().Set("Cache-Control", cacheControl)
 			}
 			http.FileServer(server.staticAssets).ServeHTTP(w, r)
 		}

diff --git a/server/server_test.go b/server/server_test.go
@@ -1274,7 +1274,7 @@ func TestCacheControlHeaders(t *testing.T) {
 			filename:                    "main.e4188e5adc97bbfc00c0.js",
 			createFile:                  false,
 			expectedStatus:              404,
-			expectedCacheControlHeaders: []string{"public, max-age=31536000, immutable"},
+			expectedCacheControlHeaders: []string{"no-cache"},
 		},
 	}