FEAT: Adding new environment variables

fmattioli · Jul 7, 2024 · d1230e3 · d1230e3
1 parent 892ec06
commit d1230e3
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 22 deletions.
diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/Program.cs b/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/Program.cs
@@ -1,3 +1,4 @@
+using Newtonsoft.Json;
 using TokenManager.Infra.CrossCutting.Config;
 using TokenManager.Infra.CrossCutting.Extensions;
 using TokenManager.Infra.CrossCutting.Handlers;
@@ -12,6 +13,9 @@
     .AddEnvironmentVariables();
 
 var applicationSettings = builder.Configuration.GetApplicationSettings(builder.Environment);
+
+Console.WriteLine(JsonConvert.SerializeObject(applicationSettings));
+
 builder.Services.AddSingleton<ISettings>(applicationSettings);
 
 builder.Services.AddControllers();

diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/appsettings.Development.json b/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/appsettings.Development.json
@@ -3,14 +3,14 @@
     "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",
+      "ClientId": "",
+      "Resource": "",
+      "AuthServerUrl": "",
       "PolicyName": "TokenManager",
       "Roles": [
         "TokenManager"

diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/appsettings.json b/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/appsettings.json
@@ -1,9 +1,24 @@
 {
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+  "Settings": {
+    "AuthSettings": {
+      "Realms": [
+        {
+          "Name": "smartconsig",
+          "Audience": "smartconsig-api",
+          "Issuer": "https://services-keycloak.ul0sru.easypanel.host/realms/smartconsig"
+        }
+      ],
+      "ClientId": "smartconsig-api",
+      "Resource": "smartconsig-api",
+      "AuthServerUrl": "https://services-keycloak.ul0sru.easypanel.host",
+      "PolicyName": "TokenManager",
+      "Roles": [
+        "TokenManager"
+      ],
+      "Scopes": [
+        "tokenmanager-write",
+        "tokenmanager-read"
+      ]
     }
-  },
-  "AllowedHosts": "*"
+  }
 }
diff --git a/...TokenManager/TokenManager.Infra.CrossCutting/Extensions/ConfigurationBuilderExtensions.cs b/...TokenManager/TokenManager.Infra.CrossCutting/Extensions/ConfigurationBuilderExtensions.cs
@@ -1,5 +1,4 @@
 using Feijuca.Keycloak.MultiTenancy.Services.Models;
-
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using TokenManager.Infra.CrossCutting.Config;
@@ -11,6 +10,23 @@ public static class ConfigurationBuilderExtensions
         public static Settings GetApplicationSettings(this IConfiguration configuration, IHostEnvironment env)
         {
             var settings = configuration.GetSection("Settings").Get<Settings>()!;
+
+            if (!env.IsDevelopment())
+            {
+                settings.AuthSettings.Realms =
+                [
+                    new Realm
+                    { 
+                        Name = GetEnvironmentVariableFromRender("Realm.Name"),
+                        Audience = GetEnvironmentVariableFromRender("Realm.Audience"), 
+                        Issuer = GetEnvironmentVariableFromRender("Realm.Issuer")
+                    }
+                ];
+
+                settings.AuthSettings.AuthServerUrl = GetEnvironmentVariableFromRender("AuthServerUrl");
+                settings.AuthSettings.ClientId = GetEnvironmentVariableFromRender("ClientId");
+                settings.AuthSettings.Resource = GetEnvironmentVariableFromRender("Resource");
+            }
             return settings!;
         }
 

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.0.1" />
+    <PackageReference Include="Feijuca.Keycloak.MultiTenancy" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/TokenManager.IntegrationTests/TokenManager.IntegrationTests.csproj b/tests/TokenManager.IntegrationTests/TokenManager.IntegrationTests.csproj
@@ -10,10 +10,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/TokenManager.UnitTests/TokenManager.UnitTests.csproj b/tests/TokenManager.UnitTests/TokenManager.UnitTests.csproj
@@ -10,10 +10,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>