-
Notifications
You must be signed in to change notification settings - Fork 677
add thrid party login -- GitHub and LinkedIn #496
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.
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
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
af76a8b
add leetcode.cookieIn but simple change
yihong0618 3124790
try to fix ci first time
yihong0618 6ab8a3b
try to fix ci second time
yihong0618 8d24d57
rename cookie in to Sign in (by cookie)
yihong0618 ae2fa04
also change readme-cn
yihong0618 ed51cb5
fix preposition typo
yihong0618 e9fbd35
Merge remote-tracking branch 'upstream/master'
yihong0618 e4606fc
add thrid party login -- GitHub and LinkedIn
yihong0618 ae9463e
fix lint bug
yihong0618 4b0577e
make login methods in one pop up
yihong0618 f52cde3
delete comments and change cli version for ci
yihong0618 a7f2ff0
make naming more formal by review
yihong0618 b05f9d4
add two-factor support for GitHub login
yihong0618 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ import { EventEmitter } from "events"; | |
| import * as vscode from "vscode"; | ||
| import { leetCodeChannel } from "./leetCodeChannel"; | ||
| import { leetCodeExecutor } from "./leetCodeExecutor"; | ||
| import { UserStatus } from "./shared"; | ||
| import { IQuickItemEx, loginArgsMapping, UserStatus } from "./shared"; | ||
| import { createEnvOption } from "./utils/cpUtils"; | ||
| import { DialogType, promptForOpenOutputChannel } from "./utils/uiUtils"; | ||
| import * as wsl from "./utils/wslUtils"; | ||
|
|
@@ -34,14 +34,43 @@ class LeetCodeManager extends EventEmitter { | |
| } | ||
| } | ||
|
|
||
| public async signIn(isByCookie: boolean = false): Promise<void> { | ||
| const loginArg: string = "-l"; | ||
| const cookieArg: string = "-c"; | ||
| const commandArg: string = isByCookie ? cookieArg : loginArg; | ||
| public async signIn(): Promise<void> { | ||
| const picks: Array<IQuickItemEx<string>> = []; | ||
| picks.push( | ||
| { | ||
| label: "LeetCode Account", | ||
| detail: "Use LeetCode account to login", | ||
| value: "LeetCode", | ||
| }, | ||
| { | ||
| label: "LeetCode Cookie", | ||
| detail: "Use LeetCode cookie copied from browser to login", | ||
| value: "Cookie", | ||
| }, | ||
| { | ||
| label: "Third-Party: GitHub", | ||
| detail: "Use GitHub account to login", | ||
| value: "GitHub", | ||
| }, | ||
| { | ||
| label: "Third-Party: LinkedIn", | ||
| detail: "Use LinkedIn account to login", | ||
| value: "LinkedIn", | ||
| }, | ||
| ); | ||
| const choice: IQuickItemEx<string> | undefined = await vscode.window.showQuickPick(picks); | ||
| if (!choice) { | ||
| return; | ||
| } | ||
| const loginMethod: string = choice.value; | ||
| const commandArg: string | undefined = loginArgsMapping.get(loginMethod); | ||
| 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"; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this variable There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, it is for the difference of cookie login or other login message.
|
||
| try { | ||
| const userName: string | undefined = await new Promise(async (resolve: (res: string | undefined) => void, reject: (e: Error) => void): Promise<void> => { | ||
| let result: string = ""; | ||
|
|
||
| const leetCodeBinaryPath: string = await leetCodeExecutor.getLeetCodeBinaryPath(); | ||
|
|
||
|
|
@@ -52,10 +81,27 @@ class LeetCodeManager extends EventEmitter { | |
| env: createEnvOption(), | ||
| }); | ||
|
|
||
| childProc.stdout.on("data", (data: string | Buffer) => { | ||
| childProc.stdout.on("data", async (data: string | Buffer) => { | ||
| data = data.toString(); | ||
| result = result.concat(data); | ||
| 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.stderr.on("data", (data: string | Buffer) => leetCodeChannel.append(data.toString())); | ||
|
|
@@ -80,13 +126,9 @@ class LeetCodeManager extends EventEmitter { | |
| return resolve(undefined); | ||
| } | ||
| childProc.stdin.write(`${pwd}\n`); | ||
| childProc.stdin.end(); | ||
| childProc.on("close", () => { | ||
| const match: RegExpMatchArray | null = result.match(/(?:.*) Successfully (login|cookie login) as (.*)/i); | ||
| if (match && match[2]) { | ||
| resolve(match[2]); | ||
| } else { | ||
| reject(new Error(`Failed to ${inMessage}.`)); | ||
| childProc.on("close", (code: number) => { | ||
| if (code !== 0) { | ||
| reject(new Error("Failed to login.")); | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.