identify should ignore invalid proxy objects

Author: djih

amplitude.js

@@ -3311,18 +3311,22 @@ var Identify = function() {
 };
 
 Identify.prototype.fromProxyObject = function(proxyObject) {
-  this._addOperationsFromProxyObjectDictionary(AMP_OP_SET_ONCE, proxyObject, 'so');
-  this._addOperationsFromProxyObjectDictionary(AMP_OP_UNSET, proxyObject, 'u');
-  this._addOperationsFromProxyObjectDictionary(AMP_OP_SET, proxyObject, 's');
-  this._addOperationsFromProxyObjectDictionary(AMP_OP_ADD, proxyObject, 'a');
+  if (!('p' in proxyObject)) {
+    return this;
+  }
+
+  this._addOperationsFromProxyObjectDictionary(AMP_OP_SET_ONCE, proxyObject.p, 'so');
+  this._addOperationsFromProxyObjectDictionary(AMP_OP_UNSET, proxyObject.p, 'u');
+  this._addOperationsFromProxyObjectDictionary(AMP_OP_SET, proxyObject.p, 's');
+  this._addOperationsFromProxyObjectDictionary(AMP_OP_ADD, proxyObject.p, 'a');
   return this;
 };
 
-Identify.prototype._addOperationsFromProxyObjectDictionary = function(operation, proxyObject, dictionary) {
-  if (dictionary in proxyObject.p) {
-    for (var key in proxyObject.p[dictionary]) {
-      if (proxyObject.p[dictionary].hasOwnProperty(key)) {
-        this._addOperation(operation, key, proxyObject.p[dictionary][key]);
+Identify.prototype._addOperationsFromProxyObjectDictionary = function(operation, userPropertyOperations, dictionary) {
+  if (dictionary in userPropertyOperations) {
+    for (var key in userPropertyOperations[dictionary]) {
+      if (userPropertyOperations[dictionary].hasOwnProperty(key)) {
+        this._addOperation(operation, key, userPropertyOperations[dictionary][key]);
       }
     }
   }

amplitude.min.js

@@ -22,18 +22,22 @@ var Identify = function() {
 };
 
 Identify.prototype.fromProxyObject = function(proxyObject) {
-  this._addOperationsFromProxyObjectDictionary(AMP_OP_SET_ONCE, proxyObject, 'so');
-  this._addOperationsFromProxyObjectDictionary(AMP_OP_UNSET, proxyObject, 'u');
-  this._addOperationsFromProxyObjectDictionary(AMP_OP_SET, proxyObject, 's');
-  this._addOperationsFromProxyObjectDictionary(AMP_OP_ADD, proxyObject, 'a');
+  if (!('p' in proxyObject)) {
+    return this;
+  }
+
+  this._addOperationsFromProxyObjectDictionary(AMP_OP_SET_ONCE, proxyObject.p, 'so');
+  this._addOperationsFromProxyObjectDictionary(AMP_OP_UNSET, proxyObject.p, 'u');
+  this._addOperationsFromProxyObjectDictionary(AMP_OP_SET, proxyObject.p, 's');
+  this._addOperationsFromProxyObjectDictionary(AMP_OP_ADD, proxyObject.p, 'a');
   return this;
 };
 
-Identify.prototype._addOperationsFromProxyObjectDictionary = function(operation, proxyObject, dictionary) {
-  if (dictionary in proxyObject.p) {
-    for (var key in proxyObject.p[dictionary]) {
-      if (proxyObject.p[dictionary].hasOwnProperty(key)) {
-        this._addOperation(operation, key, proxyObject.p[dictionary][key]);
+Identify.prototype._addOperationsFromProxyObjectDictionary = function(operation, userPropertyOperations, dictionary) {
+  if (dictionary in userPropertyOperations) {
+    for (var key in userPropertyOperations[dictionary]) {
+      if (userPropertyOperations[dictionary].hasOwnProperty(key)) {
+        this._addOperation(operation, key, userPropertyOperations[dictionary][key]);
       }
     }
   }

src/identify.js

@@ -164,6 +164,10 @@ describe('Identify', function() {
     var emptyIdentify = new Identify().fromProxyObject(emptyProxyObject);
     assert.deepEqual(emptyIdentify.userPropertiesOperations, {});
 
+    // proxy object without p dict should result in empty identify object:
+    var emptyIdentify2 = new Identify().fromProxyObject({});
+    assert.deepEqual(emptyIdentify2.userPropertiesOperations, {});
+
     var proxyObject = {'p':{
       'a':{'key1': 'value1'},
       'u':{'key1': 'value2'},