ant04444
diff --git a/‎lib/core.js
Lines changed: 5 additions & 4 deletions b/‎lib/core.js
Lines changed: 5 additions & 4 deletions
diff --git a/‎lib/leetcode_client.js
Lines changed: 6 additions & 3 deletions b/‎lib/leetcode_client.js
Lines changed: 6 additions & 3 deletions
diff --git a/‎test/test_core.js
Lines changed: 5 additions & 5 deletions b/‎test/test_core.js
Lines changed: 5 additions & 5 deletions
diff --git a/‎test/test_leetcode_client.js
Lines changed: 9 additions & 9 deletions b/‎test/test_leetcode_client.js
Lines changed: 9 additions & 9 deletions
@@ -34,9 +34,11 @@ core.getProblems = function(cb) {
     return cb(null, problems);
   }
 
-  client.getProblems(function(e, problems) {
+  var user = this.getUser();
+  client.getProblems(user, function(e, problems) {
     if (e) return cb(e);
 
+    saveUser(user);
     cache.set('all', problems);
     return cb(null, problems);
   });
@@ -63,7 +65,7 @@ core.getProblem = function(keyword, cb) {
       return cb(null, problem);
     }
 
-    client.getProblem(problem, function(e, problem) {
+    client.getProblem(core.getUser(), problem, function(e, problem) {
       if (e) return cb(e);
 
       saveProblem(problem);
@@ -111,8 +113,7 @@ core.starProblem = function(problem, starred, cb) {
     return cb(null, starred);
   }
 
-  var user = core.getUser();
-  client.starProblem(user, problem, starred, cb);
+  client.starProblem(this.getUser(), problem, starred, cb);
 };
 
 core.exportProblem = function(problem, f, codeOnly) {
 
@@ -101,7 +101,7 @@ function requestWithReLogin(opts, cb) {
 
 var leetcodeClient = {};
 
-leetcodeClient.getProblems = function(cb) {
+leetcodeClient.getProblems = function(user, cb) {
   var opts = makeOpts(config.URL_PROBLEMS);
 
   requestWithReLogin(opts, function(e, resp, body) {
@@ -115,6 +115,7 @@ leetcodeClient.getProblems = function(cb) {
       log.debug('no user info in list response, maybe session expired...');
       throw EXPIRED_ERROR;
     }
+    user.paid = json.is_paid;
 
     var problems = json.stat_status_pairs
         .filter(function(p) {
@@ -145,7 +146,7 @@ var aceCtrl = {
   }
 };
 
-leetcodeClient.getProblem = function(problem, cb) {
+leetcodeClient.getProblem = function(user, problem, cb) {
   var opts = makeOpts();
   opts.url = problem
6D4E
.link;
   requestWithReLogin(opts, function(e, resp, body) {
@@ -163,9 +164,11 @@ leetcodeClient.getProblem = function(problem, cb) {
     var pageData;
     var r = /(var pageData[^;]+;)/m;
     var result = body.match(r);
-    if (!result)
+    if (!result) {
+      if (problem.locked && user.paid) throw EXPIRED_ERROR;
       return cb('failed to load' + (problem.locked ? ' locked ' : ' ') +
                 'problem!');
+    }
 
     eval(result[1]);
     problem.templates = pageData.codeDefinition;
 
@@ -133,7 +133,7 @@ describe('core', function() {
       it('should getProblems w/o cache ok', function(done) {
         cache.del('all');
 
-        client.getProblems = function(cb) {
+        client.getProblems = function(user, cb) {
           return cb(null, PROBLEMS);
         };
 
@@ -147,7 +147,7 @@ describe('core', function() {
       it('should getProblems w/o cache fail if client error', function(done) {
         cache.del('all');
 
-        client.getProblems = function(cb) {
+        client.getProblems = function(user, cb) {
           return cb('client getProblems error');
         };
 
@@ -196,7 +196,7 @@ describe('core', function() {
         cache.set('all', PROBLEMS);
         cache.del('key0');
 
-        client.getProblem = function(problem, cb) {
+        client.getProblem = function(user, problem, cb) {
           return cb(null, problem);
         };
 
@@ -220,7 +220,7 @@ describe('core', function() {
         cache.set('all', PROBLEMS);
         cache.del('key0');
 
-        client.getProblem = function(problem, cb) {
+        client.getProblem = function(user, problem, cb) {
           return cb('client getProblem error');
         };
 
@@ -232,7 +232,7 @@ describe('core', function() {
 
       it('should getProblem fail if getProblems error', function(done) {
         cache.del('all');
-        client.getProblems = function(cb) {
+        client.getProblems = function(user, cb) {
           return cb('getProblems error');
         };
 
 
@@ -49,7 +49,7 @@ describe('leetcode_client', function() {
       nock(config.URL_PROBLEMS).get('/').reply(403);
       nock(config.URL_PROBLEMS).get('/').replyWithFile(200, './test/mock/problems.json.20160911');
 
-      client.getProblems(function(e, problems) {
+      client.getProblems(USER, function(e, problems) {
         assert.equal(e, null);
         assert.equal(problems.length, 377);
         done();
@@ -60,7 +60,7 @@ describe('leetcode_client', function() {
       config.AUTO_LOGIN = false;
       nock(config.URL_PROBLEMS).get('/').reply(403);
 
-      client.getProblems(function(e, problems) {
+      client.getProblems(USER, function(e, problems) {
         assert.deepEqual(e, EXPIRED_ERROR);
         done();
       });
@@ -70,7 +70,7 @@ describe('leetcode_client', function() {
       config.AUTO_LOGIN = true;
       nock(config.URL_PROBLEMS).get('/').reply(503);
 
-      client.getProblems(function(e, problems) {
+      client.getProblems(USER, function(e, problems) {
         var expected = {
           msg:        'http error',
           statusCode: 503
@@ -88,7 +88,7 @@ describe('leetcode_client', function() {
         return cb('unknown error!');
       };
 
-      client.getProblems(function(e, problems) {
+      client.getProblems(USER, function(e, problems) {
         assert.deepEqual(e, EXPIRED_ERROR);
         done();
       });
@@ -99,7 +99,7 @@ describe('leetcode_client', function() {
     it('should ok', function(done) {
       nock(config.URL_PROBLEMS).get('/').replyWithFile(200, './test/mock/problems.json.20160911');
 
-      client.getProblems(function(e, problems) {
+      client.getProblems(USER, function(e, problems) {
         assert.equal(e, null);
         assert.equal(problems.length, 377);
         done();
@@ -110,7 +110,7 @@ describe('leetcode_client', function() {
       config.AUTO_LOGIN = false;
       nock(config.URL_PROBLEMS).get('/').replyWithFile(200, './test/mock/problems.nologin.json.20161015');
 
-      client.getProblems(function(e, problems) {
+      client.getProblems(USER, function(e, problems) {
         assert.deepEqual(e, EXPIRED_ERROR);
         done();
       });
@@ -123,7 +123,7 @@ describe('leetcode_client', function() {
         .get('/problems/find-the-difference')
         .replyWithFile(200, './test/mock/find-the-difference.html.20170424');
 
-      client.getProblem(PROBLEM, function(e, problem) {
+< BB42 /span>
client.getProblem(USER, PROBLEM, function(e, problem) {      client.getProblem(USER, PROBLEM, function(e, problem) {
         assert.equal(e, null);
         assert.equal(problem.totalAC, 63380);
         assert.equal(problem.totalSubmit, 123178);
@@ -244,7 +244,7 @@ describe('leetcode_client', function() {
         .get('/problems/find-the-difference')
         .replyWithFile(200, './test/mock/locked.html.20161015');
 
-      client.getProblem(PROBLEM, function(e, problem) {
+      client.getProblem(USER, PROBLEM, function(e, problem) {
         assert.equal(e, 'failed to load locked problem!');
         done();
       });
@@ -255,7 +255,7 @@ describe('leetcode_client', function() {
         .get('/problems/find-the-difference')
         .replyWithError('unknown error!');
 
-      client.getProblem(PROBLEM, function(e, problem) {
+      client.getProblem(USER, PROBLEM, function(e, problem) {
         assert.equal(e.message, 'unknown error!');
         done();
       });