From 1a393653cf47fc03cd222440e0dae9995ce7e455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Skogstad?= Date: Tue, 26 Nov 2024 14:46:34 +0100 Subject: [PATCH] brraaapppppppppp --- .../appsettings.test.json | 10 +----- .../AltinnAuthorizationClient.cs | 31 +++---------------- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/appsettings.test.json b/src/Digdir.Domain.Dialogporten.GraphQL/appsettings.test.json index 3b9341d43..970b290f9 100644 --- a/src/Digdir.Domain.Dialogporten.GraphQL/appsettings.test.json +++ b/src/Digdir.Domain.Dialogporten.GraphQL/appsettings.test.json @@ -59,13 +59,5 @@ } ] } - }, - "Serilog": { - "MinimumLevel": { - "Override": { - "Digdir.Domain.Dialogporten.Infrastructure.Altinn.Authorization.AltinnAuthorizationClient": "Information", - "Digdir.Domain.Dialogporten.GraphQL.EndUser.Queries": "Information" - } - } - }, + } } diff --git a/src/Digdir.Domain.Dialogporten.Infrastructure/Altinn/Authorization/AltinnAuthorizationClient.cs b/src/Digdir.Domain.Dialogporten.Infrastructure/Altinn/Authorization/AltinnAuthorizationClient.cs index b05cf9a15..630305a30 100644 --- a/src/Digdir.Domain.Dialogporten.Infrastructure/Altinn/Authorization/AltinnAuthorizationClient.cs +++ b/src/Digdir.Domain.Dialogporten.Infrastructure/Altinn/Authorization/AltinnAuthorizationClient.cs @@ -1,5 +1,4 @@ using System.Diagnostics; -using System.Reflection; using System.Text.Json; using System.Text.Json.Serialization; using Altinn.Authorization.ABAC.Xacml.JsonProfile; @@ -9,7 +8,6 @@ using Digdir.Domain.Dialogporten.Domain.Dialogs.Entities; using Digdir.Domain.Dialogporten.Domain.Parties.Abstractions; using Digdir.Domain.Dialogporten.Infrastructure.Common.Exceptions; -using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Logging; using ZiggyCreatures.Caching.Fusion; @@ -84,31 +82,9 @@ public async Task GetAuthorizedParties(IPartyIdentifier { var authorizedPartiesRequest = new AuthorizedPartiesRequest(authenticatedParty); - var cacheKey = authorizedPartiesRequest.GenerateCacheKey(); - var authorizedParties = await _partiesCache.GetOrSetAsync(cacheKey, async token + var authorizedParties = await _partiesCache.GetOrSetAsync(authorizedPartiesRequest.GenerateCacheKey(), async token => await PerformAuthorizedPartiesRequest(authorizedPartiesRequest, token), token: cancellationToken); - // Testing https://github.com/digdir/dialogporten/issues/1226 - try - { - var mcaField = typeof(FusionCache).GetField("_mca", BindingFlags.NonPublic | BindingFlags.Instance); - var mcaValue = mcaField?.GetValue(_partiesCache); - var mcField = mcaValue!.GetType().GetField("_cache", BindingFlags.NonPublic | BindingFlags.Instance); - var mcValue = mcField?.GetValue(mcaValue) as IMemoryCache; - - var inMemoryCacheValue = mcValue!.TryGetValue(cacheKey, out var inMemoryCacheEntry); - var inMemoryCacheEntryValue = inMemoryCacheEntry?.GetType().GetProperty("Value")?.GetValue(inMemoryCacheEntry); - - _logger.LogInformation("In memory cache value for {CacheKey}, success: {InMemoryCacheValue} value: {@inMemoryCacheEntryValue}", - cacheKey, inMemoryCacheValue, inMemoryCacheEntryValue); - } - catch (Exception e) - { - _logger.LogError(e, "Failed to reflect on FusionCache MemoryCache"); - } - - _logger.LogInformation("Authorized parties for {Party}: {@AuthorizedParties}", authenticatedParty, authorizedParties); - return flatten ? GetFlattenedAuthorizedParties(authorizedParties) : authorizedParties; } @@ -144,7 +120,10 @@ void Flatten(AuthorizedParty party, AuthorizedParty? parent = null) } if (parent != null) party.ParentParty = parent.Party; - party.SubParties = []; + + // TODO: https://github.com/digdir/dialogporten/issues/1533 + // Disabling this for now, fixes https://github.com/digdir/dialogporten/issues/1226 + // party.SubParties = []; flattenedAuthorizedParties.AuthorizedParties.Add(party); }