From 0fc82bc919cb154ec3a664b4c5967dba2c99ee9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 3 Jan 2018 15:39:56 +0300
Subject: [PATCH] Mapped ClientCorsOrigin

---
 .../Volo/Abp/IdentityServer/Clients/Client.cs          |  2 ++
 .../IdentityServer/Clients/ClientAutoMapperProfile.cs  |  5 +++++
 .../IdentityServer/AbpIdentityServerTestDataBuilder.cs | 10 +++++++++-
 .../Abp/IdentityServer/Clients/ClientStore_Tests.cs    |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/Client.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/Client.cs
index c8809c32fb..1abe965748 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/Client.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/Client.cs
@@ -104,6 +104,8 @@ namespace Volo.Abp.IdentityServer.Clients
         public Client(Guid id)
         {
             Id = id;
+
+            AllowedCorsOrigins = new List<ClientCorsOrigin>();
         }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientAutoMapperProfile.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientAutoMapperProfile.cs
index ccd551b294..fbec0430b8 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientAutoMapperProfile.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientAutoMapperProfile.cs
@@ -7,6 +7,11 @@ namespace Volo.Abp.IdentityServer.Clients
         public ClientAutoMapperProfile()
         {
             CreateMap<Client, IdentityServer4.Models.Client>();
+
+            CreateMap<ClientCorsOrigin, string>()
+                .ConstructUsing(src => src.Origin)
+                .ReverseMap()
+                .ForMember(dest => dest.Origin, opt => opt.MapFrom(src => src));
         }
     }
 }
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 952838c79f..6fc4153dc8 100644
--- a/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
+++ b/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
@@ -1,4 +1,5 @@
-using Volo.Abp.DependencyInjection;
+using System.Collections.Generic;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
 using Volo.Abp.IdentityServer.Clients;
 
@@ -29,6 +30,13 @@ namespace Volo.Abp.IdentityServer
                 ClientId = "42",
                 ProtocolType = "TestProtocol-42"
             };
+
+            client42.AllowedCorsOrigins.Add(
+                new ClientCorsOrigin(_guidGenerator.Create())
+                {
+                    Origin = "Origin1"
+                }
+            );
             
             _clientRepository.Insert(client42);
         }
diff --git a/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/Clients/ClientStore_Tests.cs b/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/Clients/ClientStore_Tests.cs
index 32c5669635..1e154b9bbc 100644
--- a/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/Clients/ClientStore_Tests.cs
+++ b/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/Clients/ClientStore_Tests.cs
@@ -32,6 +32,7 @@ namespace Volo.Abp.IdentityServer.Clients
             client.ShouldNotBeNull();
             client.ClientId.ShouldBe("42");
             client.ProtocolType.ShouldBe("TestProtocol-42");
+            client.AllowedCorsOrigins.ShouldContain("Origin1");
         }
     }
 }