MLIBZ-2503: User.me() does not delete newly-empty fields on the SDK (#…

…299)

* MLIBZ-2503: Do not merge data returned from /_me endpoint

* Throw an error if the active user does not have a valid authtoken

* MLIBZ-2503: Update releated unit tests

src/core/request/network.js

@@ -137,6 +137,12 @@ const Auth = {
       );
     }
 
+    if (!isDefined(activeUser._kmd) || !isDefined(activeUser._kmd.authtoken)) {
+      return Promise.reject(
+        new NoActiveUserError('The active user does not have a valid auth token.')
+      );
+    }
+
     return Promise.resolve({
       scheme: 'Kinvey',
       credentials: activeUser._kmd.authtoken

src/core/user/user.js

@@ -591,9 +591,6 @@ export class User {
     return request.execute()
       .then(response => response.data)
       .then((data) => {
-        // Merge returned data
-        data = assign(this.data, data);
-
         // Remove sensitive data
         delete data.password;
 

src/core/user/user.spec.js

@@ -1,4 +1,5 @@
 import expect from 'expect';
+import chai from 'chai';
 import nock from 'nock';
 import assign from 'lodash/assign';
 import localStorage from 'local-storage';
@@ -16,6 +17,8 @@ import { init } from '../kinvey';
 import { getLiveService } from '../live';
 import { UserMock } from './user-mock';
 
+chai.use(require('chai-as-promised'));
+
 const rpcNamespace = process.env.KINVEY_RPC_NAMESPACE || 'rpc';
 
 describe('User', () => {
@@ -742,7 +745,7 @@ describe('User', () => {
 
   describe('me()', () => {
     it('should refresh the users data', () => {
-      const user = new User({ _id: randomString() });
+      const user = new User({ _id: randomString(), name: randomString() });
       const reply = {
         _id: user._id,
         username: randomString()
@@ -756,6 +759,7 @@ describe('User', () => {
       return user.me()
         .then((user) => {
           expect(user.username).toEqual(reply.username);
+          expect(user.data.name).toEqual(undefined);
         });
     });
 
@@ -779,44 +783,6 @@ describe('User', () => {
         });
     });
 
-    it('should set authtoken if one was not provided and user is active user', () => {
-      const activeUser = User.getActiveUser();
-      const reply = {
-        _id: activeUser._id,
-        username: randomString()
-      };
-
-      // Kinvey API response
-      nock(activeUser.client.apiHostname, { encodedQueryParams: true })
-        .get(`${activeUser.pathname}/_me`)
-        .reply(200, reply);
-
-      return activeUser.me()
-        .then((user) => {
-          expect(user.username).toEqual(reply.username);
-          expect(user.authtoken).toEqual(activeUser.authtoken);
-        });
-    });
-
-    it('should not set authtoken if one was not provided and user is not active user', () => {
-      const user = new User({ _id: randomString() });
-      const reply = {
-        _id: user._id,
-        username: randomString()
-      };
-
-      // Kinvey API response
-      nock(user.client.apiHostname, { encodedQueryParams: true })
-        .get(`${user.pathname}/_me`)
-        .reply(200, reply);
-
-      return user.me()
-        .then((user) => {
-          expect(user.username).toEqual(reply.username);
-          expect(user.authtoken).toEqual(null);
-        });
-    });
-
     it('should update active user', () => {
       const user = User.getActiveUser();
       const reply = {
@@ -835,22 +801,9 @@ describe('User', () => {
         });
     });
 
-    it('should not update active user if not active user', () => {
-      const user = new User({ _id: randomString() });
-      const reply = {
-        _id: user._id,
-        username: randomString()
-      };
-
-      // Kinvey API response
-      nock(user.client.apiHostname, { encodedQueryParams: true })
-        .get(`${user.pathname}/_me`)
-        .reply(200, reply);
-
-      return user.me()
-        .then((user) => {
-          expect(user.data).toNotEqual(User.getActiveUser().data);
-        });
+    it('should fail for a user that is not active', () => {
+      const user = new User();
+      return chai.expect(user.me()).to.eventually.be.rejected;
     });
   });