Support ExtensibleObject.

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs

@@ -6,7 +6,7 @@ public static class OpenIddictApplicationExtensions
     {
         Check.NotNull(model, nameof(model));
 
-        return new OpenIddictApplication(model.Id)
+        var entity = new OpenIddictApplication(model.Id)
         {
             ClientId = model.ClientId,
             ClientSecret = model.ClientSecret,
@@ -20,6 +20,13 @@ public static class OpenIddictApplicationExtensions
             Requirements = model.Requirements,
             Type = model.Type
         };
+
+        foreach (var extraProperty in model.ExtraProperties)
+        {
+            entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
+        return entity;
     }
 
     public static OpenIddictApplication ToEntity(this OpenIddictApplicationModel model, OpenIddictApplication entity)
@@ -39,30 +46,43 @@ public static class OpenIddictApplicationExtensions
         entity.Requirements = model.Requirements;
         entity.Type = model.Type;
 
+        foreach (var extraProperty in model.ExtraProperties)
+        {
+            entity.ExtraProperties.Remove(extraProperty.Key);
+            entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
         return entity;
     }
 
-    public static OpenIddictApplicationModel ToModel(this OpenIddictApplication model)
+    public static OpenIddictApplicationModel ToModel(this OpenIddictApplication entity)
     {
-        if(model == null)
+        if(entity == null)
         {
             return null;
         }
 
-        return new OpenIddictApplicationModel
+        var model = new OpenIddictApplicationModel
         {
-            Id = model.Id,
-            ClientId = model.ClientId,
-            ClientSecret = model.ClientSecret,
-            ConsentType = model.ConsentType,
-            DisplayName = model.DisplayName,
-            DisplayNames = model.DisplayNames,
-            Permissions = model.Permissions,
-            PostLogoutRedirectUris = model.PostLogoutRedirectUris,
-            Properties = model.Properties,
-            RedirectUris = model.RedirectUris,
-            Requirements = model.Requirements,
-            Type = model.Type
+            Id = entity.Id,
+            ClientId = entity.ClientId,
+            ClientSecret = entity.ClientSecret,
+            ConsentType = entity.ConsentType,
+            DisplayName = entity.DisplayName,
+            DisplayNames = entity.DisplayNames,
+            Permissions = entity.Permissions,
+            PostLogoutRedirectUris = entity.PostLogoutRedirectUris,
+            Properties = entity.Properties,
+            RedirectUris = entity.RedirectUris,
+            Requirements = entity.Requirements,
+            Type = entity.Type
         };
+
+        foreach (var extraProperty in entity.ExtraProperties)
+        {
+            model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
+        return model;
     }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationModel.cs

@@ -1,10 +1,11 @@
 using System;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.OpenIddict.Applications;
 
 [Serializable, IgnoreMultiTenancy]
-public class OpenIddictApplicationModel
+public class OpenIddictApplicationModel : ExtensibleObject
 {
     public Guid Id { get; set; }
 

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationExtensions.cs

@@ -6,7 +6,7 @@ public static class OpenIddictAuthorizationExtensions
     {
         Check.NotNull(model, nameof(model));
 
-        return new OpenIddictAuthorization(model.Id)
+        var entity = new OpenIddictAuthorization(model.Id)
         {
             ApplicationId = model.ApplicationId,
             CreationDate = model.CreationDate,
@@ -16,6 +16,13 @@ public static class OpenIddictAuthorizationExtensions
             Subject = model.Subject,
             Type = model.Type
         };
+
+        foreach (var extraProperty in model.ExtraProperties)
+        {
+            entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
+        return entity;
     }
 
     public static OpenIddictAuthorization ToEntity(this OpenIddictAuthorizationModel model, OpenIddictAuthorization entity)
@@ -31,26 +38,39 @@ public static class OpenIddictAuthorizationExtensions
         entity.Subject = model.Subject;
         entity.Type = model.Type;
 
+        foreach (var extraProperty in model.ExtraProperties)
+        {
+            entity.ExtraProperties.Remove(extraProperty.Key);
+            entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
         return entity;
     }
 
-    public static OpenIddictAuthorizationModel ToModel(this OpenIddictAuthorization model)
+    public static OpenIddictAuthorizationModel ToModel(this OpenIddictAuthorization entity)
     {
-        if(model == null)
+        if(entity == null)
         {
             return null;
         }
 
-        return new OpenIddictAuthorizationModel
+        var model = new OpenIddictAuthorizationModel
         {
-            Id = model.Id,
-            ApplicationId = model.ApplicationId,
-            CreationDate = model.CreationDate,
-            Properties = model.Properties,
-            Scopes = model.Scopes,
-            Status = model.Status,
-            Subject = model.Subject,
-            Type = model.Type
+            Id = entity.Id,
+            ApplicationId = entity.ApplicationId,
+            CreationDate = entity.CreationDate,
+            Properties = entity.Properties,
+            Scopes = entity.Scopes,
+            Status = entity.Status,
+            Subject = entity.Subject,
+            Type = entity.Type
         };
+
+        foreach (var extraProperty in entity.ExtraProperties)
+        {
+            model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
+        return model;
     }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationModel.cs

@@ -1,10 +1,11 @@
 using System;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.OpenIddict.Authorizations;
 
 [Serializable, IgnoreMultiTenancy]
-public class OpenIddictAuthorizationModel
+public class OpenIddictAuthorizationModel : ExtensibleObject
 {
     public Guid Id { get; set; }
 

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs

@@ -6,7 +6,7 @@ public static class OpenIddictScopeExtensions
     {
         Check.NotNull(model, nameof(model));
 
-        return new OpenIddictScope(model.Id)
+        var entity = new OpenIddictScope(model.Id)
         {
             Description = model.Description,
             Descriptions = model.Descriptions,
@@ -16,6 +16,13 @@ public static class OpenIddictScopeExtensions
             Properties = model.Properties,
             Resources = model.Resources
         };
+
+        foreach (var extraProperty in model.ExtraProperties)
+        {
+            entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
+        return entity;
     }
 
     public static OpenIddictScope ToEntity(this OpenIddictScopeModel model, OpenIddictScope entity)
@@ -31,26 +38,40 @@ public static class OpenIddictScopeExtensions
         entity.Properties = model.Properties;
         entity.Resources = model.Resources;
 
+        foreach (var extraProperty in model.ExtraProperties)
+        {
+            entity.ExtraProperties.Remove(extraProperty.Key);
+            entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
         return entity;
     }
 
-    public static OpenIddictScopeModel ToModel(this OpenIddictScope model)
+    public static OpenIddictScopeModel ToModel(this OpenIddictScope entity)
     {
-        if(model == null)
+        if(entity == null)
         {
             return null;
         }
 
-        return new OpenIddictScopeModel
+        var model = new OpenIddictScopeModel
         {
-            Id = model.Id,
-            Description = model.Description,
-            Descriptions = model.Descriptions,
-            DisplayName = model.DisplayName,
-            DisplayNames = model.DisplayNames,
-            Name = model.Name,
-            Properties = model.Properties,
-            Resources = model.Resources
+            Id = entity.Id,
+            Description = entity.Description,
+            Descriptions = entity.Descriptions,
+            DisplayName = entity.DisplayName,
+            DisplayNames = entity.DisplayNames,
+            Name = entity.Name,
+            Properties = entity.Properties,
+            Resources = entity.Resources
         };
+
+
+        foreach (var extraProperty in entity.ExtraProperties)
+        {
+            model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
+        return model;
     }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeModel.cs

@@ -1,10 +1,11 @@
 using System;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.OpenIddict.Scopes;
 
 [Serializable, IgnoreMultiTenancy]
-public class OpenIddictScopeModel
+public class OpenIddictScopeModel : ExtensibleObject
 {
     public Guid Id { get; set; }
 

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs

@@ -6,7 +6,7 @@ public static class OpenIddictTokenExtensions
     {
         Check.NotNull(model, nameof(model));
 
-        return new OpenIddictToken(model.Id)
+        var entity = new OpenIddictToken(model.Id)
         {
             ApplicationId = model.ApplicationId,
             AuthorizationId = model.AuthorizationId,
@@ -20,6 +20,14 @@ public static class OpenIddictTokenExtensions
             Subject = model.Subject,
             Type = model.Type
         };
+
+
+        foreach (var extraProperty in model.ExtraProperties)
+        {
+            entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
+        return entity;
     }
 
     public static OpenIddictToken ToEntity(this OpenIddictTokenModel model, OpenIddictToken entity)
@@ -39,30 +47,43 @@ public static class OpenIddictTokenExtensions
         entity.Subject = model.Subject;
         entity.Type = model.Type;
 
+        foreach (var extraProperty in model.ExtraProperties)
+        {
+            entity.ExtraProperties.Remove(extraProperty.Key);
+            entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
         return entity;
     }
 
-    public static OpenIddictTokenModel ToModel(this OpenIddictToken model)
+    public static OpenIddictTokenModel ToModel(this OpenIddictToken entity)
     {
-        if(model == null)
+        if(entity == null)
         {
             return null;
         }
 
-        return new OpenIddictTokenModel
+        var model = new OpenIddictTokenModel
         {
-            Id = model.Id,
-            ApplicationId = model.ApplicationId,
-            AuthorizationId = model.AuthorizationId,
-            CreationDate = model.CreationDate,
-            ExpirationDate = model.ExpirationDate,
-            Payload = model.Payload,
-            Properties = model.Properties,
-            RedemptionDate = model.RedemptionDate,
-            ReferenceId = model.ReferenceId,
-            Status = model.Status,
-            Subject = model.Subject,
-            Type = model.Type
+            Id = entity.Id,
+            ApplicationId = entity.ApplicationId,
+            AuthorizationId = entity.AuthorizationId,
+            CreationDate = entity.CreationDate,
+            ExpirationDate = entity.ExpirationDate,
+            Payload = entity.Payload,
+            Properties = entity.Properties,
+            RedemptionDate = entity.RedemptionDate,
+            ReferenceId = entity.ReferenceId,
+            Status = entity.Status,
+            Subject = entity.Subject,
+            Type = entity.Type
         };
+
+        foreach (var extraProperty in entity.ExtraProperties)
+        {
+            model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
+        }
+
+        return model;
     }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenModel.cs

@@ -1,10 +1,11 @@
 using System;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.OpenIddict.Tokens;
 
 [Serializable, IgnoreMultiTenancy]
-public class OpenIddictTokenModel
+public class OpenIddictTokenModel : ExtensibleObject
 {
     public Guid Id { get; set; }