From b6e75fa48ad55d69e82b5ac4b2b320dd9b98eba7 Mon Sep 17 00:00:00 2001
From: SEAL <yejunhai2001@gmail.com>
Date: Wed, 20 Sep 2023 15:03:14 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fix:=20=E4=BF=AE=E5=A4=8D=20cookie=20?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E9=87=8D=E5=90=AF=20=20=20vscode=20?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json               | 4 ++--
 src/rpc/factory/api/userApi.ts  | 2 +-
 src/service/StatusBarService.ts | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3fa3d67..29f9b0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "vscode-leetcode-problem-rating",
-    "version": "2.19.1",
+    "version": "2.19.14",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "vscode-leetcode-problem-rating",
-            "version": "2.19.1",
+            "version": "2.19.14",
             "license": "MIT",
             "dependencies": {
                 "ansi-styles": "3.2.1",
diff --git a/src/rpc/factory/api/userApi.ts b/src/rpc/factory/api/userApi.ts
index 2937ba7..4d15118 100644
--- a/src/rpc/factory/api/userApi.ts
+++ b/src/rpc/factory/api/userApi.ts
@@ -141,7 +141,7 @@ class UserApi extends ApiBase {
       // show current user
       user = sessionUtils.getUser();
       if (user) {
-        reply.info(JSON.stringify({ code: 100, user_name: user.name }));
+        reply.info(JSON.stringify({ code: 100, user_name: user.login }));
       } else return reply.info(JSON.stringify({ code: -7, msg: "You are not login yet?" }));
     }
   }
diff --git a/src/service/StatusBarService.ts b/src/service/StatusBarService.ts
index f266895..efdc5e6 100644
--- a/src/service/StatusBarService.ts
+++ b/src/service/StatusBarService.ts
@@ -45,8 +45,10 @@ class StatusBarService implements Disposable {
 
   public async getLoginStatus(): Promise<void> {
     try {
-      const result: string = await executeService.getUserInfo();
-      this.currentUser = this.tryParseUserName(result);
+      const result: any = await executeService.getUserInfo();
+      // BUG: this.tryParseUserName(result)拿到的是对象,而不是字符串
+      // this.currentUser = this.tryParseUserName(result);
+      this.currentUser = { ...result, user_name: result.login };
       this.userStatus = UserStatus.SignedIn;
       if (this.currentUser == undefined) {
         this.userStatus = UserStatus.SignedOut;