不清楚什么原因,有些账号登录后返回的数据会没有name

Author: ccagml

src/rpc/factory/api/userApi.ts

@@ -81,14 +81,14 @@ class UserApi extends ApiBase {
             if (e) {
               return reply.info(JSON.stringify({ code: -2, msg: e.msg || e }));
             }
-            reply.info(JSON.stringify({ code: 100, user_name: user.name }));
+            reply.info(JSON.stringify({ code: 100, user_name: user.name || user.login || "username" }));
           });
         }
       );
     } else if (argv.logout) {
       // logout
       user = chainMgr.getChainHead().logout(user, true);
-      if (user) reply.info(JSON.stringify({ code: 100, user_name: user.name }));
+      if (user) reply.info(JSON.stringify({ code: 100, user_name: user.name || user.login || "username" }));
       else reply.info(JSON.stringify({ code: -3, msg: "You are not login yet?" }));
       // third parties
     } else if (argv.github || argv.linkedin) {
@@ -114,7 +114,7 @@ class UserApi extends ApiBase {
             if (e) return reply.info(JSON.stringify({ code: -4, msg: e.msg || e }));
             coreFunction(user, function (e, user) {
               if (e) return reply.info(JSON.stringify({ code: -5, msg: e.msg || e }));
-              reply.info(JSON.stringify({ code: 100, user_name: user.name }));
+              reply.info(JSON.stringify({ code: 100, user_name: user.name || user.login || "username" }));
             });
           }
         );
@@ -133,15 +133,15 @@ class UserApi extends ApiBase {
           if (e) return reply.info(e);
           chainMgr.getChainHead().cookieLogin(user, function (e, user) {
             if (e) return reply.info(JSON.stringify({ code: -6, msg: e.msg || e }));
-            reply.info(JSON.stringify({ code: 100, user_name: user.name }));
+            reply.info(JSON.stringify({ code: 100, user_name: user.name || user.login || "username" }));
           });
         }
       );
     } else {
       // show current user
       user = sessionUtils.getUser();
       if (user) {
-        reply.info(JSON.stringify({ code: 100, user_name: user.login }));
+        reply.info(JSON.stringify({ code: 100, user_name: user.name || user.login || "username" }));
       } else return reply.info(JSON.stringify({ code: -7, msg: "You are not login yet?" }));
     }
   }

src/service/StatusBarService.ts

@@ -45,10 +45,10 @@ class StatusBarService implements Disposable {
 
   public async getLoginStatus(): Promise<void> {
     try {
-      const result: any = await executeService.getUserInfo();
+      const result: string = await executeService.getUserInfo();
       // BUG: this.tryParseUserName(result)拿到的是对象,而不是字符串
-      // this.currentUser = this.tryParseUserName(result);
-      this.currentUser = { ...result, user_name: result.login };
+      this.currentUser = this.tryParseUserName(result);
+      // this.currentUser = { ...result, user_name: result.login };
       this.userStatus = UserStatus.SignedIn;
       if (this.currentUser == undefined) {
         this.userStatus = UserStatus.SignedOut;