From d4d45403214609ed09d8039b8e4361b9e09025fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Fri, 20 Mar 2020 11:31:54 +0300
Subject: [PATCH] updated eto

---
 .../Volo/Abp/Identity/IdentityClaimTypeEto.cs        |  4 +---
 .../Volo/Abp/Identity/IdentityRoleEto.cs             |  5 +++--
 .../Volo/Abp/Identity/AbpIdentityDomainModule.cs     | 12 ++++++------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityClaimTypeEto.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityClaimTypeEto.cs
index 794d576ce5..2d0dd4ebfc 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityClaimTypeEto.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityClaimTypeEto.cs
@@ -6,9 +6,7 @@ namespace Volo.Abp.Identity
     public class IdentityClaimTypeEto
     {
         public Guid Id { get; set; }
-
-        public Guid? TenantId { get; set; }
-
+        
         public string Name { get; set; }
 
         public bool Required { get; set; }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityRoleEto.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityRoleEto.cs
index 3247b86691..ea10f1e41c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityRoleEto.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityRoleEto.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace Volo.Abp.Identity
 {
@@ -12,11 +13,11 @@ namespace Volo.Abp.Identity
         public string Name { get; set; }
 
         public string NormalizedName { get; set; }
-
+        
         public bool IsDefault { get; set; }
 
         public bool IsStatic { get; set; }
-
+        
         public bool IsPublic { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
index 4bcd2ee234..38955de588 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
@@ -19,18 +19,18 @@ namespace Volo.Abp.Identity
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            Configure<AbpAutoMapperOptions>(options =>
+            {
+                options.AddProfile<IdentityDomainMappingProfile>();
+            });
+
             Configure<AbpDistributedEventBusOptions>(options =>
             {
                 options.EtoMappings.Add<IdentityUser, UserEto>();
                 options.EtoMappings.Add<IdentityClaimType, IdentityClaimTypeEto>();
                 options.EtoMappings.Add<IdentityRole, IdentityRoleEto>();
             });
-
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<IdentityDomainMappingProfile>(validate: true);
-            });
-
+            
             var identityBuilder = context.Services.AddAbpIdentity(options =>
             {
                 options.User.RequireUniqueEmail = true;