Bug/SK-1670 | When a client (using the same client_id) reconnects, the name does not update (#978)

Author: niklastheman

fedn/network/api/v1/client_routes.py

@@ -504,10 +504,11 @@ def add_client():
             if combiner is None:
                 return jsonify({"success": False, "message": "No combiner available."}), 400
 
-        if db.client_store.get(client_id) is None:
-            logger.info("Adding client {}".format(client_id))
+        existing_client = db.client_store.get(client_id)
+        last_seen = datetime.now()
 
-            last_seen = datetime.now()
+        if existing_client is None:
+            logger.info("Adding client {}".format(client_id))
 
             new_client = ClientDTO(
                 client_id=client_id,
@@ -520,8 +521,27 @@ def add_client():
                 last_seen=last_seen,
             )
 
-            added_client = db.client_store.add(new_client)
-            client_id = added_client.client_id
+            try:
+                added_client = db.client_store.add(new_client)
+                client_id = added_client.client_id
+            except Exception as e:
+                logger.error(f"Failed to add new client: {e}")
+                return jsonify({"success": False, "message": "Failed to add new client"}), 500
+        else:
+            logger.info("Client {} already exists, updating client object".format(client_id))
+            existing_client.name = name
+            existing_client.combiner = combiner.name
+            existing_client.combiner_preferred = preferred_combiner
+            existing_client.ip = remote_addr
+            existing_client.status = "available"
+            existing_client.package = package
+            existing_client.last_seen = last_seen
+
+            try:
+                db.client_store.update(existing_client)
+            except Exception as e:
+                logger.error(f"Failed to update existing client: {e}")
+                return jsonify({"success": False, "message": "Failed to update existing client"}), 500
 
         payload = {
             "status": "assigned",