Skip to content

Commit

Permalink
add identity
Browse files Browse the repository at this point in the history
  • Loading branch information
andreasisnes committed Sep 29, 2024
1 parent e419f72 commit 506a176
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions infra/modules/container_app_api/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ resource "azurerm_container_app" "app" {

container {
env {
name = "EntraId__UserAssignedIdentities__PostgresAdmin__ClientId"
name = "EntraId__Identities__PostgresAdmin__ClientId"
value = data.azurerm_user_assigned_identity.postgres_admin.client_id
}
env {
name = "EntraId__UserAssignedIdentities__Service__ClientId"
name = "EntraId__Identities__Service__ClientId"
value = azurerm_user_assigned_identity.app.client_id
}
env {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
using Microsoft.Extensions.Configuration.AzureAppConfiguration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Identity.Client;

namespace Altinn.Authorization.Configuration.Extensions;

Expand Down Expand Up @@ -44,11 +46,16 @@ public static IHostApplicationBuilder AddAltinnAppConfiguration<TAppSettings>(th
/// <returns>The configured instance of <see cref="WebApplicationBuilder"/> for method chaining.</returns>
public static IHostApplicationBuilder AddAltinnAppConfiguration(this IHostApplicationBuilder builder, Action<AltinnAppConfigurationOptions> configureOptions = null)
{
var logger = LoggerFactory.Create(builder => builder.AddConsole()).CreateLogger("AppConfig");
var altinnAppSettings = new AltinnAppSettings(builder.Configuration);

logger.LogInformation("Using Client {clientid}", altinnAppSettings.EntraId.Identities.Service.ClientId);
builder.Services.AddOptions();
builder.Services.Configure<AltinnAppSettings>(builder.Configuration.Bind);
builder.Configuration.AddAzureAppConfiguration(opts =>
{
var options = new AltinnAppConfigurationOptions(configureOptions);
var altinnAppSettings = new AltinnAppSettings(builder.Configuration);
Console.WriteLine(altinnAppSettings.EntraId.Identities.Service.ClientId);

opts.Connect(altinnAppSettings.AppConfiguration.Endpoint, altinnAppSettings.EntraId.Identities.Service.TokenCredential);
opts.ConfigureKeyVault(keyvault => keyvault.SetCredential(altinnAppSettings.EntraId.Identities.Service.TokenCredential));
Expand All @@ -70,9 +77,6 @@ public static IHostApplicationBuilder AddAltinnAppConfiguration(this IHostApplic
}
});

builder.Services.AddOptions();
builder.Services.Configure<AltinnAppSettings>(builder.Configuration.Bind);

return builder;
}
}

0 comments on commit 506a176

Please sign in to comment.