Simplify some logic around the auth querystring

Author: mattrobenolt

src/raven.js

@@ -20,7 +20,8 @@ var _Raven = window.Raven,
         collectWindowErrors: true,
         tags: {},
         extra: {}
-    };
+    },
+    authQueryString;
 
 /*
  * The core Raven singleton
@@ -95,6 +96,8 @@ var Raven = {
 
         TraceKit.collectWindowErrors = !!globalOptions.collectWindowErrors;
 
+        setAuthQueryString();
+
         // return for chaining
         return Raven;
     },
@@ -392,23 +395,15 @@ function each(obj, callback) {
     }
 }
 
-var cachedAuth;
-
-function getAuthQueryString() {
-    if (cachedAuth) return cachedAuth;
 
-    var qs = [
-        'sentry_version=4',
-        'sentry_client=raven-js/' + Raven.VERSION
-    ];
-    if (globalKey) {
-        qs.push('sentry_key=' + globalKey);
-    }
-
-    cachedAuth = '?' + qs.join('&');
-    return cachedAuth;
+function setAuthQueryString() {
+    authQueryString =
+        '?sentry_version=4' +
+        '&sentry_client=raven-js/' + Raven.VERSION +
+        '&sentry_key=' + globalKey;
 }
 
+
 function handleStackInfo(stackInfo, options) {
     var frames = [];
 
@@ -622,7 +617,7 @@ function send(data) {
 
 function makeRequest(data) {
     var img = new Image(),
-        src = globalServer + getAuthQueryString() + '&sentry_data=' + encodeURIComponent(JSON.stringify(data));
+        src = globalServer + authQueryString + '&sentry_data=' + encodeURIComponent(JSON.stringify(data));
 
     img.onload = function success() {
         triggerEvent('success', {

test/raven.test.js

@@ -1,5 +1,5 @@
 function flushRavenState() {
-    cachedAuth = undefined;
+    authQueryString = undefined;
     hasJSON = !isUndefined(window.JSON);
     lastCapturedException = undefined;
     lastEventId = undefined;
@@ -221,16 +221,11 @@ describe('globals', function() {
         });
     });
 
-    describe('getAuthQueryString', 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';
-            assert.strictEqual(getAuthQueryString(), expected);
-            assert.strictEqual(cachedAuth, expected);
-        });
-
-        it('should return cached value when it exists', function() {
-            cachedAuth = 'lol';
-            assert.strictEqual(getAuthQueryString(), 'lol');
+            setAuthQueryString();
+            assert.strictEqual(authQueryString, expected);
         });
     });
 
@@ -810,7 +805,7 @@ describe('globals', function() {
     describe('makeRequest', function() {
         it('should load an Image', function() {
             imageCache = [];
-            this.sinon.stub(window, 'getAuthQueryString').returns('?lol');
+            authQueryString = '?lol';
             globalServer = 'http://localhost/';
 
             makeRequest({foo: 'bar'});