fix: Fix Branding Rest Brwoser Caching behavior - MEED-7164 - Meeds-i…

…o/MIPs#144
Meeds-io · Jul 3, 2024 · 19d823c · 19d823c
1 parent 35ac7bf
commit 19d823c
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/component/portal/src/main/java/org/exoplatform/portal/branding/BrandingRestResourcesV1.java b/component/portal/src/main/java/org/exoplatform/portal/branding/BrandingRestResourcesV1.java
@@ -79,22 +79,26 @@ public BrandingRestResourcesV1(BrandingService brandingService) {
                           @ApiResponse(responseCode = "304", description = "Resource not modified"),
                           @ApiResponse(responseCode = "500", description = "Server error when retrieving branding information")
   })
-  public Response getBrandingInformation(@Context
-  Request request) {
+  public Response getBrandingInformation(
+                                         @Context
+                                         Request request,
+                                         @Parameter(description = "Whether force refresh information from database or not")
+                                         @QueryParam("forceRefresh")
+                                         String forceRefresh) {
     try {
+      boolean refresh = StringUtils.equals("true", forceRefresh);
       long lastUpdated = brandingService.getLastUpdatedTime();
-      EntityTag eTag = new EntityTag(String.valueOf(lastUpdated));
+      EntityTag eTag = refresh ? null : new EntityTag(String.valueOf(lastUpdated));
 
       //
       Response.ResponseBuilder builder = request.evaluatePreconditions(eTag);
       if (builder == null) {
-        Branding brandingInformation = brandingService.getBrandingInformation(false);
+        Branding brandingInformation = brandingService.getBrandingInformation(refresh);
         builder = Response.ok(brandingInformation);
         CacheControl cc = new CacheControl();
         cc.setMustRevalidate(true);
         builder.tag(eTag);
         builder.lastModified(new Date(lastUpdated));
-        builder.expires(new Date(System.currentTimeMillis() + CACHE_IN_MILLI_SECONDS));
         builder.cacheControl(cc);
       }
       return builder.build();