rpc: don't error on missing session if closeSession

0xsequence · May 21, 2024 · a691604 · a691604
1 parent 118033a
commit a691604
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rpc/intents.go b/rpc/intents.go
@@ -71,7 +71,7 @@ func (s *RPC) SendIntent(ctx context.Context, protoIntent *proto.Intent) (*proto
 	defer span.End()
 
 	sess, found, err := s.Sessions.Get(ctx, tntData.ProjectID, sessionID)
-	if err != nil || !found {
+	if (err != nil || !found) && intent.Name != intents.IntentName_closeSession {
 		return nil, fmt.Errorf("session invalid or not found")
 	}
 

diff --git a/rpc/sessions.go b/rpc/sessions.go
@@ -156,7 +156,7 @@ func (s *RPC) dropSession(
 	tntData := tenant.FromContext(ctx)
 
 	dropSess, found, err := s.Sessions.Get(ctx, tntData.ProjectID, intent.Data.SessionID)
-	if err != nil || !found || dropSess.UserID != sess.UserID {
+	if err != nil || !found || sess == nil || dropSess.UserID != sess.UserID {
 		return true, nil
 	}