fix: getsentry#1949 (getsentry#2053)

HazAT · web-flow · commit c3c2afaf90d7 · 2019-05-07T11:30:53.000+02:00
* fix: getsentry#1949 * fix: Typo * fix: Lint * fix: Only in case of an error * fix: CR
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+- [browser] fix: GlobalHandler integration sometimes receives Event objects as message: Fix #1949
+
 ## 5.1.2
 
 - [browser] fix: Fixed a bug if Sentry was initialized multiple times: Fix #2043
diff --git a/packages/browser/src/integrations/globalhandlers.ts b/packages/browser/src/integrations/globalhandlers.ts
@@ -1,6 +1,6 @@
 import { getCurrentHub } from '@sentry/core';
 import { Event, Integration } from '@sentry/types';
-import { addExceptionTypeValue, logger, normalize, truncate } from '@sentry/utils';
+import { addExceptionTypeValue, isString, logger, normalize, truncate } from '@sentry/utils';
 
 import { eventFromStacktrace } from '../parsers';
 import {
@@ -91,6 +91,14 @@ export class GlobalHandlers implements Integration {
    * @param stacktrace TraceKitStackTrace to be converted to an Event.
    */
   private _eventFromGlobalHandler(stacktrace: TraceKitStackTrace): Event {
+    if (!isString(stacktrace.message) && stacktrace.mechanism !== 'onunhandledrejection') {
+      // There are cases where stacktrace.message is an Event object
+      // https://github.com/getsentry/sentry-javascript/issues/1949
+      // In this specific case we try to extract stacktrace.message.error.message
+      const message = (stacktrace.message as unknown) as any;
+      stacktrace.message =
+        message.error && isString(message.error.message) ? message.error.message : 'No error message';
+    }
     const event = eventFromStacktrace(stacktrace);
 
     const data: { [key: string]: string } = {
