Skip to content

Change: dependency from prompt-sync to prompt for extention side to solve two-factor problem #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jan 12, 2020
Merged

Change: dependency from prompt-sync to prompt for extention side to solve two-factor problem #38

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5ef6c1b
solve GitHub login two-factor auth problem and add new node package p…
yihong0618 Dec 24, 2019
f7a6b53
delete unused function and fix typo
yihong0618 Dec 24, 2019
53b3446
format the code by review
yihong0618 Dec 25, 2019
294dbe2
Merge branch 'master' into master
yihong0618 Dec 27, 2019
94ac8a4
support GitHub and LinkedIn login for leetcode-cn.com
yihong0618 Dec 27, 2019
3122ac7
lint
yihong0618 Dec 27, 2019
e3680fe
format naming by review and refactor the parse cookie function(includ…
yihong0618 Dec 30, 2019
1cdf7f8
delete unused config and make the github login function more clear by…
yihong0618 Dec 30, 2019
8c1159e
Merge branch 'master' into master
jdneo Dec 30, 2019
8fab318
fix: dependency bug
yihong0618 Jan 6, 2020
9a694e0
change model from prompt-sync to prompt fortwo-factor
yihong0618 Jan 8, 2020
e945d8a
Merge branch 'master' into master
yihong0618 Jan 8, 2020
9378370
delete prompt-sync from dev dependencies
yihong0618 Jan 8, 2020
70d678e
Merge branch 'master' into master
jdneo Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
delete unused function and fix typo
  • Loading branch information
@yihong0618
yihong0618 committed Dec 24, 2019
commit f7a6b53d6042c918f2f5b265125af68247dbdb06
17 changes: 5 additions & 12 deletions lib/plugins/leetcode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,18 +552,11 @@ function parseCookie(cookie, cb) {
};
}

function saveAndGetUser(user, cb, cookieData) {
user.sessionId = cookieData.sessionId;
user.sessionCSRF = cookieData.sessionCSRF;
session.saveUser(user);
plugin.getUser(user, cb);
}

function requestLeetcodeAndSave(request, leetcodeUrl, user, cb) {
function requestLeetcodeAndSave(request, leetcodeUrl, user, cb, party) {
request.get({url: leetcodeUrl}, function(e, resp, body) {
const redirectUri = resp.request.uri.href;
if (redirectUri !== 'https://leetcode.com/') {
return cb('LinkedIn login failed or LinkedIn did not link to LeetCode');
return cb(`${party} login failed or ${party} did not link to LeetCode`);
}
const cookieData = parseCookie(resp.request.headers.cookie, cb);
user.sessionId = cookieData.sessionId;
Expand Down Expand Up @@ -633,10 +626,10 @@ plugin.githubLogin = function(user, cb) {
if (resp.request.uri.href === 'https://github.com/sessions/two-factor') {
return cb('Wrong two-factor code please check');
}
requestLeetcodeAndSave(_request, leetcodeUrl, user, cb);
requestLeetcodeAndSave(_request, leetcodeUrl, user, cb, 'GitHub');
});
} else {
requestLeetcodeAndSave(_request, leetcodeUrl, user, cb);
requestLeetcodeAndSave(_request, leetcodeUrl, user, cb, 'GitHub');
}
});
});
Expand Down Expand Up @@ -676,7 +669,7 @@ plugin.linkedinLogin = function(user, cb) {
if (resp.statusCode !== 200) {
return cb('LinkedIn login failed');
}
requestLeetcodeAndSave(_request, leetcodeUrl, user, cb);
requestLeetcodeAndSave(_request, leetcodeUrl, user, cb, 'LinkedIn');
});
});
};
Expand Down