From 9614530e9000371166fff495eaf9d22eb47c725f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 31 Jan 2018 11:19:14 +0300
Subject: [PATCH] Revised IdentityResource class.

---
 .../IdentityResources/IdentityResource.cs     | 27 +++++++++++++++----
 .../AbpIdentityServerTestDataBuilder.cs       |  5 +---
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResource.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResource.cs
index 5ba0b10c24..e3628ffa14 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResource.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResource.cs
@@ -7,19 +7,19 @@ namespace Volo.Abp.IdentityServer.IdentityResources
 {
     public class IdentityResource : AggregateRoot<Guid>
     {
-        public virtual bool Enabled { get; set; } = true;
-
         public virtual string Name { get; set; }
 
         public virtual string DisplayName { get; set; }
 
         public virtual string Description { get; set; }
 
+        public virtual bool Enabled { get; set; }
+
         public virtual bool Required { get; set; }
 
         public virtual bool Emphasize { get; set; }
 
-        public virtual bool ShowInDiscoveryDocument { get; set; } = true;
+        public virtual bool ShowInDiscoveryDocument { get; set; }
 
         public virtual List<IdentityClaim> UserClaims { get; set; }
 
@@ -28,10 +28,27 @@ namespace Volo.Abp.IdentityServer.IdentityResources
 
         }
 
-        public IdentityResource(Guid id)
+        public IdentityResource(
+            Guid id, 
+            [NotNull] string name, 
+            string displayName = null, 
+            string description = null, 
+            bool enabled = true, 
+            bool required = false, 
+            bool emphasize = false, 
+            bool showInDiscoveryDocument = true)
         {
-            Id = id;
+            Check.NotNull(name, nameof(name));
 
+            Id = id;
+            Name = name;
+            DisplayName = displayName;
+            Description = description;
+            Enabled = enabled;
+            Required = required;
+            Emphasize = emphasize;
+            ShowInDiscoveryDocument = showInDiscoveryDocument;
+            
             UserClaims = new List<IdentityClaim>();
         }
 
diff --git a/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs b/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
index d284dce4f9..4beca5bd03 100644
--- a/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
+++ b/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
@@ -120,14 +120,11 @@ namespace Volo.Abp.IdentityServer
 
         private void AddIdentityResources()
         {
-            var identityResource = new IdentityResource(_guidGenerator.Create())
+            var identityResource = new IdentityResource(_guidGenerator.Create(), "Test-Identity-Resource-Name-1")
             {
-                Enabled = true,
                 Description = "Test-Identity-Resource-Description-1",
                 DisplayName = "Test-Identity-Resource-DisplayName-1",
-                Name = "Test-Identity-Resource-Name-1",
                 Required = true,
-                ShowInDiscoveryDocument = true,
                 Emphasize = true
             };