From e94b88910fc904409e51a338747419ee96af9e5b Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Thu, 28 Dec 2023 14:27:32 -0500
Subject: [PATCH] Removed administration client credential

---
 .../AdministrationServiceHttpApiHostModule.cs            | 2 --
 .../AdministrationServiceDataSeedContributor.cs          | 6 +++---
 .../EShopOnAbp.AdministrationService.HttpApi.Host.csproj | 1 -
 .../appsettings.json                                     | 9 ---------
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/AdministrationServiceHttpApiHostModule.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/AdministrationServiceHttpApiHostModule.cs
index 3edaeded..bc61eb04 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/AdministrationServiceHttpApiHostModule.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/AdministrationServiceHttpApiHostModule.cs
@@ -11,7 +11,6 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp;
-using Volo.Abp.Http.Client.IdentityModel.Web;
 using Volo.Abp.Identity;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement;
@@ -24,7 +23,6 @@ namespace EShopOnAbp.AdministrationService;
     typeof(AdministrationServiceApplicationModule),
     typeof(AdministrationServiceEntityFrameworkCoreModule),
     typeof(EShopOnAbpSharedHostingMicroservicesModule),
-    typeof(AbpHttpClientIdentityModelWebModule),
     typeof(AbpIdentityHttpApiClientModule)
 )]
 public class AdministrationServiceHttpApiHostModule : AbpModule
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDataSeedContributor.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDataSeedContributor.cs
index 8305b2ae..31c9adb3 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDataSeedContributor.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDataSeedContributor.cs
@@ -26,8 +26,8 @@ public class AdministrationServiceDataSeedContributor : IDataSeedContributor, IT
 
     private async Task SeedClientCredentialPermissionsAsync()
     {
-        await _permissionManager.SetAsync(IdentityUsersDefaultPermission, ClientPermissionValueProvider.ProviderName, "EShopOnAbp_AdministrationService", true);
-        await _permissionManager.SetAsync(IdentityUsersDefaultPermission, ClientPermissionValueProvider.ProviderName, "EShopOnAbp_CmskitService", true);
-        await _permissionManager.SetAsync(IdentityUsersLookupPermission, ClientPermissionValueProvider.ProviderName, "EShopOnAbp_CmskitService", true);
+        // await _permissionManager.SetAsync(IdentityUsersDefaultPermission, ClientPermissionValueProvider.ProviderName, "EShopOnAbp_AdministrationService", true);
+        // await _permissionManager.SetAsync(IdentityUsersDefaultPermission, ClientPermissionValueProvider.ProviderName, "EShopOnAbp_CmskitService", true);
+        // await _permissionManager.SetAsync(IdentityUsersLookupPermission, ClientPermissionValueProvider.ProviderName, "EShopOnAbp_CmskitService", true);
     }
 }
\ No newline at end of file
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj
index b4319e90..394141c4 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj
@@ -13,7 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="8.0.0" />
     <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.0.0" />
   </ItemGroup>
 
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/appsettings.json b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/appsettings.json
index 361ecb0a..209e7ac4 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/appsettings.json
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/appsettings.json
@@ -15,15 +15,6 @@
       "UseCurrentAccessToken": "false"
     }
   },
-  "IdentityClients": {
-    "Default": {
-      "GrantType": "client_credentials",
-      "ClientId": "EShopOnAbp_AdministrationService",
-      "ClientSecret": "1q2w3e*",
-      "Authority": "http://localhost:8080/realms/master",
-      "Scope": "IdentityService"
-    }
-  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",