make login methods in one pop up

Author: yihong0618

package.json

@@ -38,9 +38,6 @@
         "onCommand:leetcode.testSolution",
         "onCommand:leetcode.submitSolution",
         "onCommand:leetcode.switchDefaultLanguage",
-        "onCommand:leetcode.signinByCookie",
-        "onCommand:leetcode.signinByGitHub",
-        "onCommand:leetcode.signinByLinkedIn",
         "onView:leetCodeExplorer"
     ],
     "main": "./out/src/extension",
@@ -69,21 +66,6 @@
                     "dark": "resources/dark/signin.svg"
                 }
             },
-            {
-                "command": "leetcode.signinByCookie",
-                "title": "Sign In by Cookie",
-                "category": "LeetCode"
-            },
-            {
-                "command": "leetcode.signinByGitHub",
-                "title": "Sign In by GitHub",
-                "category": "LeetCode"
-            },
-            {
-                "command": "leetcode.signinByLinkedIn",
-                "title": "Sign In by LinkedIn",
-                "category": "LeetCode"
-            },
             {
                 "command": "leetcode.signout",
                 "title": "Sign Out",
@@ -701,6 +683,6 @@
         "markdown-it": "^8.4.2",
         "require-from-string": "^2.0.2",
         "unescape-js": "^1.1.1",
-        "vsc-leetcode-cli": "2.6.19"
+        "vsc-leetcode-cli": "2.6.20"
     }
 }

src/extension.ts

@@ -51,9 +51,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
             vscode.commands.registerCommand("leetcode.deleteCache", () => cache.deleteCache()),
             vscode.commands.registerCommand("leetcode.toggleLeetCodeCn", () => plugin.switchEndpoint()),
             vscode.commands.registerCommand("leetcode.signin", () => leetCodeManager.signIn()),
-            vscode.commands.registerCommand("leetcode.signinByCookie", () => leetCodeManager.signIn(true)),
-            vscode.commands.registerCommand("leetcode.signinByGitHub", () => leetCodeManager.signIn(false, "GitHub")),
-            vscode.commands.registerCommand("leetcode.signinByLinkedIn", () => leetCodeManager.signIn(false, "LinkedIn")),
             vscode.commands.registerCommand("leetcode.signout", () => leetCodeManager.signOut()),
             vscode.commands.registerCommand("leetcode.manageSessions", () => session.manageSessions()),
             vscode.commands.registerCommand("leetcode.previewProblem", (node: LeetCodeNode) => show.previewProblem(node)),

src/leetCodeManager.ts

@@ -6,7 +6,7 @@ import { EventEmitter } from "events";
 import * as vscode from "vscode";
 import { leetCodeChannel } from "./leetCodeChannel";
 import { leetCodeExecutor } from "./leetCodeExecutor";
-import { loginCommand, UserStatus } from "./shared";
+import { IQuickItemEx, loginCommand, UserStatus } from "./shared";
 import { createEnvOption } from "./utils/cpUtils";
 import { DialogType, promptForOpenOutputChannel } from "./utils/uiUtils";
 import * as wsl from "./utils/wslUtils";
@@ -34,13 +34,50 @@ class LeetCodeManager extends EventEmitter {
         }
     }
 
-    public async signIn(isByCookie: boolean = false, thirdParty: string = "Default"): Promise<void> {
-        const loginArg: string | undefined = loginCommand.get(thirdParty);
-        if (!loginArg) {
-            throw new Error(`The third party "${thirdParty}" is not supported.`);
+    public async signIn(): Promise<void> {
+        /*
+            LeetCode Account
+            LeetCode Cookie
+            Third-Party: GitHub
+            Third-Party: LinkedIn
+        */
+        const picks: Array<IQuickItemEx<string>> = [];
+        picks.push(
+            {
+                label: "LeetCode Account",
+                description: "",
+                detail: "Use LeetCode account to login",
+                value: "LeetCode",
+            },
+            {
+                label: "LeetCode Cookie",
+                description: "",
+                detail: "Use LeetCode cookie that copy from browser to login",
+                value: "Cookie",
+            },
+            {
+                label: "Third-Party: GitHub",
+                description: "",
+                detail: "Use third party GitHub account to login",
+                value: "GitHub",
+            },
+            {
+                label: "Third-Party: LinkedIn",
+                description: "",
+                detail: "Use third party LinkedIn account to login",
+                value: "LinkedIn",
+            },
+        );
+        const choice: IQuickItemEx<string> | undefined = await vscode.window.showQuickPick(picks);
+        if (!choice) {
+            return;
         }
-        const cookieArg: string = "-c";
-        const commandArg: string = isByCookie ? cookieArg : loginArg;
+        const loginMethod: string = choice.value;
+        const commandArg: string | undefined = loginCommand.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";
         try {
             const userName: string | undefined = await new Promise(async (resolve: (res: string | undefined) => void, reject: (e: Error) => void): Promise<void> => {

src/shared.ts

@@ -13,7 +13,8 @@ export enum UserStatus {
 }
 
 export const loginCommand: Map<string, string> = new Map([
-    ["Default", "-l"],
+    ["LeetCode", "-l"],
+    ["Cookie", "-c"],
     ["GitHub", "-g"],
     ["LinkedIn", "-i"],
 ]);