Improve error message when `window.opener == null` #5340

mifi · 2024-07-15T12:40:23Z

when window.opener == null #5334 (comment)

github-actions · 2024-07-15T12:42:14Z

Diff output files

diff --git a/packages/@uppy/companion/lib/server/controllers/send-token.js b/packages/@uppy/companion/lib/server/controllers/send-token.js
index 1f0738e..5769dc2 100644
--- a/packages/@uppy/companion/lib/server/controllers/send-token.js
+++ b/packages/@uppy/companion/lib/server/controllers/send-token.js
@@ -13,11 +13,33 @@ const htmlContent = (token, origin) => {
     <head>
         <meta charset="utf-8" />
         <script>
-          window.opener.postMessage(${serialize({ token })}, ${serialize(origin)})
-          window.close()
+          (function() {
+            'use strict';
+
+            var data = ${serialize({ token })};
+            var origin = ${serialize(origin)};
+
+            if (window.opener != null) {
+              window.opener.postMessage(data, origin);
+              window.close();
+            } else {
+              // maybe this will work? (note that it's not possible to try/catch this to see whether it worked)
+              window.postMessage(data, origin);
+
+              console.warn('Unable to send the authentication token to the web app. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.');
+
+              addEventListener("DOMContentLoaded", function() {
+                document.body.appendChild(document.createTextNode('Something went wrong. Please contact the site administrator. You may now exit this page.'));
+              });
+            }
+          })();
         </script>
     </head>
-    <body></body>
+    <body>
+    <noscript>
+      JavaScript must be enabled for this to work.
+    </noscript>
+    </body>
     </html>`;
 };
 /**

aduh95 · 2024-07-15T14:05:48Z

packages/@uppy/companion/src/server/controllers/send-token.js

+            window.close()
+          } else {
+            addEventListener("DOMContentLoaded", () => {
+              document.body.append(document.createTextNode('Unable to send the authentication token to the web app. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.'))


Suggested change

document.body.append(document.createTextNode('Unable to send the authentication token to the web app. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.'))

document.body.append('Unable to send the authentication token to the web app. Please contact your website administrator and/or try again later.');

console.warn('Failed to postMessage. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.'))

aduh95 · 2024-07-15T14:07:03Z

packages/@uppy/companion/src/server/controllers/send-token.js

+            addEventListener("DOMContentLoaded", () => {
+              document.body.append(document.createTextNode('Unable to send the authentication token to the web app. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.'))
+            });
+          }
        </script>
    </head>
    <body></body>


Suggested change

<body></body>

<body><noscript>JavaScript is required for this app to work correctly.</noscript></body>

aduh95 · 2024-07-15T14:07:56Z

packages/@uppy/companion/src/server/controllers/send-token.js

+            console.warn('Unable to send the authentication token to the web app. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.')
+
+            addEventListener("DOMContentLoaded", () => {
+              document.body.append(document.createTextNode('Something went wrong. Please contact the site administrator. You may now exit this page.'))


Suggested change

document.body.append(document.createTextNode('Something went wrong. Please contact the site administrator. You may now exit this page.'))

document.body.append('Something went wrong. Please contact the site administrator. You may now exit this page.')

aduh95 · 2024-07-15T14:08:32Z

packages/@uppy/companion/src/server/controllers/send-token.js

+          var data = ${serialize({ token })};
+          var origin = ${serialize(origin)};


Suggested change

var data = ${serialize({ token })};

var origin = ${serialize(origin)};

(function (data, origin) {

'use strict';

aduh95 · 2024-07-15T14:09:02Z

packages/@uppy/companion/src/server/controllers/send-token.js

+            addEventListener("DOMContentLoaded", () => {
+              document.body.append(document.createTextNode('Something went wrong. Please contact the site administrator. You may now exit this page.'))
+            });
+          }


Suggested change

}

}

})(${serialize({ token })}, ${serialize(origin)});

aduh95 · 2024-07-15T14:09:42Z

packages/@uppy/companion/src/server/controllers/send-token.js

+
+              console.warn('Unable to send the authentication token to the web app. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.')
+
+              addEventListener("DOMContentLoaded", () => {


Suggested change

addEventListener("DOMContentLoaded", () => {

addEventListener("DOMContentLoaded", function () {

aduh95 · 2024-07-15T14:09:53Z

packages/@uppy/companion/src/server/controllers/send-token.js

+              console.warn('Unable to send the authentication token to the web app. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.')
+
+              addEventListener("DOMContentLoaded", () => {
+                document.body.append(document.createTextNode('Something went wrong. Please contact the site administrator. You may now exit this page.'))


Suggested change

document.body.append(document.createTextNode('Something went wrong. Please contact the site administrator. You may now exit this page.'))

document.body.appendChild(document.createTextNode('Something went wrong. Please contact the site administrator. You may now exit this page.'))

aduh95 · 2024-07-15T14:10:23Z

packages/@uppy/companion/src/server/controllers/send-token.js

+          'use strict';
+
+          function sendToken() {


Suggested change

'use strict';

function sendToken() {

(function (origin, origin) {

'use strict';

aduh95 · 2024-07-15T14:10:50Z

packages/@uppy/companion/src/server/controllers/send-token.js

+            var data = ${serialize({ token })};
+            var origin = ${serialize(origin)};
+


Suggested change

var data = ${serialize({ token })};

var origin = ${serialize(origin)};

aduh95 · 2024-07-15T14:11:06Z

packages/@uppy/companion/src/server/controllers/send-token.js

+
+          sendToken();


Suggested change

sendToken();

packages/@uppy/companion/src/server/controllers/send-token.js

| Package | Version | Package | Version | | ---------------- | ------- | ---------------- | ------- | | @uppy/companion | 5.0.3 | @uppy/xhr-upload | 4.0.1 | | @uppy/locales | 4.0.2 | uppy | 4.0.3 | - @uppy/companion: Improve error message when `window.opener == null` (Mikael Finstad / #5340) - @uppy/xhr-upload: correctly type xhrUpload meta (Merlijn Vos / #5344) - meta: fix require path in `upload-to-cdn` (Antoine du Hamel / #5343)

improve error message

ab93c02

when window.opener == null #5334 (comment)

improve test

7d8184c

aduh95 reviewed Jul 15, 2024

View reviewed changes

improve logic

7ed1c82

aduh95 reviewed Jul 15, 2024

View reviewed changes

wrap in function

638780d

aduh95 reviewed Jul 15, 2024

View reviewed changes

fixes

112597f

aduh95 reviewed Jul 15, 2024

View reviewed changes

packages/@uppy/companion/src/server/controllers/send-token.js Outdated Show resolved Hide resolved

Murderlon approved these changes Jul 15, 2024

View reviewed changes

mifi added 2 commits July 15, 2024 16:15

put use strict inside fn

276b2ba

fix manual lint

7f53efd

aduh95 approved these changes Jul 15, 2024

View reviewed changes

aduh95 merged commit efdc4d1 into main Jul 15, 2024
20 checks passed

aduh95 deleted the send-token-error branch July 15, 2024 14:23

github-actions bot mentioned this pull request Jul 15, 2024

Release: [email protected] #5345

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve error message when `window.opener == null` #5340

Improve error message when `window.opener == null` #5340

mifi commented Jul 15, 2024

github-actions bot commented Jul 15, 2024 •

edited

Loading

aduh95 Jul 15, 2024

aduh95 Jul 15, 2024

aduh95 Jul 15, 2024

aduh95 Jul 15, 2024

aduh95 Jul 15, 2024

aduh95 Jul 15, 2024

aduh95 Jul 15, 2024

aduh95 Jul 15, 2024 •

edited

Loading

aduh95 Jul 15, 2024

aduh95 Jul 15, 2024

	document.body.append(document.createTextNode('Unable to send the authentication token to the web app. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.'))
	document.body.append('Unable to send the authentication token to the web app. Please contact your website administrator and/or try again later.');
	console.warn('Failed to postMessage. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.'))

	<body></body>
	<body><noscript>JavaScript is required for this app to work correctly.</noscript></body>

	document.body.append(document.createTextNode('Something went wrong. Please contact the site administrator. You may now exit this page.'))
	document.body.append('Something went wrong. Please contact the site administrator. You may now exit this page.')

		var data = ${serialize({ token })};
		var origin = ${serialize(origin)};


		console.warn('Unable to send the authentication token to the web app. This probably means that the web app was served from a HTTP server that includes the \`Cross-Origin-Opener-Policy: same-origin\` header. Make sure that the Uppy app is served from a server that does not send this header, or set to \`same-origin-allow-popups\`.')

		addEventListener("DOMContentLoaded", () => {

	addEventListener("DOMContentLoaded", () => {
	addEventListener("DOMContentLoaded", function () {

	document.body.append(document.createTextNode('Something went wrong. Please contact the site administrator. You may now exit this page.'))
	document.body.appendChild(document.createTextNode('Something went wrong. Please contact the site administrator. You may now exit this page.'))

Improve error message when window.opener == null #5340

Improve error message when window.opener == null #5340

Conversation

mifi commented Jul 15, 2024

github-actions bot commented Jul 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aduh95 Jul 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Improve error message when `window.opener == null` #5340

Improve error message when `window.opener == null` #5340

github-actions bot commented Jul 15, 2024 •

edited

Loading

aduh95 Jul 15, 2024 •

edited

Loading