Skip to content

Commit 6d1bb53

Browse files
skygragonskygragon
committed
refs #18: report session expired if paid user can't get locked problem.
Signed-off-by: Eric Wang <skygragon@gmail.com>
1 parent 03c9f04 commit 6d1bb53

File tree

4 files changed

+25
-21
lines changed

4 files changed

+25
-21
lines changed

‎lib/core.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ core.getProblems = function(cb) {
3434
return cb(null, problems);
3535
}
3636

37-
client.getProblems(function(e, problems) {
37+
var user = this.getUser();
38+
client.getProblems(user, function(e, problems) {
3839
if (e) return cb(e);
3940

41+
saveUser(user);
4042
cache.set('all', problems);
4143
return cb(null, problems);
4244
});
@@ -63,7 +65,7 @@ core.getProblem = function(keyword, cb) {
6365
return cb(null, problem);
6466
}
6567

66-
client.getProblem(problem, function(e, problem) {
68+
client.getProblem(core.getUser(), problem, function(e, problem) {
6769
if (e) return cb(e);
6870

6971
saveProblem(problem);
@@ -111,8 +113,7 @@ core.starProblem = function(problem, starred, cb) {
111113
return cb(null, starred);
112114
}
113115

114-
var user = core.getUser();
115-
client.starProblem(user, problem, starred, cb);
116+
client.starProblem(this.getUser(), problem, starred, cb);
116117
};
117118

118119
core.exportProblem = function(problem, f, codeOnly) {

‎lib/leetcode_client.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function requestWithReLogin(opts, cb) {
101101

102102
var leetcodeClient = {};
103103

104-
leetcodeClient.getProblems = function(cb) {
104+
leetcodeClient.getProblems = function(user, cb) {
105105
var opts = makeOpts(config.URL_PROBLEMS);
106106

107107
requestWithReLogin(opts, function(e, resp, body) {
@@ -115,6 +115,7 @@ leetcodeClient.getProblems = function(cb) {
115115
log.debug('no user info in list response, maybe session expired...');
116116
throw EXPIRED_ERROR;
117117
}
118+
user.paid = json.is_paid;
118119

119120
var problems = json.stat_status_pairs
120121
.filter(function(p) {
@@ -145,7 +146,7 @@ var aceCtrl = {
145146
}
146147
};
147148

148-
leetcodeClient.getProblem = function(problem, cb) {
149+
leetcodeClient.getProblem = function(user, problem, cb) {
149150
var opts = makeOpts();
150151
opts.url = problem.link;
151152
requestWithReLogin(opts, function(e, resp, body) {
@@ -163,9 +164,11 @@ leetcodeClient.getProblem = function(problem, cb) {
163164
var pageData;
164165
var r = /(var pageData[^;]+;)/m;
165166
var result = body.match(r);
166-
if (!result)
167+
if (!result) {
168+
if (problem.locked && user.paid) throw EXPIRED_ERROR;
167169
return cb('failed to load' + (problem.locked ? ' locked ' : ' ') +
168170
'problem!');
171+
}
169172

170173
eval(result[1]);
171174
problem.templates = pageData.codeDefinition;

‎test/test_core.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ describe('core', function() {
133133
it('should getProblems w/o cache ok', function(done) {
134134
cache.del('all');
135135

136-
client.getProblems = function(cb) {
136+
client.getProblems = function(user, cb) {
137137
return cb(null, PROBLEMS);
138138
};
139139

@@ -147,7 +147,7 @@ describe('core', function() {
147147
it('should getProblems w/o cache fail if client error', function(done) {
148148
cache.del('all');
149149

150-
client.getProblems = function(cb) {
150+
client.getProblems = function(user, cb) {
151151
return cb('client getProblems error');
152152
};
153153

@@ -196,7 +196,7 @@ describe('core', function() {
196196
cache.set('all', PROBLEMS);
197197
cache.del('key0');
198198

199-
client.getProblem = function(problem, cb) {
199+
client.getProblem = function(user, problem, cb) {
200200
return cb(null, problem);
201201
};
202202

@@ -220,7 +220,7 @@ describe('core', function() {
220220
cache.set('all', PROBLEMS);
221221
cache.del('key0');
222222

223-
client.getProblem = function(problem, cb) {
223+
client.getProblem = function(user, problem, cb) {
224224
return cb('client getProblem error');
225225
};
226226

@@ -232,7 +232,7 @@ describe('core', function() {
232232

233233
it('should getProblem fail if getProblems error', function(done) {
234234
cache.del('all');
235-
client.getProblems = function(cb) {
235+
client.getProblems = function(user, cb) {
236236
return cb('getProblems error');
237237
};
238238

‎test/test_leetcode_client.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe('leetcode_client', function() {
4949
nock(config.URL_PROBLEMS).get('/').reply(403);
5050
nock(config.URL_PROBLEMS).get('/').replyWithFile(200, './test/mock/problems.json.20160911');
5151

52-
client.getProblems(function(e, problems) {
52+
client.getProblems(USER, function(e, problems) {
5353
assert.equal(e, null);
5454
assert.equal(problems.length, 377);
5555
done();
@@ -60,7 +60,7 @@ describe('leetcode_client', function() {
6060
config.AUTO_LOGIN = false;
6161
nock(config.URL_PROBLEMS).get('/').reply(403);
6262

63-
client.getProblems(function(e, problems) {
63+
client.getProblems(USER, function(e, problems) {
6464
assert.deepEqual(e, EXPIRED_ERROR);
6565
done();
6666
});
@@ -70,7 +70,7 @@ describe('leetcode_client', function() {
7070
config.AUTO_LOGIN = true;
7171
nock(config.URL_PROBLEMS).get('/').reply(503);
7272

73-
client.getProblems(function(e, problems) {
73+
client.getProblems(USER, function(e, problems) {
7474
var expected = {
7575
msg: 'http error',
7676
statusCode: 503
@@ -88,7 +88,7 @@ describe('leetcode_client', function() {
8888
return cb('unknown error!');
8989
};
9090

91-
client.getProblems(function(e, problems) {
91+
client.getProblems(USER, function(e, problems) {
9292
assert.deepEqual(e, EXPIRED_ERROR);
9393
done();
9494
});
@@ -99,7 +99,7 @@ describe('leetcode_client', function() {
9999
it('should ok', function(done) {
100100
nock(config.URL_PROBLEMS).get('/').replyWithFile(200, './test/mock/problems.json.20160911');
101101

102-
client.getProblems(function(e, problems) {
102+
client.getProblems(USER, function(e, problems) {
103103
assert.equal(e, null);
104104
assert.equal(problems.length, 377);
105105
done();
@@ -110,7 +110,7 @@ describe('leetcode_client', function() {
110110
config.AUTO_LOGIN = false;
111111
nock(config.URL_PROBLEMS).get('/').replyWithFile(200, './test/mock/problems.nologin.json.20161015');
112112

113-
client.getProblems(function(e, problems) {
113+
client.getProblems(USER, function(e, problems) {
114114
assert.deepEqual(e, EXPIRED_ERROR);
115115
done();
116116
});
@@ -123,7 +123,7 @@ describe('leetcode_client', function() {
123123
.get('/problems/find-the-difference')
124124
.replyWithFile(200, './test/mock/find-the-difference.html.20170424');
125125

126-
client.getProblem(PROBLEM, function(e, problem) {
126+
client.getProblem(USER, PROBLEM, function(e, problem) {
127127
assert.equal(e, null);
128128
assert.equal(problem.totalAC, 63380);
129129
assert.equal(problem.totalSubmit, 123178);
@@ -244,7 +244,7 @@ describe('leetcode_client', function() {
244244
.get('/problems/find-the-difference')
245245
.replyWithFile(200, './test/mock/locked.html.20161015');
246246

247-
client.getProblem(PROBLEM, function(e, problem) {
247+
client.getProblem(USER, PROBLEM, function(e, problem) {
248248
assert.equal(e, 'failed to load locked problem!');
249249
done();
250250
});
@@ -255,7 +255,7 @@ describe('leetcode_client', function() {
255255
.get('/problems/find-the-difference')
256256
.replyWithError('unknown error!');
257257

258-
client.getProblem(PROBLEM, function(e, problem) {
258+
client.getProblem(USER, PROBLEM, function(e, problem) {
259259
assert.equal(e.message, 'unknown error!');
260260
done();
261261
});

0 commit comments

Comments
 (0)