From ad857aaf0d3cce3796a9202362f1f712b9bc2449 Mon Sep 17 00:00:00 2001
From: tomoyachen <tomoyachen@gmail.com>
Date: Mon, 29 Jul 2024 15:34:06 +0800
Subject: [PATCH 1/3] feat: re-add cookie-based login method

---
 src/leetCodeManager.ts | 83 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 67 insertions(+), 16 deletions(-)

diff --git a/src/leetCodeManager.ts b/src/leetCodeManager.ts
index 1b2d4af..668de5c 100644
--- a/src/leetCodeManager.ts
+++ b/src/leetCodeManager.ts
@@ -6,14 +6,14 @@ import { EventEmitter } from "events";
 import * as vscode from "vscode";
 import { leetCodeChannel } from "./leetCodeChannel";
 import { leetCodeExecutor } from "./leetCodeExecutor";
-import { Endpoint, loginArgsMapping, urls, urlsCn, UserStatus } from "./shared";
+import { Endpoint, IQuickItemEx, loginArgsMapping, urls, urlsCn, UserStatus } from "./shared";
 import { createEnvOption } from "./utils/cpUtils";
 import { DialogType, openUrl, promptForOpenOutputChannel } from "./utils/uiUtils";
 import * as wsl from "./utils/wslUtils";
 import { getLeetCodeEndpoint } from "./commands/plugin";
 import { globalState } from "./globalState";
 import { queryUserData } from "./request/query-user-data";
-import { parseQuery, sleep } from "./utils/toolUtils";
+import { parseQuery } from "./utils/toolUtils";
 
 class LeetCodeManager extends EventEmitter {
     private currentUser: string | undefined;
@@ -42,6 +42,19 @@ class LeetCodeManager extends EventEmitter {
         }
     }
 
+    private async updateUserStatusWithCookie(cookie: string): Promise<void> {
+        globalState.setCookie(cookie);
+        const data = await queryUserData();
+        globalState.setUserStatus(data);
+        await this.setCookieToCli(cookie, data.username);
+        if (data.username) {
+            vscode.window.showInformationMessage(`Successfully ${data.username}.`);
+            this.currentUser = data.username;
+            this.userStatus = UserStatus.SignedIn;
+            this.emit("statusChanged");
+        }
+    }
+
     public async handleUriSignIn(uri: vscode.Uri): Promise<void> {
         try {
             await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification }, async (progress: vscode.Progress<{}>) => {
@@ -52,24 +65,61 @@ class LeetCodeManager extends EventEmitter {
                     promptForOpenOutputChannel(`Failed to get cookie. Please log in again`, DialogType.error);
                     return;
                 }
-                globalState.setCookie(cookie);
-                const data = await queryUserData();
-                globalState.setUserStatus(data);
-                await this.setCookieToCli(cookie, data.username);
-                if (data.username) {
-                    vscode.window.showInformationMessage(`Successfully ${data.username}.`);
-                    this.currentUser = data.username;
-                    this.userStatus = UserStatus.SignedIn;
-                    this.emit("statusChanged");
-                }
+
+                await this.updateUserStatusWithCookie(cookie)
+
             });
         } catch (error) {
             promptForOpenOutputChannel(`Failed to log in. Please open the output channel for details`, DialogType.error);
         }
     }
 
+    public async handleInputCookieSignIn(): Promise<void> {
+        const cookie: string | undefined = await vscode.window.showInputBox({
+            prompt: 'Enter LeetCode Cookie',
+            password: true,
+            ignoreFocusOut: true,
+            validateInput: (s: string): string | undefined =>
+                s ? undefined : 'Cookie must not be empty',
+        })
+
+        await this.updateUserStatusWithCookie(cookie || '')
+    }
+
     public async signIn(): Promise<void> {
-        openUrl(this.getAuthLoginUrl());
+        const picks: Array<IQuickItemEx<string>> = []
+        picks.push(
+            {
+                label: 'Web Authorization',
+                detail: 'Open browser to authorize login on the website',
+                value: 'WebAuth',
+                description: '[Recommended]'
+            },
+            {
+                label: 'LeetCode Cookie',
+                detail: 'Use LeetCode cookie copied from browser to login',
+                value: 'Cookie',
+            }
+        )
+
+        const choice: IQuickItemEx<string> | undefined = await vscode.window.showQuickPick(picks)
+        if (!choice) {
+            return
+        }
+        const loginMethod: string = choice.value
+
+        if (loginMethod === 'WebAuth') {
+            openUrl(this.getAuthLoginUrl())
+            return
+        }
+
+        try {
+            await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, title: "Fetching user data..." }, async () => {
+                await this.handleInputCookieSignIn()
+            });
+        } catch (error) {
+            promptForOpenOutputChannel(`Failed to log in. Please open the output channel for details`, DialogType.error);
+        }
     }
 
     public async signOut(): Promise<void> {
@@ -136,15 +186,16 @@ class LeetCodeManager extends EventEmitter {
                 } else if (data.match(this.failRegex)) {
                     childProc.stdin?.end();
                     return reject(new Error("Faile to login"));
+                } else if (data.match(/login: /)){
+                    childProc.stdin?.write(`${name}\n`);
+                } else if (data.match(/cookie: /)){
+                    childProc.stdin?.write(`${cookie}\n`);
                 }
             });
 
             childProc.stderr?.on("data", (data: string | Buffer) => leetCodeChannel.append(data.toString()));
 
             childProc.on("error", reject);
-            childProc.stdin?.write(`${name}\n`);
-            await sleep(800);
-            childProc.stdin?.write(`${cookie}\n`);
         });
     }
 }

From c064040178e52eb83e64b6777cd201e990a343bb Mon Sep 17 00:00:00 2001
From: "leo.zhao" <zale0201@gmail.com>
Date: Tue, 30 Jul 2024 12:33:35 +0800
Subject: [PATCH 2/3] chore: optimize tslint config

---
 src/leetCodeManager.ts     |  4 ++--
 src/utils/httpUtils.ts     |  2 +-
 src/utils/toolUtils.ts     |  2 +-
 src/utils/trackingUtils.ts |  2 +-
 tslint.json                | 44 ++++++++++++++++----------------------
 5 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/src/leetCodeManager.ts b/src/leetCodeManager.ts
index 668de5c..16ec378 100644
--- a/src/leetCodeManager.ts
+++ b/src/leetCodeManager.ts
@@ -186,9 +186,9 @@ class LeetCodeManager extends EventEmitter {
                 } else if (data.match(this.failRegex)) {
                     childProc.stdin?.end();
                     return reject(new Error("Faile to login"));
-                } else if (data.match(/login: /)){
+                } else if (data.match(/login: /)) {
                     childProc.stdin?.write(`${name}\n`);
-                } else if (data.match(/cookie: /)){
+                } else if (data.match(/cookie: /)) {
                     childProc.stdin?.write(`${cookie}\n`);
                 }
             });
diff --git a/src/utils/httpUtils.ts b/src/utils/httpUtils.ts
index aa6e205..b777173 100644
--- a/src/utils/httpUtils.ts
+++ b/src/utils/httpUtils.ts
@@ -16,7 +16,7 @@ export function LcAxios<T = any>(path: string, settings?: AxiosRequestConfig): A
     }
     return axios(path, {
         headers: {
-            referer: referer,
+            referer,
             "content-type": "application/json",
             cookie,
             ...(settings && settings.headers),
diff --git a/src/utils/toolUtils.ts b/src/utils/toolUtils.ts
index 6437226..ce37e18 100644
--- a/src/utils/toolUtils.ts
+++ b/src/utils/toolUtils.ts
@@ -9,7 +9,7 @@ export function parseQuery(query: string): { [key: string]: string } {
         return queryObject;
     }
 
-    let keyValuePairs = query.split("&");
+    const keyValuePairs = query.split("&");
     keyValuePairs.forEach((pair) => {
         const firstEqualsIndex = pair.indexOf("=");
         if (firstEqualsIndex !== -1) {
diff --git a/src/utils/trackingUtils.ts b/src/utils/trackingUtils.ts
index 4333bfa..56b1a6f 100644
--- a/src/utils/trackingUtils.ts
+++ b/src/utils/trackingUtils.ts
@@ -90,7 +90,7 @@ class TrackData implements ITrackData {
         if (!Array.isArray(reportItems)) {
             reportItems = [reportItems];
         }
-        let randomId = getRandomString(60);
+        const randomId = getRandomString(60);
         reportItems.forEach((item) => {
             this.reportCache.push({
                 ...item,
diff --git a/tslint.json b/tslint.json
index 34776be..a686a2c 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,36 +1,28 @@
 {
     "defaultSeverity": "error",
-    "extends": [
-        "tslint:recommended"
-    ],
+    "extends": ["tslint:recommended"],
     "jsRules": {},
     "rules": {
-        "forin": false,
         "object-literal-sort-keys": false,
-        "indent": [
-            true,
-            "spaces"
-        ],
+        "ordered-imports": [false],
+        "indent": [true, "spaces"],
         "no-string-literal": false,
         "no-namespace": false,
-        "max-line-length": [
-            false,
-            120
-        ],
-        "typedef": [
-            true,
-            "call-signature",
-            "arrow-call-signature",
-            "parameter",
-            "arrow-parameter",
-            "property-declaration",
-            "variable-declaration",
-            "member-variable-declaration"
-        ],
-        "variable-name": [
-            true,
-            "allow-leading-underscore"
-        ]
+        "max-line-length": [false, 120],
+        "typedef": false,
+        "no-implicit-dependencies": [true, ["vscode"]],
+        "trailing-comma": false,
+        "no-any": false,
+        "object-literal-key-quotes": [true, "consistent-as-needed"],
+        "prefer-object-spread": false,
+        "no-unnecessary-await": false,
+        "semicolon": [false],
+        "quotemark": [false],
+        "member-ordering": [false],
+        "variable-name": [false],
+        "curly": false,
+        "interface-over-type-literal": [false],
+        "no-unused-expression": false
     },
     "rulesDirectory": []
 }

From b3314ad5952088a450a7b9e2c69d71d26f83454a Mon Sep 17 00:00:00 2001
From: "leo.zhao" <zale0201@gmail.com>
Date: Tue, 30 Jul 2024 12:37:07 +0800
Subject: [PATCH 3/3] chore : change build.yml

---
 .github/workflows/build.yml | 21 ---------------------
 .vscode/settings.json       |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2bdeaa4..dd9a1c2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,24 +48,3 @@ jobs:
 
       - name: VSCE Packge
         run: npx vsce package
-
-  darwin:
-    name: macOS
-    runs-on: macos-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14
-
-      - name: Install Node.js modules
-        run: npm install
-
-      - name: Lint
-        run: npm run lint
-
-      - name: VSCE Packge
-        run: npx vsce package
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b5f7231..5e5ca48 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-    "editor.formatOnSave": true,
+    "editor.formatOnSave": false,
     "editor.insertSpaces": true,
     "editor.tabSize": 4,
     "files.insertFinalNewline": true,

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/LeetCode-OpenSource/vscode-leetcode/pull/969.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/LeetCode-OpenSource/vscode-leetcode/pull/969.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/LeetCode-OpenSource/vscode-leetcode/pull/969.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/LeetCode-OpenSource/vscode-leetcode/pull/969.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>