From 111a0b4ea5ecbce250c359c163ae086ede054695 Mon Sep 17 00:00:00 2001
From: qwerty287 <80460567+qwerty287@users.noreply.github.com>
Date: Fri, 24 Nov 2023 18:19:38 +0100
Subject: [PATCH] Fix unregistering agents used with agent tokens (#2870)

from discussion on matrix

I'm not sure if this is the best way to fix this, but I don't really see
a different way.
---
 server/grpc/rpc.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/grpc/rpc.go b/server/grpc/rpc.go
index f1bbd6501..a0d9cf9d4 100644
--- a/server/grpc/rpc.go
+++ b/server/grpc/rpc.go
@@ -352,6 +352,10 @@ func (s *RPC) RegisterAgent(ctx context.Context, platform, backend, version stri
 
 func (s *RPC) UnregisterAgent(ctx context.Context) error {
 	agent, err := s.getAgentFromContext(ctx)
+	if agent.OwnerID > 0 {
+		// registered with individual agent token -> do not unregister
+		return nil
+	}
 	log.Debug().Msgf("unregistering agent with ID %d", agent.ID)
 	if err != nil {
 		return err