From 770e8021104118f58f9e001dc43f85641132a50d Mon Sep 17 00:00:00 2001 From: Jay Hodgson Date: Mon, 13 May 2024 15:34:28 -0700 Subject: [PATCH 1/2] update Synapse backend artifact, and use AuthenticationController.clearLocalCache when it needs to be cleared --- pom.xml | 2 +- .../web/client/WebStorageMaxSizeDetector.java | 11 +++++++++-- .../web/client/security/AuthenticationController.java | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ce701c681a..e4fe116d33 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ ${project.build.directory}/${project.build.finalName} - 493.0 + 499.0 2.11.0 5.3.33 3.0 diff --git a/src/main/java/org/sagebionetworks/web/client/WebStorageMaxSizeDetector.java b/src/main/java/org/sagebionetworks/web/client/WebStorageMaxSizeDetector.java index e99a6ad971..9d055917f0 100644 --- a/src/main/java/org/sagebionetworks/web/client/WebStorageMaxSizeDetector.java +++ b/src/main/java/org/sagebionetworks/web/client/WebStorageMaxSizeDetector.java @@ -2,6 +2,7 @@ import com.google.inject.Inject; import org.sagebionetworks.web.client.cache.ClientCache; +import org.sagebionetworks.web.client.security.AuthenticationController; public class WebStorageMaxSizeDetector { @@ -9,11 +10,17 @@ public class WebStorageMaxSizeDetector { public static final int INTERVAL_MS = 1000 * 60 * 5; // check every 5 minutes ClientCache clientCache; GWTWrapper gwt; + AuthenticationController authController; @Inject - public WebStorageMaxSizeDetector(GWTWrapper gwt, ClientCache clientCache) { + public WebStorageMaxSizeDetector( + GWTWrapper gwt, + ClientCache clientCache, + AuthenticationController authController + ) { this.gwt = gwt; this.clientCache = clientCache; + this.authController = authController; } public void start() { @@ -40,7 +47,7 @@ private void checkMaxSizeNow() { ); if (currentSize > MAX_SIZE) { SynapseJSNIUtilsImpl._consoleLog("Clearing web storage due to the size"); - clientCache.clear(); + authController.clearLocalStorage(); } } } diff --git a/src/main/java/org/sagebionetworks/web/client/security/AuthenticationController.java b/src/main/java/org/sagebionetworks/web/client/security/AuthenticationController.java index 69e7ce10e1..07196e6cf8 100644 --- a/src/main/java/org/sagebionetworks/web/client/security/AuthenticationController.java +++ b/src/main/java/org/sagebionetworks/web/client/security/AuthenticationController.java @@ -84,4 +84,5 @@ void initializeFromExistingAccessTokenCookie( void checkForUserChange(); void checkForUserChange(Callback cb); + void clearLocalStorage(); } From 60ac8f8115378044da3f9e91311f6eed339295d7 Mon Sep 17 00:00:00 2001 From: Jay Hodgson Date: Tue, 14 May 2024 08:49:34 -0700 Subject: [PATCH 2/2] and bump SRC to the latest release --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 392d558499..a002267fe7 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "react-transition-group": "2.6.0", "sass": "^1.63.6", "spark-md5": "^3.0.2", - "synapse-react-client": "3.2.16", + "synapse-react-client": "3.2.17", "universal-cookie": "^4.0.4", "xss": "^1.0.15" }, diff --git a/yarn.lock b/yarn.lock index c1a6a11dd8..5537d2db34 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5017,10 +5017,10 @@ svg-path-sdf@^1.1.3: parse-svg-path "^0.1.2" svg-path-bounds "^1.0.1" -synapse-react-client@3.2.16: - version "3.2.16" - resolved "https://registry.yarnpkg.com/synapse-react-client/-/synapse-react-client-3.2.16.tgz#84a6701e9330a6a60d122ebb452b1e1712e57911" - integrity sha512-P3idE3EFb5NnpxgCFD+l4JPEZgT/ZmE2FTzEttpntFRTmOvMS/CymXLDAeoe5/2+wA8p4DSH8MNLahWnROHV5A== +synapse-react-client@3.2.17: + version "3.2.17" + resolved "https://registry.yarnpkg.com/synapse-react-client/-/synapse-react-client-3.2.17.tgz#95f1a3d7ccd008bcc4639c05ab1b37cf531621e3" + integrity sha512-stUkfECa89EpCONaQb7oTWtYVBDwmbYH5FPU013ECpUpm8E93L0Co2X7rkxTpIMrE6AwntXhXkcwuANJPbGicg== dependencies: "@apidevtools/json-schema-ref-parser" "^9.1.2" "@brainhubeu/react-carousel" "1.19.26"