Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/jira/jira-app/src/components/Auth/OAuth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ export default class OAuth extends React.Component<Props> {

const oauthWindow = window.open(url, 'Jira Contentful', 'left=150,top=10,width=800,height=900');

const expectedOrigin = new URL(constants.OAUTH_REDIRECT_URI).origin;
window.addEventListener('message', (e) => {
if (e.source !== oauthWindow) {
if (e.source !== oauthWindow || e.origin !== expectedOrigin) {
return;
}

Expand Down
6 changes: 3 additions & 3 deletions apps/jira/jira-app/src/standalone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const standalone = (window: Window) => {
const error = searchParams.get('error');

if (error) {
window.opener.postMessage({ error }, '*');
window.opener.postMessage({ error }, document.referrer ? new URL(document.referrer).origin : window.location.origin);
return;
}

Expand All @@ -14,11 +14,11 @@ const standalone = (window: Window) => {

const expireTime = Date.now() + expiresIn * 1000;

window.opener.postMessage({ token, expireTime }, '*');
window.opener.postMessage({ token, expireTime }, document.referrer ? new URL(document.referrer).origin : window.location.origin);

window.history.replaceState({}, 'oauth', '/');
} else {
window.opener.postMessage({ error: 'No query string provided!' }, '*');
window.opener.postMessage({ error: 'No query string provided!' }, document.referrer ? new URL(document.referrer).origin : window.location.origin);
}
};
export default standalone;
2 changes: 1 addition & 1 deletion apps/slack/frontend/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if (params.has('result')) {
accessToken: params.get('accessToken'),
refreshToken: params.get('refreshToken'),
errorMessage: params.get('errorMessage'),
});
}, document.referrer ? new URL(document.referrer).origin : window.location.origin);
window.close();
} else {
const root = document.getElementById('root');
Expand Down
6 changes: 5 additions & 1 deletion apps/slack/frontend/src/useConnect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useCallback, useContext, useEffect } from 'react';
import { ConnectedWorkspace, useWorkspaceStore, WorkspaceState } from './workspace.store';
import { apiClient, slackClient } from './requests';
import { openPopup } from './helpers';
import { makeOAuthURL } from './constants';
import { makeOAuthURL, BACKEND_BASE_URL } from './constants';
import { getEnvironmentName } from './utils';
import { SDKContext, useCMA, useSDK } from '@contentful/react-apps-toolkit';
import { AppExtensionSDK } from '@contentful/app-sdk';
Expand Down Expand Up @@ -63,6 +63,10 @@ export const useConnect = () => {
const [setTemporaryRefreshToken] = useAuthStore((state) => [state.setTemporaryRefreshToken]);

const onMessage = async (message: MessageEvent) => {
const expectedOrigin = new URL(BACKEND_BASE_URL).origin;
if (message.origin !== expectedOrigin) {
return;
}
if (message.data.result === 'error') {
sdk.notifier.error('Something went wrong while authenticating with Slack. Please try again.');
}
Expand Down
2 changes: 1 addition & 1 deletion apps/slack/lambda/lib/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function bootstrap(): serverless.Application {

app.use(createServerlessMiddleware(config.serverless));
app.use(
['/api/messages', '/api/spaces/*', '/api/events', 'api/tokens'],
['/api/messages', '/api/spaces/*', '/api/events', '/api/tokens'],
createContentfulRequestVerificationMiddleware(config.signingSecret)
);
app.use('/api/slack-events', createSlackEventsMiddleware(config.slack, authTokenRepository));
Expand Down
4 changes: 2 additions & 2 deletions apps/smartling/frontend/src/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ export default class Sidebar extends React.Component<Props, State> {
} else if (refresh.failed) {
const smartlingWindow = window.open('/openauth', '', 'height=600,width=600,top=50,left=50');

const listener = ({ data, source }: any) => {
if (source !== smartlingWindow) {
const listener = ({ data, source, origin }: any) => {
if (source !== smartlingWindow || origin !== window.location.origin) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion apps/smartling/frontend/src/standalone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const standalone = (window: Window) => {

window.localStorage.setItem('token', token);
window.localStorage.setItem('refreshToken', refreshToken);
window.opener.postMessage({ token, refreshToken }, '*');
window.opener.postMessage({ token, refreshToken }, document.referrer ? new URL(document.referrer).origin : window.location.origin);
}
};
export default standalone;
6 changes: 3 additions & 3 deletions apps/typeform/frontend/src/processTokenCallback.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const processTokenCallback = (window: Window) => {
const error = searchParams.get('error');

if (error) {
window.opener.postMessage({ error }, '*');
window.opener.postMessage({ error }, document.referrer ? new URL(document.referrer).origin : window.location.origin);
return;
}

Expand All @@ -17,11 +17,11 @@ const processTokenCallback = (window: Window) => {

const expireTime = Date.now() + expiresIn * 1000;

window.opener.postMessage({ token, expireTime }, '*');
window.opener.postMessage({ token, expireTime }, document.referrer ? new URL(document.referrer).origin : window.location.origin);

window.history.replaceState({}, 'oauth', '/');
} else {
window.opener.postMessage({ error: 'No query string provided!' }, '*');
window.opener.postMessage({ error: 'No query string provided!' }, document.referrer ? new URL(document.referrer).origin : window.location.origin);
}
};
export default processTokenCallback;
Loading