Feature/accounts api v2 (#11)

* Generated API v2

* chore: Update JWK retrieval logic in ApplicationSettings

* commit again

* onlyprimaryowner=false, fixed flatfile etc

---------

Co-authored-by: Nikolai Maasø Lunde <nikolai.maaso.lunde@digdir.no>

src/Altinn.Dan.Plugin.Banking/Altinn.Dan.Plugin.Banking.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Altinn.ApiClients.Maskinporten" Version="9.1.0" />
-    <PackageReference Include="Azure.Identity" Version="1.11.3" />
+    <PackageReference Include="Azure.Identity" Version="1.11.4" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
     <PackageReference Include="Dan.Common" Version="1.5.0" />
     <PackageReference Include="FileHelpers" Version="3.5.2" />
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.6" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.6" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.6.0" />
-    <PackageReference Include="NJsonSchema" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema" Version="11.0.1" />
     <PackageReference Include="Polly" Version="8.4.0" />
     <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
     <PackageReference Include="Polly.Caching.Distributed" Version="3.0.1" />

src/Altinn.Dan.Plugin.Banking/Clients/KARClient.cs

@@ -89,6 +89,8 @@ public async System.Threading.Tasks.Task<ListCustomerRelation> GetCustomerRelati
             {
                 urlBuilder_.Append(System.Uri.EscapeDataString("toDate") + "=").Append(System.Uri.EscapeDataString(ConvertToString(toDate, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
             }
+
+            urlBuilder_.Append(System.Uri.EscapeDataString("onlyPrimaryOwner") + "=").Append(System.Uri.EscapeDataString(ConvertToString(false, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
             urlBuilder_.Length--;
 
             var client_ = _httpClient;
@@ -111,7 +113,6 @@ public async System.Threading.Tasks.Task<ListCustomerRelation> GetCustomerRelati
                         request_.Headers.TryAddWithoutValidation("AccountInfoRequestID", ConvertToString(accountInfoRequestID, System.Globalization.CultureInfo.InvariantCulture));
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
-
                     PrepareRequest(client_, request_, urlBuilder_);
 
                     var url_ = urlBuilder_.ToString();

src/Altinn.Dan.Plugin.Banking/Clients/V2/Bankv2.cs

@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Sockets;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using Jose;
+
+namespace Altinn.Dan.Plugin.Banking.Clients.V2;
+public partial class Bank_v2
+{
+    public X509Certificate2 DecryptionCertificate { get; set; }
+
+    /// <summary>
+    /// The bank sends a encrypted payload, use the ProcessResponse-mechanism to decrypt before further processing
+    /// </summary>
+    /// <param name="client">Http client</param>
+    /// <param name="response">Response from bank</param>
+    // ReSharper disable once UnusedParameterInPartialMethod
+    partial void ProcessResponse(HttpClient client, HttpResponseMessage response)
+    {
+        var Aa = 1;
+
+
+        if (!response.IsSuccessStatusCode)
+            return;
+
+        bool isAppJose = false;
+
+        if (response.Headers.TryGetValues("content-type", out IEnumerable<string?> headervalues))
+        {
+            isAppJose = headervalues.Any(x => x == "application/jose");
+        }
+
+        var jwt = response.Content.ReadAsStringAsync().Result;
+        var decryptedContent =
+            JWT.Decode(jwt,
+                DecryptionCertificate
+                    .GetRSAPrivateKey()); //, JweAlgorithm.RSA_OAEP_256, JweEncryption.A128CBC_HS256);
+
+        response.Content = new StringContent(decryptedContent, Encoding.UTF8);
+    }
+
+    partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url)
+    {
+        var a = url;
+    }
+}

src/Altinn.Dan.Plugin.Banking/Config/ApplicationSettings.cs

@@ -9,6 +9,8 @@ public class ApplicationSettings
         private static X509Certificate2 _altinnCertificate;
         private static X509Certificate2 _oedDecryptCert;
 
+        public static string BankingJwkName { get; set; }
+
         public ApplicationSettings()
         {
             ApplicationConfig = this;
@@ -64,9 +66,26 @@ public X509Certificate2 OedDecryptCert
 
         public bool UseProxy { get; set; }
 
+
         public string EndpointsResourceFile { get; set; }
 
         public bool UseTestEndpoints { get; set; }
 
+        public string _jwk
+        {
+            get; set;
+        }
+
+        public string Jwk
+        {
+            get
+            {
+                return _jwk ?? new PluginKeyVault(KeyVaultName).Get(BankingJwkName).Result;
+            }
+            set
+            {
+                _jwk = value;
+            }
+        }
     }
 }

src/Altinn.Dan.Plugin.Banking/Models/BankResponse.cs

@@ -1,7 +1,10 @@
-using Altinn.Dan.Plugin.Banking.Clients;
 using System;
 using System.Collections.Generic;
-
+using Altinn.Dan.Plugin.Banking.Clients.V2;
+using AccountDetail = Altinn.Dan.Plugin.Banking.Clients.AccountDetail;
+using Transaction = Altinn.Dan.Plugin.Banking.Clients.Transaction;
+using AccountDetailV2 = Altinn.Dan.Plugin.Banking.Clients.V2.AccountDetail;
+using TransactionV2 = Altinn.Dan.Plugin.Banking.Clients.V2.Transaction;
 namespace Altinn.Dan.Plugin.Banking.Models
 {
     public class BankResponse
@@ -25,4 +28,13 @@ public class Account
         public decimal AccountAvailableBalance { get; set; }
         public decimal AccountBookedBalance { get; set; }
     }
+
+    public class AccountV2
+    {
+        public string AccountNumber { get; set; } // Seperate property by now. Copy of AccountDetail.AccountIdentifier
+        public AccountDetailV2 AccountDetail { get; set; } // Not mapped to internal by now
+        public ICollection<TransactionV2> Transactions { get; set; } // Not mapped to internal by now
+        public decimal AccountAvailableBalance { get; set; }
+        public decimal AccountBookedBalance { get; set; }
+    }
 }

src/Altinn.Dan.Plugin.Banking/Models/Endpoints.cs

@@ -16,6 +16,7 @@ public class EndpointV2
         public string OrgNummer { get; set; }
 
         [FieldOptional]
+        [FieldQuoted(QuoteMode.OptionalForBoth)]
         public string Navn { get; set; }
 
         [FieldOptional]