append R to end of generated deviceId

Author: djih

amplitude.js

@@ -188,7 +188,7 @@ Amplitude.prototype.init = function init(apiKey, opt_userId, opt_config, opt_cal
 
     // load deviceId and userId from input, or try to fetch existing value from cookie
     this.options.deviceId = (type(opt_config) === 'object' && type(opt_config.deviceId) === 'string' &&
-        !utils.isEmptyString(opt_config.deviceId) && opt_config.deviceId) || this.options.deviceId || UUID();
+        !utils.isEmptyString(opt_config.deviceId) && opt_config.deviceId) || this.options.deviceId || UUID() + 'R';
     this.options.userId = (type(opt_userId) === 'string' && !utils.isEmptyString(opt_userId) && opt_userId) ||
         this.options.userId || null;
 

amplitude.min.js

@@ -82,7 +82,7 @@ Amplitude.prototype.init = function init(apiKey, opt_userId, opt_config, opt_cal
 
     // load deviceId and userId from input, or try to fetch existing value from cookie
     this.options.deviceId = (type(opt_config) === 'object' && type(opt_config.deviceId) === 'string' &&
-        !utils.isEmptyString(opt_config.deviceId) && opt_config.deviceId) || this.options.deviceId || UUID();
+        !utils.isEmptyString(opt_config.deviceId) && opt_config.deviceId) || this.options.deviceId || UUID() + 'R';
     this.options.userId = (type(opt_userId) === 'string' && !utils.isEmptyString(opt_userId) && opt_userId) ||
         this.options.userId || null;
 

src/amplitude.js

@@ -50,6 +50,12 @@ describe('Amplitude', function() {
       assert.equal(amplitude.options.userId, userId);
     });
 
+    it('should generate a random deviceId', function() {
+      amplitude.init(apiKey, userId);
+      assert.lengthOf(amplitude.options.deviceId, 37); // UUID is length 36, but we append 'R' at end
+      assert.equal(amplitude.options.deviceId[36], 'R');
+    });
+
     it('should validate config values', function() {
       var config = {
           apiEndpoint: 100,  // invalid type
@@ -76,7 +82,7 @@ describe('Amplitude', function() {
       var stored = cookie.get(amplitude.options.cookieName);
       assert.property(stored, 'deviceId');
       assert.propertyVal(stored, 'userId', userId);
-      assert.lengthOf(stored.deviceId, 36);
+      assert.lengthOf(stored.deviceId, 37); // increase deviceId length by 1 for 'R' character
     });
 
     it('should set language', function() {