more elegant

Author: flovilmart

spec/ParseUser.spec.js

@@ -1178,17 +1178,19 @@ describe('Parse.User testing', () => {
       return user._linkWith('facebook', {});
     }).then(user => {
       expect(user._isLinked("facebook")).toBeTruthy();
-      return Parse.User._logInWith('facebook', {});
+      // We should logout here as session token is passed
+      // Probably need a fix in the JS SDK to handle those
+      // linking errors
+      return Parse.User.logOut().then(() => {
+        return Parse.User._logInWith('facebook', {});
+      });
     }).then(user => {
       const fileAgain = user.get('file');
       expect(fileAgain.name()).toMatch(/yolo.txt$/);
       expect(fileAgain.url()).toMatch(/yolo.txt$/);
     }).then(() => {
       done();
-    }, error => {
-      jfail(error);
-      done();
-    });
+    }).catch(done.fail);
   });
 
   it("log in with provider twice", (done) => {

src/RestWrite.js

@@ -297,13 +297,7 @@ RestWrite.prototype.handleAuthData = function(authData) {
         }
       });
       const hasMutatedAuthData = Object.keys(mutatedAuthData).length !== 0;
-      let userId;
-      if (this.query && this.query.objectId) {
-        userId = this.query.objectId;
-      } else if (this.auth && this.auth.user && this.auth.user.id) {
-        userId = this.auth.user.id;
-      }
-      if (!userId) { // no user making the call
+      if (!this.query) {
         // Login with auth data
         delete results[0].password;
 
@@ -334,10 +328,10 @@ RestWrite.prototype.handleAuthData = function(authData) {
           // Just update the authData part
           return this.config.database.update(this.className, {objectId: this.data.objectId}, {authData: mutatedAuthData}, {});
         });
-      } else if (userId) {
+      } else if (this.query && this.query.objectId) {
         // Trying to update auth data but users
         // are different
-        if (userResult.objectId !== userId) {
+        if (userResult.objectId !== this.query.objectId) {
           throw new Parse.Error(Parse.Error.ACCOUNT_ALREADY_LINKED,
             'this auth is already used');
         }

src/Routers/UsersRouter.js

@@ -26,6 +26,12 @@ export class UsersRouter extends ClassesRouter {
     const data = deepcopy(req.body);
     req.body = data;
     req.params.className = '_User';
+    if (req.auth.user) {
+      // this is authenticated
+      // treat it as an update
+      req.params.objectId = req.auth.user.id;
+      return super.handleUpdate(req);
+    }
 
     return super.handleCreate(req);
   }