Fixes auto login bugs.

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

Author: skygragon

lib/cli.js

@@ -25,7 +25,7 @@ function setLogLevel() {
   log.setLevel(level);
 
   log.fail = function(e) {
-    log.error(chalk.red('ERROR: ' + (e.msg || e)));
+    log.error(chalk.red('ERROR: ' + (e.msg || e) + ' [' + (e.statusCode || 0) + ']'));
   };
 }
 

lib/core.js

@@ -145,13 +145,13 @@ core.exportProblem = function(problem, f, codeOnly) {
 };
 
 core.login = function(user, cb) {
-  var self = this;
+  this.logout();
   client.login(user, function(e, user) {
     if (e) return cb(e);
 
+    saveUser(user);
     client.getFavorites(function(e, favorites) {
       if (e) return cb(e);
-      self.logout();
 
       // TODO: pick other useful values from favorites
       var favorite = _.find(favorites.favorites.private_favorites, function(f) {

lib/leetcode_client.js

@@ -7,6 +7,8 @@ var request = require('request');
 var config = require('./config');
 var h = require('./helper');
 
+// request.debug = true;
+
 // update options with user credentials
 function signOpts(opts, user) {
   opts.headers.Cookie = 'LEETCODE_SESSION=' + user.sessionId +
@@ -31,10 +33,8 @@ function checkError(e, resp, expectedStatus, msg) {
 
   var code = resp.statusCode;
   if (resp && code !== expectedStatus) {
-    if (code === 403) {
+    if (code === 403 || code === 401) {
       msg = msg || 'session expired, please login again';
-      var core = require('./core');
-      core.logout();
     }
     e = {msg: msg || 'http error', statusCode: code};
   }
@@ -49,11 +49,10 @@ function requestWithReLogin(opts, cb) {
   var req = request(opts, function(e, resp, body) {
     e = checkError(e, resp, opts.expectedStatus);
 
-    // not 403: transparently pass down
-    if (!config.AUTO_LOGIN || !e || e.statusCode !== 403)
-      return cb(e, resp, body, req);
+    // not session expired: transparently pass down
+    if (!config.AUTO_LOGIN || !e) return cb(e, resp, body, req);
+    if (e.statusCode !== 403 && e.statusCode !== 401) return cb(e, resp, body, req);
 
-    // if 403: try re-login
     log.debug('session expired, auto re-login...');
 
     var core = require('./core');