TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-22 19:32:54 +03:00
Code Issues Projects Releases Wiki Activity

Fixed Explore iframe route handling hijacking routes on reload

Browse Source
This commit is contained in:
Aileen Nowak 2022-10-26 16:48:52 +01:00 committed by Aileen Booker
parent c7ef22d4df
commit 8d9b8cf79c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ghost/admin/app/components/gh-billing-iframe.js
View File

@ -20,7 +20,8 @@ export default class GhBillingIframe extends Component {
this.billing.getBillingIframe().src = this.billing.getIframeURL();
window.addEventListener('message', (event) => {
if (event?.data) {
// only process messages coming from the billing iframe
if (event?.data && this.billing.getIframeURL().includes(event?.origin)) {
if (event.data?.request === 'token') {
this._handleTokenRequest();
}

3
ghost/admin/app/components/gh-explore-iframe.js
View File

@ -12,7 +12,8 @@ export default class GhExploreIframe extends Component {
this.explore.getExploreIframe().src = this.explore.getIframeURL();
window.addEventListener('message', async (event) => {
if (event?.data) {
// only process messages coming from the explore iframe
if (event?.data && this.explore.getIframeURL().includes(event?.origin)) {
if (event.data?.request === 'apiUrl') {
this._handleUrlRequest();
}

2
ghost/admin/app/services/explore.js
View File

@ -67,7 +67,7 @@ export default class ExploreService extends Service {
}
}
return url += '/';
return url;
}
// Sends a route update to a child route in the BMA, because we can't control