From a03ac02ead93271356c44fca0065d39a564357b8 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:25:41 +0300
Subject: [PATCH] Working on Client aggregate

---
 .../Controllers/IdentityServerTestController.cs             | 2 +-
 .../Volo/Abp/IdentityServer/Clients/ClientScopeConsts.cs    | 2 +-
 .../Volo/Abp/IdentityServer/Clients/Client.cs               | 6 +++---
 .../Volo/Abp/IdentityServer/Clients/ClientScope.cs          | 5 ++---
 .../EntityFrameworkCore/IdentityServerDbContext.cs          | 2 ++
 .../Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs  | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/IdentityServerTestController.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/IdentityServerTestController.cs
index 2ee3b64baa..f51a75597f 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/IdentityServerTestController.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/IdentityServerTestController.cs
@@ -50,7 +50,7 @@ namespace AbpDesk.Web.Mvc.Controllers
 
             client.AddGrantTypes(GrantTypes.ClientCredentials);
             client.AddSecret("secret".Sha256());
-            client.AddAllowedScope(GuidGenerator, "api1"); //TODO: Why not with Id..?
+            client.AddScope("api1");
 
             await _clientRepository.InsertAsync(client);
 
diff --git a/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientScopeConsts.cs b/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientScopeConsts.cs
index 6a5b62e692..9b9d4f8077 100644
--- a/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientScopeConsts.cs
+++ b/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientScopeConsts.cs
@@ -2,6 +2,6 @@
 {
     public class ClientScopeConsts
     {
-        public const int ScopeMaxLength = 200;
+        public const int ScopeMaxLength = 196;
     }
 }
\ No newline at end of file
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 c821afe05f..d3fa6ce923 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
@@ -26,7 +26,7 @@ namespace Volo.Abp.IdentityServer.Clients
 
         public virtual bool RequireClientSecret { get; set; }
 
-        public virtual bool RequireConsent { get; set; } = true;
+        public virtual bool RequireConsent { get; set; }
 
         public virtual bool AllowRememberConsent { get; set; }
 
@@ -159,9 +159,9 @@ namespace Volo.Abp.IdentityServer.Clients
             );
         }
 
-        public virtual void AddAllowedScope(IGuidGenerator guidGenerator, string scope)
+        public virtual void AddScope(string scope)
         {
-            AllowedScopes.Add(new ClientScope(guidGenerator.Create(), Id, scope));
+            AllowedScopes.Add(new ClientScope(Id, scope));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientScope.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientScope.cs
index aa53560d33..a7047dfc48 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientScope.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientScope.cs
@@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.IdentityServer.Clients
 {
-    public class ClientScope : Entity<Guid>
+    public class ClientScope : Entity
     {
         public virtual Guid ClientId { get; protected set; }
 
@@ -14,9 +14,8 @@ namespace Volo.Abp.IdentityServer.Clients
 
         }
 
-        public ClientScope(Guid id, Guid clientId, string scope)
+        protected internal ClientScope(Guid clientId, string scope)
         {
-            Id = id;
             ClientId = clientId;
             Scope = scope;
         }
diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContext.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContext.cs
index 6fe364306a..5d91ee65b7 100644
--- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContext.cs
+++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContext.cs
@@ -113,6 +113,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
             {
                 scope.ToTable(TablePrefix + "ClientScopes");
 
+                scope.HasKey(x => new {x.ClientId, x.Scope});
+
                 scope.Property(x => x.Scope).HasMaxLength(ClientScopeConsts.ScopeMaxLength).IsRequired();
             });
 
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 4beca5bd03..2929fadae5 100644
--- a/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
+++ b/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
@@ -58,7 +58,7 @@ namespace Volo.Abp.IdentityServer
                 }
             );
 
-            client42.AddAllowedScope(_guidGenerator, "api1");
+            client42.AddScope("api1");
 
             _clientRepository.Insert(client42);
         }