From 7817404531d368073847e36e945551c059366f9f Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Fri, 21 Oct 2022 23:51:21 -0400
Subject: [PATCH] Updated keycloak data seeder for current keycloak library

---
 .../EShopOnAbp.Keycloak.DbMigrator.csproj     |  1 +
 .../KeycloakDataSeeder.cs                     | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/shared/EShopOnAbp.Keycloak.DbMigrator/EShopOnAbp.Keycloak.DbMigrator.csproj b/shared/EShopOnAbp.Keycloak.DbMigrator/EShopOnAbp.Keycloak.DbMigrator.csproj
index a1d4a9e3..f7f9c1ba 100644
--- a/shared/EShopOnAbp.Keycloak.DbMigrator/EShopOnAbp.Keycloak.DbMigrator.csproj
+++ b/shared/EShopOnAbp.Keycloak.DbMigrator/EShopOnAbp.Keycloak.DbMigrator.csproj
@@ -13,6 +13,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\EShopOnAbp.Shared.Hosting\EShopOnAbp.Shared.Hosting.csproj" />
+<!--        <ProjectReference Include="..\..\..\Keycloak.Net\src\Keycloak.Net.Core\Keycloak.Net.Core.csproj" />-->
     </ItemGroup>
 
     <ItemGroup>
diff --git a/shared/EShopOnAbp.Keycloak.DbMigrator/KeycloakDataSeeder.cs b/shared/EShopOnAbp.Keycloak.DbMigrator/KeycloakDataSeeder.cs
index fbc82386..a5d9428d 100644
--- a/shared/EShopOnAbp.Keycloak.DbMigrator/KeycloakDataSeeder.cs
+++ b/shared/EShopOnAbp.Keycloak.DbMigrator/KeycloakDataSeeder.cs
@@ -78,17 +78,17 @@ public class KeyCloakDataSeeder : IDataSeedContributor, ITransientDependency
                         Name = scopeName,
                         Protocol = "openid-connect",
                         _ProtocolMapper = "oidc-audience-mapper",
-                        Config = new Dictionary<string, string>()
-                        {
-                            { "id.token.claim", "false" },
-                            { "access.token.claim", "true" },
-                            { "included.custom.audience", scopeName }
-                        }
-                        // Config = new Config() // This should be dictionary -> Outdated library
+                        // Config = new Dictionary<string, string>() //TODO: Update when //https://github.com/AnderssonPeter/Keycloak.Net/pull/5 is merged
                         // {
-                        //     AccessTokenClaim = "true",
-                        //     IdTokenClaim = "false"
+                        //     { "id.token.claim", "false" },
+                        //     { "access.token.claim", "true" },
+                        //     { "included.custom.audience", scopeName }
                         // }
+                        Config = new Config() // This should be dictionary -> Outdated library
+                        {
+                            AccessTokenClaim = "true",
+                            IdTokenClaim = "false"
+                        }
                     }
                 }
             };
@@ -132,6 +132,7 @@ public class KeyCloakDataSeeder : IDataSeedContributor, ITransientDependency
             };
 
             await _keycloakClient.CreateClientAsync(_keycloakOptions.RealmName, webClient);
+            
             //TODO: Update when //https://github.com/AnderssonPeter/Keycloak.Net/pull/5 is merged
             // await AddOptionalClientScopesAsync(
             //     "PublicWeb",
@@ -217,6 +218,7 @@ public class KeyCloakDataSeeder : IDataSeedContributor, ITransientDependency
             };
 
             await _keycloakClient.CreateClientAsync(_keycloakOptions.RealmName, publicWebClient);
+            
             //TODO: Update when //https://github.com/AnderssonPeter/Keycloak.Net/pull/5 is merged
             // await AddOptionalClientScopesAsync(
             //     "PublicWeb",