diff --git a/desktop/packages/mullvad-vpn/src/main/index.ts b/desktop/packages/mullvad-vpn/src/main/index.ts index fbdd581a09ae..2186168379e8 100644 --- a/desktop/packages/mullvad-vpn/src/main/index.ts +++ b/desktop/packages/mullvad-vpn/src/main/index.ts @@ -855,7 +855,7 @@ class ApplicationMain IpcMainEventChannel.app.handleQuit(() => this.disconnectAndQuit()); IpcMainEventChannel.app.handleOpenUrl(async (url) => { - if (Object.values(urls).find((link) => url.startsWith(link))) { + if (Object.values(urls).find((allowedUrl) => url.startsWith(allowedUrl))) { await shell.openExternal(url); } }); diff --git a/desktop/packages/mullvad-vpn/src/renderer/app.tsx b/desktop/packages/mullvad-vpn/src/renderer/app.tsx index a90efd803793..14fdd537b0d0 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/app.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/app.tsx @@ -463,7 +463,7 @@ export default class AppRenderer { return devices; }; - public openLinkWithAuth = async (link: Url): Promise => { + public openUrlWithAuth = async (url: Url): Promise => { let token = ''; try { token = await IpcRendererEventChannel.account.getWwwAuthToken(); @@ -471,7 +471,7 @@ export default class AppRenderer { const error = e as Error; log.error(`Failed to get the WWW auth token: ${error.message}`); } - void this.openUrl(`${link}?token=${token}`); + void this.openUrl(`${url}?token=${token}`); }; public setAllowLan = async (allowLan: boolean) => { diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx index 6a7da779e750..204a77501cc3 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx @@ -30,11 +30,11 @@ import SettingsHeader, { HeaderTitle } from './SettingsHeader'; export default function Account() { const history = useHistory(); const isOffline = useSelector((state) => state.connection.isBlocked); - const { updateAccountData, openLinkWithAuth, logout } = useAppContext(); + const { updateAccountData, openUrlWithAuth, logout } = useAppContext(); const onBuyMore = useCallback(async () => { - await openLinkWithAuth(urls.purchase); - }, [openLinkWithAuth]); + await openUrlWithAuth(urls.purchase); + }, [openUrlWithAuth]); const onMount = useEffectEvent(() => updateAccountData()); useEffect(() => onMount(), []); diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx index cac8a07a8e3b..fa59ac7d76d0 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx @@ -177,7 +177,7 @@ function Content() { function ExternalPaymentButton() { const { setShowBlockWhenDisconnectedAlert } = useExpiredAccountContext(); const { recoveryAction } = useRecoveryAction(); - const { openLinkWithAuth } = useAppContext(); + const { openUrlWithAuth } = useAppContext(); const isNewAccount = useIsNewAccount(); const buttonText = isNewAccount @@ -188,9 +188,9 @@ function ExternalPaymentButton() { if (recoveryAction === RecoveryAction.disableBlockedWhenDisconnected) { setShowBlockWhenDisconnectedAlert(true); } else { - await openLinkWithAuth(urls.purchase); + await openUrlWithAuth(urls.purchase); } - }, [openLinkWithAuth, recoveryAction, setShowBlockWhenDisconnectedAlert]); + }, [openUrlWithAuth, recoveryAction, setShowBlockWhenDisconnectedAlert]); return ( setIsModalOpen(false), [setIsModalOpen]); @@ -193,7 +193,7 @@ function NotificationActionWrapper({ switch (action.type) { case 'open-url': if (action.withAuth) { - return openLinkWithAuth(action.url); + return openUrlWithAuth(action.url); } else { return openUrl(action.url); } @@ -207,7 +207,7 @@ function NotificationActionWrapper({ } return Promise.resolve(); - }, [action, setIsModalOpen, openLinkWithAuth, openUrl]); + }, [action, setIsModalOpen, openUrlWithAuth, openUrl]); const goToProblemReport = useCallback(() => { closeTroubleshootModal();