Fixes #1417

Author: drew-gross

spec/transform.spec.js

@@ -1,6 +1,8 @@
 // These tests are unit tests designed to only test transform.js.
+"use strict";
 
-var transform = require('../src/transform');
+let transform = require('../src/transform');
+let dd = require('deep-diff');
 
 var dummySchema = {
     data: {},
@@ -150,14 +152,28 @@ describe('untransformObject', () => {
     done();
   });
 
-    it('nested array', (done) => {
-      var input = {arr: [{_testKey: 'testValue' }]};
-      var output = transform.untransformObject(dummySchema, null, input);
-      expect(Array.isArray(output.arr)).toEqual(true);
-      expect(output.arr).toEqual([{ _testKey: 'testValue'}]);
-      done();
-    });
+  it('nested array', (done) => {
+    var input = {arr: [{_testKey: 'testValue' }]};
+    var output = transform.untransformObject(dummySchema, null, input);
+    expect(Array.isArray(output.arr)).toEqual(true);
+    expect(output.arr).toEqual([{ _testKey: 'testValue'}]);
+    done();
+  });
 
+  it('untransforms objects containing nested special keys', done => {
+    let input = {array: [{
+      _id: "Test ID",
+      _hashed_password: "I Don't know why you would name a key this, but if you do it should work",
+      _tombstone: {
+        _updated_at: "I'm sure people will nest keys like this",
+        _acl: 7,
+        _id: {}
+      },
+    }]}
+    let output = transform.untransformObject(dummySchema, null, input);
+    expect(dd(output, input)).toEqual(undefined);
+    done();
+  });
 });
 
 describe('transformKey', () => {

src/transform.js

@@ -630,10 +630,9 @@ function untransformObject(schema, className, mongoObject, isNestedObject = fals
     if (mongoObject === null) {
       return null;
     }
-
     if (mongoObject instanceof Array) {
-      return mongoObject.map((o) => {
-        return untransformObject(schema, className, o, true);
+      return mongoObject.map(arrayEntry => {
+        return untransformObject(schema, className, arrayEntry, true);
       });
     }
 
@@ -647,31 +646,84 @@ function untransformObject(schema, className, mongoObject, isNestedObject = fals
 
     var restObject = untransformACL(mongoObject);
     for (var key in mongoObject) {
+      // TODO: This could use some cleanup. Default case handling still needs to happen for some nested keys.
       switch(key) {
       case '_id':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
         restObject['objectId'] = '' + mongoObject[key];
         break;
       case '_hashed_password':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
         restObject['password'] = mongoObject[key];
         break;
       case '_acl':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
       case '_email_verify_token':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
       case '_perishable_token':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
       case '_tombstone':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
         break;
       case '_session_token':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
         restObject['sessionToken'] = mongoObject[key];
         break;
       case 'updatedAt':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
       case '_updated_at':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
         restObject['updatedAt'] = Parse._encode(new Date(mongoObject[key])).iso;
         break;
       case 'createdAt':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
       case '_created_at':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
         restObject['createdAt'] = Parse._encode(new Date(mongoObject[key])).iso;
         break;
       case 'expiresAt':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
       case '_expiresAt':
+        if (isNestedObject) {
+          restObject[key] = untransformObject(schema, className, mongoObject[key], true);
+          break;
+        }
         restObject['expiresAt'] = Parse._encode(new Date(mongoObject[key]));
         break;
       default:
@@ -728,8 +780,7 @@ function untransformObject(schema, className, mongoObject, isNestedObject = fals
             break;
           }
         }
-        restObject[key] = untransformObject(schema, className,
-                                            mongoObject[key], true);
+        restObject[key] = untransformObject(schema, className, mongoObject[key], true);
       }
     }