fix: Make sure that DSN is always passed to report dialog

Author: kamilogorek

packages/browser/src/client.ts

@@ -68,22 +68,13 @@ export class BrowserClient extends BaseClient<BrowserBackend, BrowserOptions> {
     }
 
     if (!this._isEnabled()) {
-      logger.error('Trying to call showReportDialog with Sentry Client is disabled');
+      logger.error('Trying to call showReportDialog with Sentry Client disabled');
       return;
     }
 
-    const dsn = options.dsn || this.getDsn();
-
-    if (!options.eventId) {
-      logger.error('Missing `eventId` option in showReportDialog call');
-      return;
-    }
-
-    if (!dsn) {
-      logger.error('Missing `Dsn` option in showReportDialog call');
-      return;
-    }
-
-    injectReportDialog(options);
+    injectReportDialog({
+      ...options,
+      dsn: options.dsn || this.getDsn(),
+    });
   }
 }

packages/browser/src/helpers.ts

@@ -1,6 +1,6 @@
 import { API, captureException, withScope } from '@sentry/core';
 import { DsnLike, Event as SentryEvent, Mechanism, Scope, WrappedFunction } from '@sentry/types';
-import { addExceptionMechanism, addExceptionTypeValue } from '@sentry/utils';
+import { addExceptionMechanism, addExceptionTypeValue, logger } from '@sentry/utils';
 
 let ignoreOnError: number = 0;
 
@@ -186,15 +186,31 @@ export interface ReportDialogOptions {
   onLoad?(): void;
 }
 
+/**
+ * @hidden
+ */
+function missingReportDialogPropertyLog(prop: string): void {
+  logger.error(`Missing '${prop}' option in showReportDialog call`);
+}
+
 /**
  * Injects the Report Dialog script
  * @hidden
  */
 export function injectReportDialog(options: ReportDialogOptions = {}): void {
+  if (!options.eventId) {
+    missingReportDialogPropertyLog('eventId');
+    return;
+  }
+  if (!options.dsn) {
+    missingReportDialogPropertyLog('dsn');
+    return;
+  }
+
   const script = document.createElement('script');
   script.async = true;
   // tslint:disable-next-line: no-non-null-assertion
-  script.src = new API(options.dsn!).getReportDialogEndpoint(options);
+  script.src = new API(options.dsn).getReportDialogEndpoint(options);
 
   if (options.onLoad) {
     script.onload = options.onLoad;

packages/integrations/src/reportingobserver.ts

@@ -89,7 +89,7 @@ export class ReportingObserver implements Integration {
 
     this._getCurrentHub = getCurrentHub;
 
-    const observer = new (getGlobalObject<any>().ReportingObserver)(this.handler.bind(this), {
+    const observer = new (getGlobalObject<any>()).ReportingObserver(this.handler.bind(this), {
       buffered: true,
       types: this._options.types,
     });

packages/utils/src/path.ts

@@ -60,10 +60,7 @@ export function resolve(...args: string[]): string {
   // handle relative paths to be safe (might happen when process.cwd() fails)
 
   // Normalize the path
-  resolvedPath = normalizeArray(
-    resolvedPath.split('/').filter(p => !!p),
-    !resolvedAbsolute,
-  ).join('/');
+  resolvedPath = normalizeArray(resolvedPath.split('/').filter(p => !!p), !resolvedAbsolute).join('/');
 
   return (resolvedAbsolute ? '/' : '') + resolvedPath || '.';
 }
@@ -128,10 +125,7 @@ export function normalizePath(path: string): string {
   const trailingSlash = path.substr(-1) === '/';
 
   // Normalize the path
-  let normalizedPath = normalizeArray(
-    path.split('/').filter(p => !!p),
-    !isPathAbsolute,
-  ).join('/');
+  let normalizedPath = normalizeArray(path.split('/').filter(p => !!p), !isPathAbsolute).join('/');
 
   if (!normalizedPath && !isPathAbsolute) {
     normalizedPath = '.';

packages/utils/test/object.test.ts

@@ -204,10 +204,7 @@ describe('normalize()', () => {
       obj.children[1].self = obj.children[1];
       expect(normalize(obj)).toEqual({
         name: 'Alice',
-        children: [
-          { name: 'Bob', self: '[Circular ~]' },
-          { name: 'Eve', self: '[Circular ~]' },
-        ],
+        children: [{ name: 'Bob', self: '[Circular ~]' }, { name: 'Eve', self: '[Circular ~]' }],
       });
     });
 
@@ -222,10 +219,7 @@ describe('normalize()', () => {
       const obj: object[] = [];
       obj.push({ name: 'Alice', self: obj });
       obj.push({ name: 'Bob', self: obj });
-      expect(normalize(obj)).toEqual([
-        { name: 'Alice', self: '[Circular ~]' },
-        { name: 'Bob', self: '[Circular ~]' },
-      ]);
+      expect(normalize(obj)).toEqual([{ name: 'Alice', self: '[Circular ~]' }, { name: 'Bob', self: '[Circular ~]' }]);
     });
 
     test('repeated objects in objects', () => {

packages/utils/test/promisebuffer.test.ts

@@ -19,11 +19,7 @@ describe('PromiseBuffer', () => {
       const q = new PromiseBuffer<void>(1);
       const p = new SyncPromise<void>(resolve => setTimeout(resolve, 1));
       expect(q.add(p)).toEqual(p);
-      expect(
-        q.add(
-          new SyncPromise<void>(resolve => setTimeout(resolve, 1)),
-        ),
-      ).rejects.toThrowError();
+      expect(q.add(new SyncPromise<void>(resolve => setTimeout(resolve, 1)))).rejects.toThrowError();
       expect(q.length()).toBe(1);
     });
   });