From 245f1c3925d38fab6b06b44d7d55dd05180686a2 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 12 Oct 2022 15:16:13 +0800
Subject: [PATCH] Remove existing items before adding.

---
 .../OpenIddict/Applications/OpenIddictApplicationExtensions.cs  | 2 ++
 .../Authorizations/OpenIddictAuthorizationExtensions.cs         | 2 ++
 .../Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs     | 2 ++
 .../Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs     | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs
index 87ef747f7b..34ff4ba41f 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs
@@ -25,6 +25,7 @@ public static class OpenIddictApplicationExtensions
 
         foreach (var extraProperty in model.ExtraProperties)
         {
+            entity.ExtraProperties.Remove(extraProperty.Key);
             entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
@@ -86,6 +87,7 @@ public static class OpenIddictApplicationExtensions
 
         foreach (var extraProperty in entity.ExtraProperties)
         {
+            model.ExtraProperties.Remove(extraProperty.Key);
             model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationExtensions.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationExtensions.cs
index 28ad28a206..80ef56539b 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationExtensions.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationExtensions.cs
@@ -19,6 +19,7 @@ public static class OpenIddictAuthorizationExtensions
 
         foreach (var extraProperty in model.ExtraProperties)
         {
+            entity.ExtraProperties.Remove(extraProperty.Key);
             entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
@@ -68,6 +69,7 @@ public static class OpenIddictAuthorizationExtensions
 
         foreach (var extraProperty in entity.ExtraProperties)
         {
+            model.ExtraProperties.Remove(extraProperty.Key);
             model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs
index b6870d9d67..6734af2e1b 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs
@@ -19,6 +19,7 @@ public static class OpenIddictScopeExtensions
 
         foreach (var extraProperty in model.ExtraProperties)
         {
+            entity.ExtraProperties.Remove(extraProperty.Key);
             entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
@@ -69,6 +70,7 @@ public static class OpenIddictScopeExtensions
 
         foreach (var extraProperty in entity.ExtraProperties)
         {
+            model.ExtraProperties.Remove(extraProperty.Key);
             model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs
index 5799188483..10b290f272 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs
@@ -24,6 +24,7 @@ public static class OpenIddictTokenExtensions
 
         foreach (var extraProperty in model.ExtraProperties)
         {
+            entity.ExtraProperties.Remove(extraProperty.Key);
             entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
@@ -81,6 +82,7 @@ public static class OpenIddictTokenExtensions
 
         foreach (var extraProperty in entity.ExtraProperties)
         {
+            model.ExtraProperties.Remove(extraProperty.Key);
             model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }