Skip to content

Commit

Permalink
Add 'redirectFromTop' config prop to allow top level redirect when Ch…
Browse files Browse the repository at this point in the history
…eckout loaded in an iframe
  • Loading branch information
sponglord committed Sep 11, 2023
1 parent d7740c4 commit 1daba43
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changeset/forty-badgers-bow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@adyen/adyen-web': minor
---

Add 'redirectFromTop' config prop to allow top level redirect when Checkout loaded in an iframe
17 changes: 17 additions & 0 deletions packages/lib/src/components/Redirect/Redirect.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import { h } from 'preact';
import Redirect from './Redirect';
import RedirectShopper from './components/RedirectShopper';

jest.mock('../../utils/detectInIframe', () => {
return jest.fn().mockImplementation(() => {
return true;
});
});

describe('Redirect', () => {
describe('isValid', () => {
test('Is always valid', () => {
Expand All @@ -19,6 +25,17 @@ describe('Redirect', () => {

expect(wrapper.find('form')).toHaveLength(1);
expect(wrapper.find('form').prop('action')).toBe('http://www.adyen.com');
expect(wrapper.find('form').prop('target')).toBe(undefined);
setTimeout(() => expect(window.HTMLFormElement.prototype.submit).toHaveBeenCalled(), 0);
});

test('Accepts a POST redirect status, setting target to _top, when the config prop tells it to', () => {
window.HTMLFormElement.prototype.submit = jest.fn();

const wrapper = mount(<RedirectShopper url="http://www.adyen.com" method="POST" data={{}} redirectFromTop={true} />);

expect(wrapper.find('form')).toHaveLength(1);
expect(wrapper.find('form').prop('target')).toBe('_top');
setTimeout(() => expect(window.HTMLFormElement.prototype.submit).toHaveBeenCalled(), 0);
});
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { Component, h } from 'preact';
import detectInIframe from '../../../../utils/detectInIframe';

interface RedirectShopperProps {
beforeRedirect: (resolve, reject, url) => Promise<void>;
url: string;
method: 'GET' | 'POST';
data?: any;
redirectFromTop?: boolean;
}

class RedirectShopper extends Component<RedirectShopperProps> {
Expand All @@ -19,7 +21,12 @@ class RedirectShopper extends Component<RedirectShopperProps> {
if (this.postForm) {
this.postForm.submit();
} else {
window.location.assign(this.props.url);
if (this.props.redirectFromTop && detectInIframe()) {
// if in an iframe and the config prop allows it - try to redirect from the top level window
window.top.location.assign?.(this.props.url);
} else {
window.location.assign(this.props.url);
}
}
};

Expand All @@ -44,6 +51,7 @@ class RedirectShopper extends Component<RedirectShopperProps> {
ref={ref => {
this.postForm = ref;
}}
{...(this.props.redirectFromTop && detectInIframe() && { target: '_top' })}
>
{Object.keys(data).map(key => (
<input type="hidden" name={key} key={key} value={data[key]} />
Expand Down
1 change: 1 addition & 0 deletions packages/lib/src/core/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const GENERIC_OPTIONS = [
'session',
'clientKey',
'showPayButton',
'redirectFromTop',
'installmentOptions',

// Events
Expand Down
2 changes: 2 additions & 0 deletions packages/lib/src/utils/detectInIframe.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Returns true if the page is being run in an iframe
export default () => window.location !== window.parent.location;

0 comments on commit 1daba43

Please sign in to comment.