ref(utils): dsn

Author: JonasBa

packages/core/src/api.ts

@@ -1,5 +1,5 @@
-import { DsnLike, SdkMetadata } from '@sentry/types';
-import { Dsn, makeDsn, urlEncode } from '@sentry/utils';
+import { Dsn, DsnLike, SdkMetadata } from '@sentry/types';
+import { makeDsn, urlEncode } from '@sentry/utils';
 
 const SENTRY_API_VERSION = '7';
 

packages/core/src/baseclient.ts

@@ -2,6 +2,7 @@
 import { Scope, Session } from '@sentry/hub';
 import {
   Client,
+  Dsn,
   Event,
   EventHint,
   Integration,
@@ -13,7 +14,6 @@ import {
 import {
   checkOrSetAlreadyCaught,
   dateTimestampInSeconds,
-  Dsn,
   isPlainObject,
   isPrimitive,
   isThenable,

packages/types/src/dsn.ts

@@ -35,5 +35,5 @@ export interface Dsn extends DsnComponents {
    *
    * @param withPassword When set to true, the password will be included.
    */
-  toString(withPassword: boolean): string;
+  toString(withPassword?: boolean): string;
 }

packages/utils/src/dsn.ts

@@ -1,13 +1,8 @@
-import { DsnComponents, DsnLike, DsnProtocol } from '@sentry/types';
+import { Dsn, DsnComponents, DsnLike, DsnProtocol } from '@sentry/types';
 
 import { isDebugBuild } from './env';
 import { SentryError } from './error';
 
-export interface Dsn extends DsnComponents {
-  /** Protocol used to connect to Sentry. */
-  toString(withPassword: boolean): string;
-}
-
 /** Regular expression used to parse a Dsn. */
 const DSN_REGEX = /^(?:(\w+):)\/\/(?:(\w+)(?::(\w+))?@)([\w.-]+)(?::(\d+))?\/(.+)/;
 
@@ -92,7 +87,7 @@ function validateDsn(dsn: Dsn): boolean {
       throw new SentryError(`Invalid Dsn: Invalid projectId ${projectId}`);
     }
 
-    if (isValidProtocol(protocol)) {
+    if (!isValidProtocol(protocol)) {
       throw new SentryError(`Invalid Dsn: Invalid protocol ${protocol}`);
     }
 
@@ -112,7 +107,7 @@ export function makeDsn(from: DsnLike): Dsn {
 
   const dsn: Dsn = {
     ...components,
-    toString: (withPassword: boolean) => dsntoString(dsn),
+    toString: (withPassword: boolean) => dsntoString(dsn, withPassword),
   };
 
   return dsn;