add thrid party login -- GitHub and LinkedIn #496

yihong0618 · 2019-12-20T08:59:01Z

add thrid party login -- GitHub and LinkedIn.

jdneo · 2019-12-27T02:24:52Z

Thank you for your contribution. I have one idea about the login experience, please let me know your thoughts on this:

We still have only one entry(command) for the login, but when users trigger the command, a drop down list pops up, having the following options:

LeetCode Account
LeetCode Cookie
Third-Party: GitHub
Third-Party: LinkedIn

By doing this, the shortcut in the explorer would be applied to all kinds of login methods. And users won't need to remember different login commands. (Imagine that we might support more 3rd-party login in the future).

BTW, the CLI with the 3rd-party login has been released, you can update the CLI to 2.6.20 in this PR.

yihong0618 · 2019-12-27T02:43:50Z

@jdneo
You are right I also thinked of that, can I work on it this weekend and update the code?

jdneo · 2019-12-27T06:05:41Z

Sure, thank you!

yihong0618 · 2019-12-27T12:52:10Z

@jdneo vscode-leetcode 2.6.20 not found ~

jdneo · 2019-12-29T03:32:27Z

My bad! It should be available right now!

jdneo

Thank you! Just a few comments.

jdneo · 2019-12-29T03:33:19Z

README.md

@@ -56,6 +56,9 @@ Thanks for [@yihong0618](https://github.com/yihong0618) provided a workaround wh
  - **LeetCode: Sign in (by cookie)**
  - **LeetCode: Sign out**

+- You can also use the following command to sign in by third party:


Please only reserve the common login command as it was before.

jdneo · 2019-12-29T03:33:52Z

src/leetCodeManager.ts

+            {
+                label: "LeetCode Cookie",
+                description: "",
+                detail: "Use LeetCode cookie that copy from browser to login",


Use LeetCode cookie copied from browser to login

jdneo · 2019-12-29T03:34:08Z

src/leetCodeManager.ts

+            {
+                label: "Third-Party: GitHub",
+                description: "",
+                detail: "Use third party GitHub account to login",


Use GitHub account to login

jdneo · 2019-12-29T03:34:24Z

src/leetCodeManager.ts

+            {
+                label: "Third-Party: LinkedIn",
+                description: "",
+                detail: "Use third party LinkedIn account to login",


Use LinkedIn account to login

jdneo · 2019-12-29T03:38:01Z

src/leetCodeManager.ts

+        picks.push(
+            {
+                label: "LeetCode Account",
+                description: "",


No need to set the field description to empty string if you do not want to render it. Just remove it from the Object.

jdneo · 2019-12-29T03:41:13Z

src/leetCodeManager.ts

+        if (!commandArg) {
+            throw new Error(`The login method "${loginMethod}" is not supported.`);
+        }
+        const isByCookie: boolean = loginMethod === "Cookie";
        const inMessage: string = isByCookie ? "sign in by cookie" : "sign in";


Is this variable inMessage used anywhere?

Yes, it is for the difference of cookie login or other login message.
e.g.

promptForOpenOutputChannel(Failed to ${inMessage}. Please open the output channel for details

jdneo · 2019-12-29T03:42:21Z

src/shared.ts

@@ -12,6 +12,13 @@ export enum UserStatus {
    SignedOut = 2,
 }

+export const loginCommand: Map<string, string> = new Map([


loginCommand -> loginArgsMapping

yihong0618 · 2019-12-29T11:18:52Z

@jdneo
Thank you for your review, the naming problems had changed, and please note that it is not support for leetcode-cn.com for GitHub and LinkedIn login in leetcode-cli 2.6.20 and I raised a commit in this pr to support it.

jdneo · 2019-12-30T11:49:08Z

2.6.21 has been published to npm

yihong0618 · 2019-12-30T12:25:21Z

@jdneo

2.6.21 has been published to npm

Try again, two-factor seems can not support in our way in vscode-leetcode, because maybe the async to sync way in request is using read fs but in vscode terminal doesn't support. I will try to figure out another if i could. Thank you.

Can you just note users that we are not support two-factor in vscode-leetcode for now, if they want they can use cli to login first.
Thank you very much.

jdneo · 2019-12-31T03:58:00Z

Thanks @yihong0618, let me also take a look first.

yihong0618 · 2019-12-31T04:14:58Z

Thanks @yihong0618, let me also take a look first.

Thank you, that would be wonderful.

FYI
I am wrong that is zsh problem.

If I comment this line

                if (!pwd) {
                    childProc.kill();
                    return resolve(undefined);
                }
                childProc.stdin.write(`${pwd}\n`);
                // childProc.stdin.end();

vscode side can receive the "two-factor" message from cli side.
But I have problem with how to use the vscode.window.showInputBox with the ondata

jdneo · 2020-01-06T02:08:55Z

Sorry my laptop broke down last weekend and I have to send it to the store for repairment. I will try to resolve this PR in this week.

jdneo · 2020-01-06T10:54:12Z

@yihong0618

You can write something like this:

childProc.stdout.on("data", async (data: string | Buffer) => {
    data = data.toString();
    leetCodeChannel.append(data);
    if (data.includes("two-factor")) {
        const twoFactor: string | undefined = await vscode.window.showInputBox({
            prompt: "Enter two-factor code.",
            validateInput: (s: string): string | undefined => s && s.trim() ? undefined : "The input must not be empty",
        });
        if (!twoFactor) {
            childProc.kill();
            return resolve(undefined);
        }
        childProc.stdin.write(`${twoFactor}\n`);
    } else {
        const match: RegExpMatchArray | null = data.match(/(?:.*) Successfully (login|cookie login|third party login) as (.*)/i);
        if (match && match[2]) {
            return resolve(match[2]);
        }
    }
});

But I found that there is some problems in the CLI side.

prompt-sync is declared in the devDependencies, which means the module will be missing in the extension side
Why not using prompt but prompt-sync?

yihong0618 · 2020-01-06T11:05:24Z

@yihong0618

You can write something like this:

childProc.stdout.on("data", async (data: string | Buffer) => {
    data = data.toString();
    leetCodeChannel.append(data);
    if (data.includes("two-factor")) {
        const twoFactor: string | undefined = await vscode.window.showInputBox({
            prompt: "Enter two-factor code.",
            validateInput: (s: string): string | undefined => s && s.trim() ? undefined : "The input must not be empty",
        });
        if (!twoFactor) {
            childProc.kill();
            return resolve(undefined);
        }
        childProc.stdin.write(`${twoFactor}\n`);
    } else {
        const match: RegExpMatchArray | null = data.match(/(?:.*) Successfully (login|cookie login|third party login) as (.*)/i);
        if (match && match[2]) {
            return resolve(match[2]);
        }
    }
});

But I found that there is some problems in the CLI side.

prompt-sync is declared in the devDependencies, which means the module will be missing in the extension side
Why not using prompt but prompt-sync?

Because all request with session are in callback，and prompt must in the sync way. Otherwide it will fall through。
2. I will try tonight thank you
3. I also found that~ will also fix

yihong0618 · 2020-01-06T12:36:16Z

@jdneo
Sorry, maybe I missed somthing, it didn't work on my win10 with this way.

jdneo · 2020-01-08T12:36:28Z

@yihong0618, not quite get your point. Every async can should be able to change to sync from my understanding.

You can simply change it to:

if (resp.request.uri.href !== urls.github_tf_redirect) {
  return requestLeetcodeAndSave(_request, leetcodeUrl, user, cb);
}
prompt.colors = false;
prompt.message = '';
prompt.start();
prompt.get([
  {
    name:     'code',
    required: true
  }
], function(e, result) {
  if (e) return log.fail(e);
  const authenticityTokenTwoFactor = body.match(/name="authenticity_token" value="(.*?)"/);
  if (authenticityTokenTwoFactor === null) {
    return cb('Get GitHub two-factor token failed');
  }
  const optionsTwoFactor = {
    url:     urls.github_tf_session_request,
    method:  'POST',
    headers: {
      'Content-Type': 'application/x-www-form-urlencoded',
    },
    followAllRedirects: true,
    form:               {
      'otp':                result.code,
      'authenticity_token': authenticityTokenTwoFactor[1],
      'utf8':               encodeURIComponent('✓'),
    },
  };
  _request(optionsTwoFactor, function(e, resp, body) {
    if (resp.request.uri.href === urls.github_tf_session_request) {
      return cb('Invalid two-factor code please check');
    }
    requestLeetcodeAndSave(_request, leetcodeUrl, user, cb);
  });
});

The prompt-sync is too buggy. I'm not in favor of using that module.

By using the above code, then you can update the extension side, with following two callbacks change:

childProc.stdout.on("data", async (data: string | Buffer) => {
    data = data.toString();
    leetCodeChannel.append(data);
    if (data.includes("twoFactorCode")) {
        const twoFactor: string | undefined = await vscode.window.showInputBox({
            prompt: "Enter two-factor code.",
            validateInput: (s: string): string | undefined => s && s.trim() ? undefined : "The input must not be empty",
        });
        if (!twoFactor) {
            childProc.kill();
            return resolve(undefined);
        }
        childProc.stdin.write(`${twoFactor}\n`);
        childProc.stdin.end();
    } else {
        const match: RegExpMatchArray | null = data.match(/(?:.*)Successfully .*login as (.*)/i);
        if (match && match[1]) {
            childProc.stdin.end();
            return resolve(match[1]);
        }
    }
});

&

childProc.on("close", (code: number) => {
    if (code !== 0) {
        reject(new Error("Failed to login.`"));
    }
});

yihong0618 · 2020-01-08T13:46:08Z

@jdneo
You are right. Because I put the GitHub login without two-factor in the end of the code block, so it would fall through using prompt. And I think you are right. Really learned a lot from your project and the JS(TS), thank you. I will fix these tonight.

jdneo · 2020-01-09T04:38:25Z

@yihong0618 No worry, I should thank you for all of the contributions you have made.

Will take a look at the PR recently.

jdneo

yihong0618 added 8 commits December 3, 2019 16:16

add leetcode.cookieIn but simple change

af76a8b

try to fix ci first time

3124790

try to fix ci second time

6ab8a3b

rename cookie in to Sign in (by cookie)

8d24d57

also change readme-cn

ae2fa04

fix preposition typo

ed51cb5

Merge remote-tracking branch 'upstream/master'

e9fbd35

add thrid party login -- GitHub and LinkedIn

e4606fc

yihong0618 mentioned this pull request Dec 25, 2019

solve GitHub login two-factor auth problem and add new node package p… leetcode-tools/leetcode-cli#35

Merged

This was referenced Dec 27, 2019

How to login by three party auth #475

Closed

Support third-party login, for example: Login through GitHub #62

Closed

yihong0618 added 2 commits December 27, 2019 18:02

fix lint bug

ae9463e

make login methods in one pop up

4b0577e

delete comments and change cli version for ci

f52cde3

jdneo requested changes Dec 29, 2019

View reviewed changes

make naming more formal by review

a7f2ff0

add two-factor support for GitHub login

b05f9d4

jdneo approved these changes Jan 12, 2020

View reviewed changes

jdneo merged commit c20a2d5 into LeetCode-OpenSource:master Jan 12, 2020

jdneo added this to the 0.15.9 milestone Jan 12, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add thrid party login -- GitHub and LinkedIn #496

add thrid party login -- GitHub and LinkedIn #496

yihong0618 commented Dec 20, 2019

jdneo commented Dec 27, 2019 •

edited

Loading

yihong0618 commented Dec 27, 2019 •

edited

Loading

jdneo commented Dec 27, 2019

yihong0618 commented Dec 27, 2019

jdneo commented Dec 29, 2019

jdneo left a comment

jdneo Dec 29, 2019

jdneo Dec 29, 2019

jdneo Dec 29, 2019

jdneo Dec 29, 2019

jdneo Dec 29, 2019

jdneo Dec 29, 2019

yihong0618 Dec 29, 2019

jdneo Dec 29, 2019

yihong0618 commented Dec 29, 2019

jdneo commented Dec 30, 2019

yihong0618 commented Dec 30, 2019 •

edited

Loading

jdneo commented Dec 31, 2019

yihong0618 commented Dec 31, 2019 •

edited

Loading

jdneo commented Jan 6, 2020

jdneo commented Jan 6, 2020

yihong0618 commented Jan 6, 2020

yihong0618 commented Jan 6, 2020

jdneo commented Jan 8, 2020

yihong0618 commented Jan 8, 2020

jdneo commented Jan 9, 2020

jdneo left a comment

add thrid party login -- GitHub and LinkedIn #496

add thrid party login -- GitHub and LinkedIn #496

Conversation

yihong0618 commented Dec 20, 2019

jdneo commented Dec 27, 2019 • edited Loading

yihong0618 commented Dec 27, 2019 • edited Loading

jdneo commented Dec 27, 2019

yihong0618 commented Dec 27, 2019

jdneo commented Dec 29, 2019

jdneo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yihong0618 commented Dec 29, 2019

jdneo commented Dec 30, 2019

yihong0618 commented Dec 30, 2019 • edited Loading

jdneo commented Dec 31, 2019

yihong0618 commented Dec 31, 2019 • edited Loading

Thank you, that would be wonderful.

jdneo commented Jan 6, 2020

jdneo commented Jan 6, 2020

yihong0618 commented Jan 6, 2020

yihong0618 commented Jan 6, 2020

jdneo commented Jan 8, 2020

yihong0618 commented Jan 8, 2020

jdneo commented Jan 9, 2020

jdneo left a comment

Choose a reason for hiding this comment

jdneo commented Dec 27, 2019 •

edited

Loading

yihong0618 commented Dec 27, 2019 •

edited

Loading

yihong0618 commented Dec 30, 2019 •

edited

Loading

yihong0618 commented Dec 31, 2019 •

edited

Loading