FEAT: Adding new logic to use methods from IAuthService

fmattioli · Jul 7, 2024 · e24b642 · e24b642
1 parent c615c64
commit e24b642
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 28 deletions.
diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/Program.cs b/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/Program.cs
@@ -16,6 +16,7 @@
     .AddEnvironmentVariables();
 
 var applicationSettings = builder.Configuration.GetApplicationSettings(builder.Environment);
+Console.WriteLine(applicationSettings);
 
 builder.Services.AddSingleton<ISettings>(applicationSettings);
 

diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/appsettings.json b/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/appsettings.json
@@ -3,14 +3,15 @@
     "AuthSettings": {
       "Realms": [
         {
-          "Name": "smartconsig",
-          "Audience": "smartconsig-api",
-          "Issuer": "https://services-keycloak.ul0sru.easypanel.host/realms/smartconsig"
+          "Name": "",
+          "Audience": "",
+          "Issuer": ""
         }
       ],
-      "ClientId": "smartconsig-api",
-      "Resource": "smartconsig-api",
-      "AuthServerUrl": "https://services-keycloak.ul0sru.easypanel.host",
+      "ClientSecret": "",
+      "ClientId": "",
+      "Resource": "",
+      "AuthServerUrl": "",
       "PolicyName": "TokenManager",
       "Roles": [
         "TokenManager"

diff --git a/...Keycloak.TokenManager/TokenManager.Infra.CrossCutting/Extensions/RepositoriesExtension.cs b/...Keycloak.TokenManager/TokenManager.Infra.CrossCutting/Extensions/RepositoriesExtension.cs
@@ -1,6 +1,11 @@
-using Feijuca.Keycloak.MultiTenancy.Services.Models;
+using Feijuca.Keycloak.MultiTenancy.Services;
+using Feijuca.Keycloak.MultiTenancy.Services.Models;
 using Microsoft.Extensions.DependencyInjection;
+
+using System;
+
 using TokenManager.Domain.Interfaces;
+using TokenManager.Infra.Data.Models;
 using TokenManager.Infra.Data.Repositories;
 
 namespace TokenManager.Infra.CrossCutting.Extensions
@@ -13,9 +18,20 @@ public static IServiceCollection AddRepositories(this IServiceCollection service
             {
                 client.BaseAddress = new Uri(authSettings.AuthServerUrl!);
             });
-
 
             services.AddScoped<IUserRepository, UserRepository>();
+
+            var serviceProvider = services.BuildServiceProvider();
+            var authService = serviceProvider.GetRequiredService<IAuthService>();
+
+            var tokenCredentials = new TokenCredentials()
+            {
+                Client_Secret = authService.GetClientSecret(),
+                Client_Id = authService.GetClientId(),
+                ServerUrl = authService.GetServerUrl()
+            };
+
+            services.AddSingleton(tokenCredentials);
             return services;
         }
     }

diff --git a/...nager.Domain/Entities/TokenCredentials.cs → ...ger.Infra.Data/Models/TokenCredentials.cs b/...nager.Domain/Entities/TokenCredentials.cs → ...ger.Infra.Data/Models/TokenCredentials.cs
@@ -1,9 +1,8 @@
-namespace TokenManager.Domain.Entities
+namespace TokenManager.Infra.Data.Models
 {
     public class TokenCredentials
     {
         public string ServerUrl { get; set; } = null!;
-        public string Grant_Type { get; set; } = null!;
         public string Client_Secret { get; set; } = null!;
         public string Client_Id { get; set; } = null!;
     }

diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Infra.Data/Repositories/UserRepository.cs b/src/Feijuca.Keycloak.TokenManager/TokenManager.Infra.Data/Repositories/UserRepository.cs
@@ -7,18 +7,19 @@
 using TokenManager.Domain.Entities;
 using TokenManager.Domain.Errors;
 using TokenManager.Domain.Interfaces;
+using TokenManager.Infra.Data.Models;
 
 namespace TokenManager.Infra.Data.Repositories
 {
-    public class UserRepository(IHttpClientFactory httpClientFactory, IAuthService authService) : IUserRepository
+    public class UserRepository(IHttpClientFactory httpClientFactory, IAuthService authService, TokenCredentials tokenCredentials) : IUserRepository
     {
         private readonly IHttpClientFactory _httpClientFactory = httpClientFactory;
         private readonly IAuthService _authService = authService;
-        private readonly TokenCredentials tokenCredentials = new()
+        private readonly TokenCredentials _tokenCredentials = tokenCredentials;
+        private static readonly JsonSerializerSettings Settings = new()
         {
-            Grant_Type = "client_credentials",                  //TODO: Create environmnet variable
-            Client_Secret = "qSGxtu0CFOmZ6Yzr5ntPK2iXppmKeerS", //TODO: Create environmnet variable
-            Client_Id = "smartconsig-api"                       //TODO: Create environmnet variable
+            ContractResolver = new CamelCasePropertyNamesContractResolver(),
+            NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore
         };
 
         public async Task<Result> CreateUserAsync(string tenant, User user)
@@ -37,13 +38,7 @@ public async Task<Result> CreateUserAsync(string tenant, User user)
                     .AppendPathSegment(tenant)
                     .AppendPathSegment("users");
 
-                var settings = new JsonSerializerSettings
-                {
-                    ContractResolver = new CamelCasePropertyNamesContractResolver(),
-                    NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore
-                };
-
-                var json = JsonConvert.SerializeObject(user, settings);
+                var json = JsonConvert.SerializeObject(user, Settings);
                 StringContent httpContent = new(json, Encoding.UTF8, "application/json");
                 var response = await client.PostAsync(url, httpContent);
 
@@ -63,11 +58,12 @@ public async Task<Result> CreateUserAsync(string tenant, User user)
         public async Task<Result<TokenDetails>> GetAccessTokenAsync(string tenant)
         {
             var client = _httpClientFactory.CreateClient("KeycloakClient");
+
             var requestData = new FormUrlEncodedContent(
             [
-                new KeyValuePair<string, string>("grant_type", tokenCredentials.Grant_Type),
-                new KeyValuePair<string, string>("client_id", tokenCredentials.Client_Id),
-                new KeyValuePair<string, string>("client_secret", tokenCredentials.Client_Secret),
+                new KeyValuePair<string, string>("grant_type", "client_credentials"),
+                new KeyValuePair<string, string>("client_id", _tokenCredentials.Client_Id),
+                new KeyValuePair<string, string>("client_secret", _tokenCredentials.Client_Secret),
             ]);
 
             var url = client.BaseAddress
@@ -97,8 +93,8 @@ public async Task<Result<TokenDetails>> LoginAsync(User user)
             var requestData = new FormUrlEncodedContent(
             [
                 new KeyValuePair<string, string>("grant_type", "password"),
-                new KeyValuePair<string, string>("client_id", tokenCredentials.Client_Id),
-                new KeyValuePair<string, string>("client_secret", tokenCredentials.Client_Secret),
+                new KeyValuePair<string, string>("client_id", _tokenCredentials.Client_Id),
+                new KeyValuePair<string, string>("client_secret", _tokenCredentials.Client_Secret),
                 new KeyValuePair<string, string>("username", user.Username!),
                 new KeyValuePair<string, string>("password", user.Password!),
                 new KeyValuePair<string, string>("scope", "tokenmanager-write tokenmanager-read"),

diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Infra.Data/TokenManager.Infra.Data.csproj b/src/Feijuca.Keycloak.TokenManager/TokenManager.Infra.Data/TokenManager.Infra.Data.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Feijuca.Keycloak.MultiTenancy" Version="1.1.0" />
+    <PackageReference Include="Feijuca.Keycloak.MultiTenancy" Version="1.3.0" />
   </ItemGroup>
 
   <ItemGroup>