Merge pull request #242 from sealye09/cookie-login-bug

Cookie login bug

Author: ccagml

package-lock.json

@@ -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?" }));
     }
   }

src/rpc/factory/api/userApi.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;