-
Notifications
You must be signed in to change notification settings - Fork 96
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
126 additions
and
12 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/packages/components/containers/api/humanVerification/Captcha.tsx b/packages/components/containers/api/humanVerification/Captcha.tsx | ||
| index 926c6bc01..66fb79063 100644 | ||
| --- a/packages/components/containers/api/humanVerification/Captcha.tsx | ||
| +++ b/packages/components/containers/api/humanVerification/Captcha.tsx | ||
| @@ -5,6 +5,7 @@ const getIframeUrl = (token: string) => { | ||
| const url = getApiSubdomainUrl('/core/v4/captcha'); | ||
| url.searchParams.set('Token', token); | ||
| url.searchParams.set('ForceWebMessaging', '1'); | ||
| + url.protocol = "https:"; | ||
| return url; | ||
| }; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| diff --git a/packages/shared/lib/helpers/sentry.ts b/packages/shared/lib/helpers/sentry.ts | ||
| index 5664f0fa6..375d20e29 100644 | ||
| --- a/packages/shared/lib/helpers/sentry.ts | ||
| +++ b/packages/shared/lib/helpers/sentry.ts | ||
| @@ -1,95 +1,12 @@ | ||
| import * as Sentry from '@sentry/browser'; | ||
|
|
||
| import { ProtonConfig } from '../interfaces'; | ||
| -import { VPN_HOSTNAME } from '../constants'; | ||
| - | ||
| -const isLocalhost = (host: string) => host.startsWith('localhost'); | ||
| - | ||
| -const isProduction = (host: string) => host.endsWith('.protonmail.com') || host === VPN_HOSTNAME; | ||
|
|
||
| function main({ SENTRY_DSN, COMMIT, APP_VERSION }: Pick<ProtonConfig, 'SENTRY_DSN' | 'COMMIT' | 'APP_VERSION'>) { | ||
| - const { host } = window.location; | ||
| - | ||
| - // No need to configure it if we don't load the DSN | ||
| - if (!SENTRY_DSN || isLocalhost(host)) { | ||
| - return; | ||
| - } | ||
| - | ||
| - // Assumes SENTRY_DSN is: https://111b3eeaaec34cae8e812df705690a36@sentry/11 | ||
| - // To get https://111b3eeaaec34cae8e812df705690a36@mail.protonmail.com/api/reports/sentry/11 | ||
| - const dsn = SENTRY_DSN.replace('sentry', `${host}/api/reports/sentry`); | ||
| - | ||
| - Sentry.init({ | ||
| - dsn, | ||
| - release: isProduction(host) ? APP_VERSION : COMMIT, | ||
| - environment: host, | ||
| - normalizeDepth: 5, | ||
| - beforeSend(event, hint) { | ||
| - const error = hint?.originalException; | ||
| - const stack = typeof error === 'string' ? error : error?.stack; | ||
| - // Filter out broken ferdi errors | ||
| - if (stack && stack.match(/ferdi|franz/i)) { | ||
| - return null; | ||
| - } | ||
| - | ||
| - // Remove the hash from the request URL and navigation breadcrumbs to avoid | ||
| - // leaking the search parameters of encrypted searches | ||
| - if (event.request && event.request.url) { | ||
| - [event.request.url] = event.request.url.split('#'); | ||
| - } | ||
| - if (event.breadcrumbs) { | ||
| - event.breadcrumbs = event.breadcrumbs.map((breadcrumb) => { | ||
| - if (breadcrumb.category === 'navigation' && breadcrumb.data) { | ||
| - [breadcrumb.data.from] = breadcrumb.data.from.split('#'); | ||
| - [breadcrumb.data.to] = breadcrumb.data.to.split('#'); | ||
| - } | ||
| - return breadcrumb; | ||
| - }); | ||
| - } | ||
| - | ||
| - return event; | ||
| - }, | ||
| - ignoreErrors: [ | ||
| - // Ignore random plugins/extensions | ||
| - 'top.GLOBALS', | ||
| - 'canvas.contentDocument', | ||
| - 'MyApp_RemoveAllHighlights', | ||
| - 'atomicFindClose', | ||
| - 'conduitPage', | ||
| - // https://bugzilla.mozilla.org/show_bug.cgi?id=1678243 | ||
| - 'XDR encoding failure', | ||
| - 'Request timed out', | ||
| - 'No network connection', | ||
| - 'Failed to fetch', | ||
| - 'NetworkError when attempting to fetch resource.', | ||
| - 'No network connection', | ||
| - 'webkitExitFullScreen', // Bug in Firefox for iOS. | ||
| - 'InactiveSession', | ||
| - 'UnhandledRejection', // Happens too often in extensions and we have lints for that, so should be safe to ignore. | ||
| - /chrome-extension/, | ||
| - /moz-extension/, | ||
| - 'TransferCancel', // User action to interrupt upload or download in Drive. | ||
| - 'UploadConflictError', // User uploading the same file again in Drive. | ||
| - 'UploadUserError', // Upload error on user's side in Drive. | ||
| - 'ChunkLoadError', // WebPack loading source code. | ||
| - ], | ||
| - }); | ||
| - | ||
| - Sentry.configureScope((scope) => { | ||
| - scope.setTag('appVersion', APP_VERSION); | ||
| - }); | ||
| } | ||
|
|
||
| -export const traceError = (...args: Parameters<typeof Sentry.captureException>) => { | ||
| - if (!isLocalhost(window.location.host)) { | ||
| - Sentry.captureException(...args); | ||
| - } | ||
| -}; | ||
| +export const traceError = (...args: Parameters<typeof Sentry.captureException>) => console.error(...args); | ||
|
|
||
| -export const captureMessage = (...args: Parameters<typeof Sentry.captureMessage>) => { | ||
| - if (!isLocalhost(window.location.host)) { | ||
| - Sentry.captureMessage(...args); | ||
| - } | ||
| -}; | ||
| +export const captureMessage = (...args: Parameters<typeof Sentry.captureMessage>) => console.log(...args); | ||
|
|
||
| export default main; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters