Skip to content

Commit

Permalink
Merge pull request #9 from advanced-rest-client/fix/W-13561580/target…
Browse files Browse the repository at this point in the history
…-origin

[W-13561580] Target origin
  • Loading branch information
carowright committed Jun 9, 2023
2 parents caab4e5 + 95501f4 commit bc4af9e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
5 changes: 3 additions & 2 deletions oauth-popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ <h1>Sending the authorization data to the application</h1>
</p>
<script>
const messageTarget = (window.opener || window.parent || window.top);
const targetOrigin = messageTarget.origin
if (!messageTarget || messageTarget === window || !messageTarget.postMessage) {
const elm = document.getElementById('general-error');
elm.removeAttribute('hidden');
} else {
const search = window.location.search.substr(1);
if (search) {
messageTarget.postMessage(search, '*');
messageTarget.postMessage(search, targetOrigin);
} else {
messageTarget.postMessage(window.location.hash.substr(1), '*');
messageTarget.postMessage(window.location.hash.substr(1), targetOrigin);
}
}
</script>
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@advanced-rest-client/authorization",
"description": "The UI and logic related to HTTP authorization.",
"version": "0.1.9",
"version": "0.1.10",
"license": "Apache-2.0",
"main": "index.js",
"module": "index.js",
Expand Down
5 changes: 3 additions & 2 deletions test/oauth2/popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ <h1>Sending the authorization data to the application</h1>
</p>
<script>
const messageTarget = (window.opener || window.parent || window.top);
const targetOrigin = messageTarget.origin
if (!messageTarget || messageTarget === window || !messageTarget.postMessage) {
const elm = document.getElementById('general-error');
elm.removeAttribute('hidden');
} else {
const search = window.location.search.substr(1);
if (search) {
messageTarget.postMessage(search, '*');
messageTarget.postMessage(search, targetOrigin);
} else {
messageTarget.postMessage(window.location.hash.substr(1), '*');
messageTarget.postMessage(window.location.hash.substr(1), targetOrigin);
}
}
</script>
Expand Down
5 changes: 3 additions & 2 deletions test/oauth2/wrong-redirect.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ <h1>Sending the authorization data to the application</h1>
</p>
<script>
const messageTarget = (window.opener || window.parent || window.top);
const targetOrigin = messageTarget.origin
if (!messageTarget || messageTarget === window || !messageTarget.postMessage) {
const elm = document.getElementById('general-error');
elm.removeAttribute('hidden');
} else {
const search = window.location.search.substr(1);
if (search) {
messageTarget.postMessage(search, '*');
messageTarget.postMessage(search, targetOrigin);
} else {
messageTarget.postMessage(window.location.hash.substr(1), '*');
messageTarget.postMessage(window.location.hash.substr(1), targetOrigin);
}
}
</script>
Expand Down

0 comments on commit bc4af9e

Please sign in to comment.