From 5edde96be4693250bd4d88caf4c8cf19e1509e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 9 Jan 2018 17:57:51 +0300
Subject: [PATCH] Refactored.

---
 .../AbpIdentityServerDomainModule.cs          |  3 ---
 .../ApiResources/ApiAndIdentityResources.cs   | 18 +++++++++++++++
 .../ApiResources/ApiResources.cs              | 23 -------------------
 .../IIdentityResourceRepository.cs            |  2 +-
 .../IdentityResourceStore.cs                  |  8 +++----
 .../IdentityResourceRepository.cs             |  4 ++--
 6 files changed, 25 insertions(+), 33 deletions(-)
 create mode 100644 src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiAndIdentityResources.cs
 delete mode 100644 src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiResources.cs

diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
index 884979ade4..da9160dc5f 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
@@ -2,7 +2,6 @@
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Identity;
 using Volo.Abp.IdentityServer.Clients;
-using Volo.Abp.IdentityServer.Temp;
 using Volo.Abp.Modularity;
 using Volo.Abp.Security;
 
@@ -33,8 +32,6 @@ namespace Volo.Abp.IdentityServer
 
             //TODO: Remove in-memory stores once EF Core stores are fully completed.
             identityServerBuilder.AddDeveloperSigningCredential()
-                //.AddInMemoryClients(IdentityServerConfig.GetClients())
-                //.AddInMemoryApiResources(IdentityServerConfig.GetApiResources())
                 .AddAbpIdentityServer();
 
             services.ExecutePreConfiguredActions(identityServerBuilder);
diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiAndIdentityResources.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiAndIdentityResources.cs
new file mode 100644
index 0000000000..5d71532dba
--- /dev/null
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiAndIdentityResources.cs
@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using Volo.Abp.IdentityServer.IdentityResources;
+
+namespace Volo.Abp.IdentityServer.ApiResources
+{
+    public class ApiAndIdentityResources
+    {
+        public Task<IdentityResource[]> IdentityResources { get; set; }
+
+        public Task<ApiResource[]> ApiResources { get; set; }
+
+        public ApiAndIdentityResources(Task<IdentityResource[]> identityResources, Task<ApiResource[]> apiResources)
+        {
+            IdentityResources = identityResources;
+            ApiResources = apiResources;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiResources.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiResources.cs
deleted file mode 100644
index b3fc51ddc0..0000000000
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiResources.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.IdentityServer.IdentityResources;
-
-namespace Volo.Abp.IdentityServer.ApiResources
-{
-    public class ApiResources
-    {
-        public Task<IdentityResource[]> Resources { get; set; }
-
-        public Task<ApiResource[]> IdentityResources { get; set; }
-
-        public ApiResources()
-        {
-
-        }
-
-        public ApiResources(Task<IdentityResource[]> resources, Task<ApiResource[]> identityResources)
-        {
-            Resources = resources;
-            IdentityResources = identityResources;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IIdentityResourceRepository.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IIdentityResourceRepository.cs
index 277e917375..94b86754da 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IIdentityResourceRepository.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IIdentityResourceRepository.cs
@@ -13,6 +13,6 @@ namespace Volo.Abp.IdentityServer.IdentityResources
 
         Task<ApiResource> FindApiResourceAsync(string name);
 
-        Task<ApiResources.ApiResources> GetAllResourcesAsync();
+        Task<ApiResources.ApiAndIdentityResources> GetAllResourcesAsync();
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResourceStore.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResourceStore.cs
index e1f15844b8..abdcec5354 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResourceStore.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResourceStore.cs
@@ -40,10 +40,10 @@ namespace Volo.Abp.IdentityServer.IdentityResources
         public virtual async Task<Resources> GetAllResourcesAsync()
         {
             var result = await _identityResourceRepository.GetAllResourcesAsync();
-            return new Resources
-            (
-                result.Resources.Result.Select(y => _objectMapper.Map<IdentityResource, IdentityServer4.Models.IdentityResource>(y)),
-                result.IdentityResources.Result.Select(x => _objectMapper.Map<ApiResources.ApiResource, ApiResource>(x))
+
+            return new Resources(
+                result.IdentityResources.Result.Select(y => _objectMapper.Map<IdentityResource, IdentityServer4.Models.IdentityResource>(y)),
+                result.ApiResources.Result.Select(x => _objectMapper.Map<ApiResources.ApiResource, ApiResource>(x))
             );
         }
     }
diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResourceRepository.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResourceRepository.cs
index 91326dd523..98585fac41 100644
--- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResourceRepository.cs
+++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResourceRepository.cs
@@ -59,7 +59,7 @@ namespace Volo.Abp.IdentityServer
             return apis.FirstOrDefaultAsync();
         }
 
-        public Task<ApiResources.ApiResources> GetAllResourcesAsync()
+        public Task<ApiResources.ApiAndIdentityResources> GetAllResourcesAsync()
         {
             var identity = DbContext.IdentityResources
                 .Include(x => x.UserClaims);
@@ -70,7 +70,7 @@ namespace Volo.Abp.IdentityServer
                 .ThenInclude(s => s.UserClaims)
                 .Include(x => x.UserClaims);
 
-            return Task.FromResult(new ApiResources.ApiResources(identity.ToArrayAsync(), apis.ToArrayAsync()));
+            return Task.FromResult(new ApiResources.ApiAndIdentityResources(identity.ToArrayAsync(), apis.ToArrayAsync()));
         }
     }
 }