fix: still reconn when token is invalid

Signed-off-by: Gordon <1432970085@qq.com>
openimsdk · Jul 27, 2023 · f4a4b86 · f4a4b86
1 parent 7e5c2dc
commit f4a4b86
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/internal/login/init_login.go b/internal/login/init_login.go
@@ -225,7 +225,7 @@ func (u *LoginMgr) logoutListener(ctx context.Context) {
 	for {
 		select {
 		case <-u.loginMgrCh:
-			err := u.logout(ctx)
+			err := u.logout(ctx, true)
 			if err != nil {
 				log.ZError(ctx, "logout error", err)
 			}
@@ -355,20 +355,22 @@ func (u *LoginMgr) initResources() {
 }
 
 // token error recycle recourse, kicked not recycle
-func (u *LoginMgr) logout(ctx context.Context) error {
-	ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
-	defer cancel()
-	err := u.longConnMgr.SendReqWaitResp(ctx, &push.DelUserPushTokenReq{UserID: u.info.UserID, PlatformID: u.info.PlatformID}, constant.LogoutMsg, &push.DelUserPushTokenResp{})
-	if err != nil {
-		log.ZWarn(ctx, "TriggerCmdLogout server recycle resources failed...", err)
-	} else {
-		log.ZDebug(ctx, "TriggerCmdLogout server recycle resources success...")
+func (u *LoginMgr) logout(ctx context.Context, isTokenValid bool) error {
+	if !isTokenValid {
+		ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
+		defer cancel()
+		err := u.longConnMgr.SendReqWaitResp(ctx, &push.DelUserPushTokenReq{UserID: u.info.UserID, PlatformID: u.info.PlatformID}, constant.LogoutMsg, &push.DelUserPushTokenResp{})
+		if err != nil {
+			log.ZWarn(ctx, "TriggerCmdLogout server recycle resources failed...", err)
+		} else {
+			log.ZDebug(ctx, "TriggerCmdLogout server recycle resources success...")
+		}
 	}
 	u.Exit()
 	_ = u.db.Close(u.ctx)
 	// user object must be rest  when user logout
 	u.initResources()
-	log.ZDebug(ctx, "TriggerCmdLogout client success...")
+	log.ZDebug(ctx, "TriggerCmdLogout client success...", "isTokenValid", isTokenValid)
 	return nil
 }
 

diff --git a/internal/login/sdk.go b/internal/login/sdk.go
@@ -23,7 +23,7 @@ func (u *LoginMgr) Login(ctx context.Context, userID, token string) error {
 }
 
 func (u *LoginMgr) Logout(ctx context.Context) error {
-	return u.logout(ctx)
+	return u.logout(ctx, false)
 }
 
 func (u *LoginMgr) SetAppBackgroundStatus(ctx context.Context, isBackground bool) error {