Fixed an issue with submitting session heartbeats

niemyjski · niemyjski · commit c49e90cc13c8 · 2016-05-02T16:32:55.000-05:00
diff --git a/src/ExceptionlessClient.ts b/src/ExceptionlessClient.ts
@@ -103,12 +103,14 @@ export class ExceptionlessClient {
 
   public submitSessionEnd(sessionIdOrUserId: string): void {
     if (sessionIdOrUserId) {
+      this.config.log.info(`Submitting session end: ${sessionIdOrUserId}`);
       this.config.submissionClient.sendHeartbeat(sessionIdOrUserId, true, this.config);
     }
   }
 
   public submitSessionHeartbeat(sessionIdOrUserId: string): void {
     if (sessionIdOrUserId) {
+      this.config.log.info(`Submitting session heartbeat: ${sessionIdOrUserId}`);
       this.config.submissionClient.sendHeartbeat(sessionIdOrUserId, false, this.config);
     }
   }
diff --git a/src/submission/DefaultSubmissionAdapter.ts b/src/submission/DefaultSubmissionAdapter.ts
@@ -89,7 +89,7 @@ export class DefaultSubmissionAdapter implements ISubmissionAdapter {
       return xhr;
     }
 
-    let url = `${request.url}?access_token=${encodeURIComponent(request.apiKey)}`;
+    let url = `${request.url}${(request.url.indexOf('?') === -1 ? '?' : '&')}access_token=${encodeURIComponent(request.apiKey)}`;
     let xhr = createRequest(request.userAgent, request.method || 'POST', url);
     if (!xhr) {
       return (callback && callback(503, 'CORS not supported.'));

Original file line number	Diff line number	Diff line change
`@@ -103,12 +103,14 @@ export class ExceptionlessClient {`
`103`	`103`
`104`	`104`	`public submitSessionEnd(sessionIdOrUserId: string): void {`
`105`	`105`	`if (sessionIdOrUserId) {`
	`106`	+ this.config.log.info(`Submitting session end: ${sessionIdOrUserId}`);
`106`	`107`	`this.config.submissionClient.sendHeartbeat(sessionIdOrUserId, true, this.config);`
`107`	`108`	`}`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`public submitSessionHeartbeat(sessionIdOrUserId: string): void {`
`111`	`112`	`if (sessionIdOrUserId) {`
	`113`	+ this.config.log.info(`Submitting session heartbeat: ${sessionIdOrUserId}`);
`112`	`114`	`this.config.submissionClient.sendHeartbeat(sessionIdOrUserId, false, this.config);`
`113`	`115`	`}`
`114`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ export class DefaultSubmissionAdapter implements ISubmissionAdapter {`
`89`	`89`	`return xhr;`
`90`	`90`	`}`
`91`	`91`
`92`		- let url = `${request.url}?access_token=${encodeURIComponent(request.apiKey)}`;
	`92`	+ let url = `${request.url}${(request.url.indexOf('?') === -1 ? '?' : '&')}access_token=${encodeURIComponent(request.apiKey)}`;
`93`	`93`	`let xhr = createRequest(request.userAgent, request.method \|\| 'POST', url);`
`94`	`94`	`if (!xhr) {`
`95`	`95`	`return (callback && callback(503, 'CORS not supported.'));`