Merge pull request #5470 from nickgros/SWC-6943

Sage-Bionetworks · Jul 26, 2024 · 3c845c5 · 3c845c5
2 parents 5db3316 + c806d07
commit 3c845c5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/src/main/java/org/sagebionetworks/web/client/FeatureFlagConfig.java b/src/main/java/org/sagebionetworks/web/client/FeatureFlagConfig.java
@@ -3,12 +3,13 @@
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONParser;
 import com.google.gwt.json.client.JSONValue;
+import org.sagebionetworks.web.client.cache.SessionStorage;
 import org.sagebionetworks.web.client.cookie.CookieProvider;
 
 public class FeatureFlagConfig {
 
-  CookieProvider cookieProvider;
-  private JSONObject config;
+  private final CookieProvider cookieProvider;
+  private final JSONObject config;
 
   public FeatureFlagConfig(String json, CookieProvider cookieProvider) {
     JSONValue parsed = JSONParser.parseStrict(json);

diff --git a/src/main/java/org/sagebionetworks/web/client/FeatureFlagConfigProvider.java b/src/main/java/org/sagebionetworks/web/client/FeatureFlagConfigProvider.java
@@ -2,22 +2,30 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+import org.sagebionetworks.web.client.cache.SessionStorage;
 import org.sagebionetworks.web.client.cookie.CookieProvider;
 import org.sagebionetworks.web.shared.WebConstants;
 
 public class FeatureFlagConfigProvider implements Provider<FeatureFlagConfig> {
 
-  CookieProvider cookieProvider;
+  private final CookieProvider cookieProvider;
+  private final SessionStorage sessionStorage;
 
   @Inject
-  public FeatureFlagConfigProvider(CookieProvider cookieProvider) {
+  public FeatureFlagConfigProvider(
+    CookieProvider cookieProvider,
+    SessionStorage sessionStorage
+  ) {
     this.cookieProvider = cookieProvider;
+    this.sessionStorage = sessionStorage;
   }
 
   @Override
   public FeatureFlagConfig get() {
     return new FeatureFlagConfig(
-      cookieProvider.getCookie(WebConstants.PORTAL_FEATURE_FLAG),
+      sessionStorage.getItem(
+        WebConstants.PORTAL_FEATURE_FLAG_SESSION_STORAGE_KEY
+      ),
       cookieProvider
     );
   }

diff --git a/src/main/java/org/sagebionetworks/web/client/Portal.java b/src/main/java/org/sagebionetworks/web/client/Portal.java
@@ -89,9 +89,9 @@ public void onSuccess() {
                     @Override
                     public void onSuccess(JSONObjectAdapter config) {
                       ginjector
-                        .getCookieProvider()
-                        .setCookie(
-                          WebConstants.PORTAL_FEATURE_FLAG,
+                        .getSessionStorage()
+                        .setItem(
+                          WebConstants.PORTAL_FEATURE_FLAG_SESSION_STORAGE_KEY,
                           config.toString()
                         );
                     }

diff --git a/src/main/java/org/sagebionetworks/web/client/PortalGinInjector.java b/src/main/java/org/sagebionetworks/web/client/PortalGinInjector.java
@@ -4,6 +4,7 @@
 import com.google.gwt.inject.client.GinModules;
 import com.google.gwt.inject.client.Ginjector;
 import org.sagebionetworks.schema.adapter.JSONObjectAdapter;
+import org.sagebionetworks.web.client.cache.SessionStorage;
 import org.sagebionetworks.web.client.context.QueryClientProvider;
 import org.sagebionetworks.web.client.cookie.CookieProvider;
 import org.sagebionetworks.web.client.presenter.ACTAccessApprovalsPresenter;
@@ -585,6 +586,8 @@ public interface PortalGinInjector extends Ginjector {
 
   CookieProvider getCookieProvider();
 
+  SessionStorage getSessionStorage();
+
   Header getHeader();
 
   Footer getFooter();

diff --git a/src/main/java/org/sagebionetworks/web/shared/WebConstants.java b/src/main/java/org/sagebionetworks/web/shared/WebConstants.java
@@ -411,7 +411,8 @@ public class WebConstants {
     "User requests that the Synapse Access and Compliance Team send them information on how to access this data.";
   public static final String ISSUE_PRIORITY_MINOR = "4";
   public static final String ANONYMOUS = "Anonymous";
-  public static final String PORTAL_FEATURE_FLAG = "portal_feature_flag";
+  public static final String PORTAL_FEATURE_FLAG_SESSION_STORAGE_KEY =
+    "portal_feature_flag";
 
   // report Synapse error
   public static final String SWC_ISSUE_COLLECTOR_URL =