From 02e4b10ae86f7bec6beb3e9e9938a761d2f004fc Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Fri, 18 Nov 2022 10:22:07 -0500
Subject: [PATCH] Set Id property on existing devices so we don't try to create
 a new one instead of updating existing. (#2420)

---
 src/Identity/IdentityServer/BaseRequestValidator.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Identity/IdentityServer/BaseRequestValidator.cs b/src/Identity/IdentityServer/BaseRequestValidator.cs
index cc7cab59a6..f5cdb9ebb2 100644
--- a/src/Identity/IdentityServer/BaseRequestValidator.cs
+++ b/src/Identity/IdentityServer/BaseRequestValidator.cs
@@ -562,6 +562,10 @@ public abstract class BaseRequestValidator<T> where T : class
                     }
                 }
             }
+            else
+            {
+                deviceFromRequest.Id = existingDevice.Id;
+            }
 
             deviceFromRequest.UserId = user.Id;
             await _deviceService.SaveAsync(deviceFromRequest);