Revert "fix: Handle DSN qs and show better error messages (getsentry#2635)" (getsentry#2638)

HazAT · web-flow · commit e02a4c7f4ade · 2020-06-03T18:20:19.000+02:00
This reverts commit 570cd83.
diff --git a/packages/utils/src/dsn.ts b/packages/utils/src/dsn.ts
@@ -72,13 +72,6 @@ export class Dsn implements DsnComponents {
       projectId = split.pop() as string;
     }
 
-    if (projectId) {
-      const projectMatch = projectId.match(/^\d+/);
-      if (projectMatch) {
-        projectId = projectMatch[0];
-      }
-    }
-
     this._fromComponents({ host, pass, path, projectId, port, protocol: protocol as DsnProtocol, user });
   }
 
@@ -97,20 +90,16 @@ export class Dsn implements DsnComponents {
   private _validate(): void {
     ['protocol', 'user', 'host', 'projectId'].forEach(component => {
       if (!this[component as keyof DsnComponents]) {
-        throw new SentryError(`${ERROR_MESSAGE}: ${component} missing`);
+        throw new SentryError(ERROR_MESSAGE);
       }
     });
 
-    if (!this.projectId.match(/^\d+$/)) {
-      throw new SentryError(`${ERROR_MESSAGE}: Invalid projectId ${this.projectId}`);
-    }
-
     if (this.protocol !== 'http' && this.protocol !== 'https') {
-      throw new SentryError(`${ERROR_MESSAGE}: Invalid protocol ${this.protocol}`);
+      throw new SentryError(ERROR_MESSAGE);
     }
 
     if (this.port && isNaN(parseInt(this.port, 10))) {
-      throw new SentryError(`${ERROR_MESSAGE}: Invalid port ${this.port}`);
+      throw new SentryError(ERROR_MESSAGE);
     }
   }
 }
diff --git a/packages/utils/test/dsn.test.ts b/packages/utils/test/dsn.test.ts
@@ -17,8 +17,8 @@ describe('Dsn', () => {
       expect(dsn.pass).toBe('xyz');
       expect(dsn.host).toBe('sentry.io');
       expect(dsn.port).toBe('1234');
-      expect(dsn.path).toBe('');
       expect(dsn.projectId).toBe('123');
+      expect(dsn.path).toBe('');
     });
 
     test('applies partial components', () => {
@@ -33,8 +33,8 @@ describe('Dsn', () => {
       expect(dsn.pass).toBe('');
       expect(dsn.host).toBe('sentry.io');
       expect(dsn.port).toBe('');
-      expect(dsn.path).toBe('');
       expect(dsn.projectId).toBe('123');
+      expect(dsn.path).toBe('');
     });
 
     test('throws for missing components', () => {
@@ -107,8 +107,8 @@ describe('Dsn', () => {
       expect(dsn.pass).toBe('xyz');
       expect(dsn.host).toBe('sentry.io');
       expect(dsn.port).toBe('1234');
-      expect(dsn.path).toBe('');
       expect(dsn.projectId).toBe('123');
+      expect(dsn.path).toBe('');
     });
 
     test('parses a valid partial Dsn', () => {
@@ -133,17 +133,6 @@ describe('Dsn', () => {
       expect(dsn.projectId).toBe('321');
     });
 
-    test('with a query string', () => {
-      const dsn = new Dsn('https://abc@sentry.io/321?sample.rate=0.1&other=value');
-      expect(dsn.protocol).toBe('https');
-      expect(dsn.user).toBe('abc');
-      expect(dsn.pass).toBe('');
-      expect(dsn.host).toBe('sentry.io');
-      expect(dsn.port).toBe('');
-      expect(dsn.path).toBe('');
-      expect(dsn.projectId).toBe('321');
-    });
-
     test('throws when provided invalid Dsn', () => {
       expect(() => new Dsn('some@random.dsn')).toThrow(SentryError);
     });
@@ -158,7 +147,6 @@ describe('Dsn', () => {
     test('throws for invalid fields', () => {
       expect(() => new Dsn('httpx://abc@sentry.io/123')).toThrow(SentryError);
       expect(() => new Dsn('httpx://abc@sentry.io:xxx/123')).toThrow(SentryError);
-      expect(() => new Dsn('http://abc@sentry.io/abc')).toThrow(SentryError);
     });
   });
 

Original file line number	Diff line number	Diff line change
`@@ -72,13 +72,6 @@ export class Dsn implements DsnComponents {`
`72`	`72`	`projectId = split.pop() as string;`
`73`	`73`	`}`
`74`	`74`
`75`		`- if (projectId) {`
`76`		`- const projectMatch = projectId.match(/^\d+/);`
`77`		`- if (projectMatch) {`
`78`		`- projectId = projectMatch[0];`
`79`		`- }`
`80`		`- }`
`81`		`-`
`82`	`75`	`this._fromComponents({ host, pass, path, projectId, port, protocol: protocol as DsnProtocol, user });`
`83`	`76`	`}`
`84`	`77`
`@@ -97,20 +90,16 @@ export class Dsn implements DsnComponents {`
`97`	`90`	`private _validate(): void {`
`98`	`91`	`['protocol', 'user', 'host', 'projectId'].forEach(component => {`
`99`	`92`	`if (!this[component as keyof DsnComponents]) {`
`100`		- throw new SentryError(`${ERROR_MESSAGE}: ${component} missing`);
	`93`	`+ throw new SentryError(ERROR_MESSAGE);`
`101`	`94`	`}`
`102`	`95`	`});`
`103`	`96`
`104`		`- if (!this.projectId.match(/^\d+$/)) {`
`105`		- throw new SentryError(`${ERROR_MESSAGE}: Invalid projectId ${this.projectId}`);
`106`		`- }`
`107`		`-`
`108`	`97`	`if (this.protocol !== 'http' && this.protocol !== 'https') {`
`109`		- throw new SentryError(`${ERROR_MESSAGE}: Invalid protocol ${this.protocol}`);
	`98`	`+ throw new SentryError(ERROR_MESSAGE);`
`110`	`99`	`}`
`111`	`100`
`112`	`101`	`if (this.port && isNaN(parseInt(this.port, 10))) {`
`113`		- throw new SentryError(`${ERROR_MESSAGE}: Invalid port ${this.port}`);
	`102`	`+ throw new SentryError(ERROR_MESSAGE);`
`114`	`103`	`}`
`115`	`104`	`}`
`116`	`105`	`}`