Refactor login logic.

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

Diff for: lib/plugins/cache.js

@@ -71,19 +71,7 @@ plugin.login = function(user, cb) {
   plugin.next.login(user, function(e, user) {
     if (e) return cb(e);
     session.saveUser(user);
-
-    plugin.next.getFavorites(function(e, favorites) {
-      if (e) return cb(e);
-
-      // TODO: pick other useful values from favorites
-      var favorite = _.find(favorites.favorites.private_favorites, function(f) {
-        return f.name === 'Favorite';
-      });
-      user.hash = favorite.id_hash;
-
-      session.saveUser(user);
-      return cb(null, user);
-    });
+    return cb(null, user);
   });
 };
 

Diff for: lib/plugins/leetcode.js

@@ -360,8 +360,19 @@ plugin.login = function(user, cb) {
       user.sessionId = h.getSetCookieValue(resp, 'LEETCODE_SESSION');
       user.name = h.getSetCookieValue(resp, 'messages')
                    .match('Successfully signed in as ([^.]*)')[1];
+      session.saveUser(user);
 
-      return cb(null, user);
+      plugin.getFavorites(function(e, favorites) {
+        if (e) return cb(e);
+
+        // TODO: pick other useful values from favorites
+        var favorite = _.find(favorites.favorites.private_favorites, function(f) {
+          return f.name === 'Favorite';
+        });
+        user.hash = favorite.id_hash;
+
+        return cb(null, user);
+      });
     });
   });
 };

Diff for: test/plugins/test_cache.js

@@ -21,11 +21,6 @@ describe('plugin:cache', function() {
     {id: 1, name: 'name1', slug: 'slug1', starred: true, category: 'algorithms'}
   ];
   var PROBLEM = {id: 0, slug: 'slug0', category: 'algorithms'};
-  var FAVORITES = {
-    favorites: {
-      private_favorites: [{id_hash: 'abcdef', name: 'Favorite'}]
-    }
-  };
 
   var NEXT = {};
 
@@ -179,8 +174,7 @@ describe('plugin:cache', function() {
 
   describe('#user', function() {
     var USER = {name: 'test-user', pass: 'password'};
-    var USER_AFTER = {name: 'test-user', pass: 'password', hash: 'abcdef'};
-    var USER_AFTER_SAFE = {name: 'test-user', hash: 'abcdef'};
+    var USER_SAFE = {name: 'test-user'};
 
     it('should login ok', function(done) {
       config.AUTO_LOGIN = true;
@@ -192,16 +186,13 @@ describe('plugin:cache', function() {
       NEXT.login = function(user, cb) {
         return cb(null, user);
       };
-      NEXT.getFavorites = function(cb) {
-        return cb(null, FAVORITES);
-      };
 
       plugin.login(USER, function(e, user) {
         assert.equal(e, null);
-        assert.deepEqual(user, USER_AFTER);
+        assert.deepEqual(user, USER);
 
         // after login
-        assert.deepEqual(session.getUser(), USER_AFTER);
+        assert.deepEqual(session.getUser(), USER);
         assert.equal(session.isLogin(), true);
         done();
       });
@@ -217,8 +208,8 @@ describe('plugin:cache', function() {
 
       plugin.login(USER, function(e, user) {
         assert.equal(e, null);
-        assert.deepEqual(user, USER_AFTER);
-        assert.deepEqual(session.getUser(), USER_AFTER_SAFE);
+        assert.deepEqual(user, USER);
+        assert.deepEqual(session.getUser(), USER_SAFE);
         assert.equal(session.isLogin(), true);
         done();
       });

Diff for: test/plugins/test_leetcode.js

@@ -57,13 +57,18 @@ describe('plugin:leetcode', function() {
             "messages='Successfully signed in as Eric.'; Max-Age=31449600; Path=/; secure"
           ]});
 
+      nock('https://leetcode.com')
+        .get('/list/api/questions')
+        .reply(200, JSON.stringify({favorites: {private_favorites: [{id_hash: 'abcdef', name: 'Favorite'}]}}));
+
       plugin.login({}, function(e, user) {
         assert.equal(e, null);
 
         assert.equal(user.loginCSRF, 'LOGIN_CSRF_TOKEN');
         assert.equal(user.sessionCSRF, 'SESSION_CSRF_TOKEN');
         assert.equal(user.sessionId, 'SESSION_ID');
         assert.equal(user.name, 'Eric');
+        assert.equal(user.hash, 'abcdef');
         done();
       });
     });