Merge pull request #5152 from Sage-Bionetworks/release-462

merge release 462 into release 463
Sage-Bionetworks · Jul 25, 2023 · 37d8549 · 37d8549
2 parents b934479 + 48db910
commit 37d8549
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/main/java/org/sagebionetworks/web/client/widget/aws/AwsSdk.java b/src/main/java/org/sagebionetworks/web/client/widget/aws/AwsSdk.java
@@ -89,11 +89,9 @@ private static native void _upload(
 		var listener = function(err, data) {
 			if (err) {
 				//error
-				console.log("Upload error, retrying:", err.code, err.message);
+				console.log("Upload error", err.code, err.message);
 				upload.abort();
-				setTimeout(function() {
-					upload.send(listener);
-				}, 5000);
+				callback.@org.sagebionetworks.web.client.widget.upload.S3DirectUploadHandler::uploadFailed(Ljava/lang/String;)(err.message);
 			} else {
 				//success
 				callback.@org.sagebionetworks.web.client.widget.upload.S3DirectUploadHandler::uploadSuccess()();

diff --git a/src/main/webapp/Portal.html b/src/main/webapp/Portal.html
@@ -11,7 +11,7 @@
 
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'self' data: blob: 'unsafe-inline' 'unsafe-eval' *.synapse.org *.sagebase.org *.googleapis.com *.gstatic.com *.googletagmanager.com cdn.statuspage.io s3.amazonaws.com www.google-analytics.com kh896k90gyvg.statuspage.io *.youtube.com *.rstudio.com *.google.com *.shinyapps.io *.smartsheet.com 127.0.0.1:9876; img-src * data: blob:"
+      content="default-src 'self' data: blob: 'unsafe-inline' 'unsafe-eval' *.synapse.org *.sagebase.org *.googleapis.com *.gstatic.com *.googletagmanager.com cdn.statuspage.io s3.amazonaws.com www.google-analytics.com kh896k90gyvg.statuspage.io *.youtube.com *.rstudio.com *.google.com *.shinyapps.io *.smartsheet.com 127.0.0.1:9876; img-src * data: blob:; connect-src https://* http://127.0.0.1:8888"
     />
     <meta
       name="google-site-verification"