Refactor a bit of auto login.

Signed-off-by: Eric Wang <skygragon@gmail.com>

Author: skygragon

lib/leetcode_client.js

@@ -15,8 +15,12 @@ function signOpts(opts, user) {
   opts.headers['X-Requested-With'] = 'XMLHttpRequest';
 }
 
-function makeOpts(url) {
-  var opts = {url: url, headers: {}, _expectedStatus: 200};
+function makeOpts(url, expectedStatus) {
+  var opts = {};
+  opts.url = url;
+  opts.headers = {};
+  opts.expectedStatus = expectedStatus || 200;
+
   var core = require('./core');
   if (core.isLogin()) signOpts(opts, core.getUser());
   return opts;
@@ -25,49 +29,45 @@ function makeOpts(url) {
 function checkError(e, resp, expectedStatus, msg) {
   if (e) return e;
 
-  if (resp && resp.statusCode !== expectedStatus) {
-    if (resp.statusCode === 403) {
+  var code = resp.statusCode;
+  if (resp && code !== expectedStatus) {
+    if (code === 403) {
       msg = msg || 'session expired, please login again';
-
       var core = require('./core');
       core.logout();
     }
-
-    return {
-      msg:        msg || 'http error',
-      statusCode: resp.statusCode
-    };
+    e = {msg: msg || 'http error', statusCode: code};
   }
+  return e;
 }
 
 // leetcode.com is limiting one session alive in the same time,
 // which means once you login on web, your cli session will get
 // expired immediately. In that case we will try to re-login in
 // the backend to give a seamless user experience.
 function requestWithReLogin(opts, cb) {
-  if (!config.AUTO_LOGIN)
-    return request(opts, cb);
-
-  var core = require('./core');
-  var user = core.getUser();
-
   request(opts, function(e, resp, body) {
-    e = checkError(e, resp, opts._expectedStatus);
+    e = checkError(e, resp, opts.expectedStatus);
 
     // not 403: transparently pass down
-    if (!e || e.statusCode !== 403)
+    if (!config.AUTO_LOGIN || !e || e.statusCode !== 403)
       return cb(e, resp, body);
 
     // if 403: try re-login
     log.debug('session expired, auto re-login...');
 
+    var core = require('./core');
+    var user = core.getUser();
     core.login(user, function(e2, user) {
       if (e2) return cb(e, resp, body);
 
       log.debug('login successfully, cont\'d...');
       signOpts(opts, user);
 
-      request(opts, cb);
+      request(opts, function(e, resp, body) {
+        e = checkError(e, resp, opts.expectedStatus);
+        return cb(e, resp, body);
+      });
     });
   });
 }
@@ -78,7 +78,6 @@ leetcodeClient.getProblems = function(cb) {
   var opts = makeOpts(config.URL_PROBLEMS);
 
   requestWithReLogin(opts, function(e, resp, body) {
-    e = checkError(e, resp, 200);
     if (e) return cb(e);
 
     var json = JSON.parse(body);
@@ -120,8 +119,7 @@ var aceCtrl = {
 leetcodeClient.getProblem = function(problem, cb) {
   var opts = makeOpts();
   opts.url = problem.link;
-  request(opts, function(e, resp, body) {
-    e = checkError(e, resp, 200);
+  requestWithReLogin(opts, function(e, resp, body) {
     // FIXME: if session expired, this will still return 200
     if (e) return cb(e);
 
@@ -154,8 +152,7 @@ leetcodeClient.getSubmissions = function(problem, cb) {
   opts.url = config.URL_SUBMISSIONS.replace('$key', problem.key);
   opts.headers.Referer = config.URL_PROBLEM.replace('$id', problem.key);
 
-  request(opts, function(e, resp, body) {
-    e = checkError(e, resp, 200);
+  requestWithReLogin(opts, function(e, resp, body) {
     // FIXME: if session expired, this will still return 200
     if (e) return cb(e);
 
@@ -173,8 +170,7 @@ leetcodeClient.getSubmission = function(submission, cb) {
   var opts = makeOpts();
   opts.url = config.URL_SUBMISSION.replace('$id', submission.id);
 
-  request(opts, function(e, resp, body) {
-    e = checkError(e, resp, 200);
+  requestWithReLogin(opts, function(e, resp, body) {
     if (e) return cb(e);
 
     var re = body.match(/submissionCode:\s('[^']*')/);
@@ -227,7 +223,6 @@ function verifyResult(opts, jobs, results, cb) {
   opts.url = config.URL_VERIFY.replace('$id', jobs[0].id);
 
   requestWithReLogin(opts, function(e, resp, body) {
-    e = checkError(e, resp, 200);
     if (e) return cb(e);
 
     var result = JSON.parse(body);
@@ -257,7 +252,6 @@ function runCode(opts, problem, cb) {
   });
 
   requestWithReLogin(opts, function(e, resp, body) {
-    e = checkError(e, resp, 200);
     if (e) return cb(e);
 
     if (body.error) {
@@ -320,7 +314,6 @@ leetcodeClient.starProblem = function(problem, starred, cb) {
   opts.body = {'qid': problem.id};
 
   requestWithReLogin(opts, function(e, resp, body) {
-    e = checkError(e, resp, 200);
     if (e) return cb(e);
 
     cb(null, body.is_favor);