下载

internal/logic/auth/emailLoginLogic.go

@@ -233,14 +233,35 @@ func (l *EmailLoginLogic) EmailLogin(req *types.EmailLoginRequest) (resp *types.
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "token generate error: %v", err.Error())
 	}
+	// If device had a previous session, invalidate it first (MUST be before EnforceUserSessionLimit)
+	if req.Identifier != "" {
+		oldDeviceCacheKey := fmt.Sprintf("%v:%v", config.DeviceCacheKeyKey, req.Identifier)
+		if oldSid, getErr := l.svcCtx.Redis.Get(l.ctx, oldDeviceCacheKey).Result(); getErr == nil && oldSid != "" {
+			oldSessionKey := fmt.Sprintf("%v:%v", config.SessionIdKey, oldSid)
+			if uidStr, _ := l.svcCtx.Redis.Get(l.ctx, oldSessionKey).Result(); uidStr != "" {
+				_ = l.svcCtx.Redis.Del(l.ctx, oldSessionKey).Err()
+				sessionsKey := fmt.Sprintf("%s%v", config.UserSessionsKeyPrefix, uidStr)
+				_ = l.svcCtx.Redis.ZRem(l.ctx, sessionsKey, oldSid).Err()
+			}
+			_ = l.svcCtx.Redis.Del(l.ctx, oldDeviceCacheKey).Err()
+		}
+	}
+
 	if err = l.svcCtx.EnforceUserSessionLimit(l.ctx, userInfo.Id, sessionId, l.svcCtx.SessionLimit()); err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "enforce session limit error: %v", err.Error())
 	}
 	sessionIdCacheKey := fmt.Sprintf("%v:%v", config.SessionIdKey, sessionId)
+
 	if err = l.svcCtx.Redis.Set(l.ctx, sessionIdCacheKey, userInfo.Id, time.Duration(l.svcCtx.Config.JwtAuth.AccessExpire)*time.Second).Err(); err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "set session id error: %v", err.Error())
 	}
 
+	// Store device-to-session mapping
+	if req.Identifier != "" {
+		deviceCacheKey := fmt.Sprintf("%v:%v", config.DeviceCacheKeyKey, req.Identifier)
+		_ = l.svcCtx.Redis.Set(l.ctx, deviceCacheKey, sessionId, time.Duration(l.svcCtx.Config.JwtAuth.AccessExpire)*time.Second).Err()
+	}
+
 	loginStatus = true
 	return &types.LoginResponse{
 		Token: token,