Get rid of setAuthQueryString and pass all the bits to makeRequest

Author: mattrobenolt

src/raven.js

@@ -23,7 +23,6 @@ var _Raven = window.Raven,
         maxMessageLength: 100,
         extra: {}
     },
-    authQueryString,
     isRavenInstalled = false,
     objectPrototype = Object.prototype,
     // capture references to window.console *and* all its methods first
@@ -114,8 +113,6 @@ var Raven = {
 
         TraceKit.collectWindowErrors = !!globalOptions.collectWindowErrors;
 
-        setAuthQueryString();
-
         // return for chaining
         return Raven;
     },
@@ -508,15 +505,6 @@ function each(obj, callback) {
     }
 }
 
-
-function setAuthQueryString() {
-    authQueryString =
-        '?sentry_version=4' +
-        '&sentry_client=raven-js/' + Raven.VERSION +
-        '&sentry_key=' + globalKey;
-}
-
-
 function handleStackInfo(stackInfo, options) {
     var frames = [];
 
@@ -752,31 +740,36 @@ function send(data) {
 
     if (!isSetup()) return;
 
-    var url = globalServer + authQueryString;
-
     makeRequest({
-        url: url,
+        url: globalServer,
+        auth: {
+            sentry_version: '4',
+            sentry_client: 'raven-js/' + Raven.VERSION,
+            sentry_key: globalKey
+        },
         data: data,
         options: globalOptions,
         onSuccess: function success() {
             triggerEvent('success', {
                 data: data,
-                src: url
+                src: globalServer
             });
         },
         onError: function failure() {
             triggerEvent('failure', {
                 data: data,
-                src: url
+                src: globalServer
             });
         }
     });
 }
 
-
 function makeRequest(opts) {
+    // Tack on sentry_data to auth options, which get urlencoded
+    opts.auth.sentry_data = JSON.stringify(opts.data);
+
     var img = newImage(),
-        src = opts.url + '&sentry_data=' + encodeURIComponent(JSON.stringify(opts.data));
+        src = opts.url + '?' + urlencode(opts.auth);
 
     if (opts.options.crossOrigin || opts.options.crossOrigin === '') {
         img.crossOrigin = opts.options.crossOrigin;
@@ -876,4 +869,13 @@ function afterLoad() {
         Raven.config(RavenConfig.dsn, RavenConfig.config).install();
     }
 }
+
+function urlencode(o) {
+    var pairs = [];
+    each(o, function(key, value) {
+        pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
+    });
+    return pairs.join('&');
+}
+
 afterLoad();

test/raven.test.js

@@ -1,5 +1,4 @@
 function flushRavenState() {
-    authQueryString = undefined;
     hasJSON = !isUndefined(window.JSON);
     lastCapturedException = undefined;
     lastEventId = undefined;
@@ -360,14 +359,6 @@ describe('globals', function() {
         });
     });
 
-    describe('setAuthQueryString', function() {
-        it('should return a properly formatted string and cache it', function() {
-            var expected = '?sentry_version=4&sentry_client=raven-js/<%= pkg.version %>&sentry_key=abc';
-            setAuthQueryString();
-            assert.strictEqual(authQueryString, expected);
-        });
-    });
-
     describe('parseDSN', function() {
         it('should do what it advertises', function() {
             var pieces = parseDSN('http://abc@example.com:80/2');
@@ -1129,7 +1120,6 @@ describe('globals', function() {
             });
 
             globalServer = 'http://localhost/store/';
-            authQueryString = '?lol'
 
             globalOptions = {
                 projectId: 2,
@@ -1141,7 +1131,7 @@ describe('globals', function() {
             var args = window.makeRequest.lastCall.args;
             assert.equal(args.length, 1);
             var opts = args[0];
-            assert.equal(opts.url, 'http://localhost/store/?lol');
+            assert.equal(opts.url, 'http://localhost/store/');
             assert.deepEqual(opts.data, {
                 project: '2',
                 release: 'abc123',
@@ -1157,6 +1147,11 @@ describe('globals', function() {
                 foo: 'bar',
                 extra: {'session:duration': 100},
             });
+            assert.deepEqual(opts.auth, {
+                sentry_client: 'raven-js/<%= pkg.version %>',
+                sentry_key: 'abc',
+                sentry_version: '4'
+            });
             assert.deepEqual(opts.options, globalOptions);
             assert.isFunction(opts.onSuccess);
             assert.isFunction(opts.onError);
@@ -1195,12 +1190,13 @@ describe('globals', function() {
 
         it('should load an Image', function() {
             makeRequest({
-                url: 'http://localhost/?lol',
+                url: 'http://localhost/',
+                auth: {a: '1', b: '2'},
                 data: {foo: 'bar'},
                 options: globalOptions
             });
             assert.equal(imageCache.length, 1);
-            assert.equal(imageCache[0].src, 'http://localhost/?lol&sentry_data=%7B%22foo%22%3A%22bar%22%7D');
+            assert.equal(imageCache[0].src, 'http://localhost/?a=1&b=2&sentry_data=%7B%22foo%22%3A%22bar%22%7D');
         });
 
         it('should populate crossOrigin based on globalOptions', function() {
@@ -1209,6 +1205,7 @@ describe('globals', function() {
             };
             makeRequest({
                 url: globalServer,
+                auth: {lol: '1'},
                 data: {foo: 'bar'},
                 options: globalOptions
             });
@@ -1222,6 +1219,7 @@ describe('globals', function() {
             };
             makeRequest({
                 url: globalServer,
+                auth: {lol: '1'},
                 data: {foo: 'bar'},
                 options: globalOptions
             });
@@ -1235,6 +1233,7 @@ describe('globals', function() {
             };
             makeRequest({
                 url: globalServer,
+                auth: {lol: '1'},
                 data: {foo: 'bar'},
                 options: globalOptions
             });
@@ -1418,6 +1417,13 @@ describe('globals', function() {
             ]).source, 'a|b|a\\.b|d|[0-9]');
         });
     });
+
+    describe('urlencode', function() {
+        it('should work', function() {
+            assert.equal(urlencode({}), '');
+            assert.equal(urlencode({'foo': 'bar', 'baz': '1 2'}), 'foo=bar&baz=1%202');
+        });
+    });
 });
 
 describe('Raven (public API)', function() {