Merge pull request #5409 from jay-hodgson/SWC-6856-500

SWC-6856: Merge CORS filter change to release 500 for One Sage testing
Sage-Bionetworks · Jun 3, 2024 · 343989a · 343989a
2 parents 48816ed + e621aba
commit 343989a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/org/sagebionetworks/web/client/SynapseJSNIUtilsImpl.java b/src/main/java/org/sagebionetworks/web/client/SynapseJSNIUtilsImpl.java
@@ -414,7 +414,7 @@ private static final native void _getFileMd5(
   ) /*-{
 		if ($wnd.Worker) {
 			if (!$wnd.calculateFileMd5Worker) {
-			  $wnd.calculateFileMd5Worker = new $wnd.Worker("workers/calculateFileMd5Worker.js");
+			  $wnd.calculateFileMd5Worker = new $wnd.Worker("/workers/calculateFileMd5Worker.js");
 			};
 			$wnd.calculateFileMd5Worker.onmessage = function(event) {
 				[email protected]::setMD5(Ljava/lang/String;)(event.data);
@@ -446,7 +446,7 @@ private static final native void _getFilePartMd5(
   ) /*-{
 		if ($wnd.Worker) {
 			if (!$wnd.calculateFilePartMd5Worker) {
-			  $wnd.calculateFilePartMd5Worker = new $wnd.Worker("workers/calculateFilePartMd5Worker.js");
+			  $wnd.calculateFilePartMd5Worker = new $wnd.Worker("/workers/calculateFilePartMd5Worker.js");
 			};
 			$wnd.calculateFilePartMd5Worker.onmessage = function(event) {
 				[email protected]:: setMD5(Ljava/lang/String;) (event.data);

diff --git a/src/main/java/org/sagebionetworks/web/server/servlet/filter/CORSFilter.java b/src/main/java/org/sagebionetworks/web/server/servlet/filter/CORSFilter.java
@@ -33,6 +33,8 @@ public class CORSFilter extends OncePerRequestFilter {
     "staging-signin",
     "accounts.sagebionetworks",
     "staging.accounts.sagebionetworks",
+    "accounts",
+    "staging.accounts",
     // Data portals
     "adknowledgeportal",
     "staging.adknowledgeportal",

diff --git a/src/main/resources/org/sagebionetworks/web/client/widget/footer/FooterViewImpl.ui.xml b/src/main/resources/org/sagebionetworks/web/client/widget/footer/FooterViewImpl.ui.xml
@@ -19,7 +19,7 @@
               <!--Left-aligned logo for desktop view-->
               <bh:Div>
                 <g:Image
-                  url="images/logo.svg"
+                  url="/images/logo.svg"
                   addStyleNames="margin-bottom-15 margin-right-5 moveup-2"
                   width="35px"
                   height="35px"
@@ -36,7 +36,7 @@
               <!--Acts as a max-width flex column between logo and alpha mode buttons in desktop view. Contains a centered logo in mobile view-->
               <bh:Div addStyleNames="visible-xs margin-auto" width="200px">
                 <g:Image
-                  url="images/logo.svg"
+                  url="/images/logo.svg"
                   addStyleNames="margin-bottom-15 margin-right-5 moveup-2"
                   width="35px"
                   height="35px"
@@ -178,7 +178,7 @@
                 addStyleNames="displayInline link"
               >
                 <g:Image
-                  url="images/sagebionetworks-logo.svg"
+                  url="/images/sagebionetworks-logo.svg"
                   addStyleNames="center-in-div"
                   altText="Sage Bionetworks logo"
                   height="30px"
@@ -237,7 +237,7 @@
                 addStyleNames="displayInline link"
               >
                 <g:Image
-                  url="images/sagebionetworks-logo.svg"
+                  url="/images/sagebionetworks-logo.svg"
                   addStyleNames="center-in-div"
                   altText="Sage Bionetworks logo"
                   height="30px"

diff --git a/src/main/resources/org/sagebionetworks/web/client/widget/header/HeaderViewImpl.ui.xml b/src/main/resources/org/sagebionetworks/web/client/widget/header/HeaderViewImpl.ui.xml
@@ -49,7 +49,7 @@
           </bh:Paragraph>
         </bh:Span>
         <g:Image
-          url="images/logo.svg"
+          url="/images/logo.svg"
           addStyleNames="margin-left-5 margin-right-5 vertical-align-middle"
           width="25px"
           height="25px"

diff --git a/...es/org/sagebionetworks/web/client/widget/profile/ProfileCertifiedValidatedViewImpl.ui.xml b/...es/org/sagebionetworks/web/client/widget/profile/ProfileCertifiedValidatedViewImpl.ui.xml
@@ -15,15 +15,15 @@
       addStyleNames="margin-right-2 margin-top-3 flexcontainer-column"
       height="19px"
       width="16px"
-      url="images/CertifiedUser.svg"
+      url="/images/CertifiedUser.svg"
       visible="false"
     />
     <g:Image
       ui:field="validatedIcon"
       addStyleNames="flexcontainer-column margin-top-3 margin-left-5"
       height="19px"
       width="16px"
-      url="images/ValidatedProfile.svg"
+      url="/images/ValidatedProfile.svg"
       visible="false"
     />
     <bh:Paragraph