Update Lloyds

Author: markm77

src/OpenBanking.Library.Connector/BankProfiles/Generators/LloydsGenerator.cs

@@ -72,21 +72,12 @@ or LloydsBank.BankOfScotlandBusiness
                 LloydsBank.MbnaPersonal => GetFinancialId(LloydsBank.MbnaPersonal),
                 _ => throw new ArgumentOutOfRangeException(nameof(bank), bank, null)
             },
-            bank is not LloydsBank.Sandbox
-                ? new AccountAndTransactionApi
-                {
-                    BaseUrl =
-                        GetAccountAndTransactionV3BaseUrl(bank)
-                }
-                : null,
-            bank is not LloydsBank.Sandbox
-                ? new AccountAndTransactionApi
-                {
-                    ApiVersion = AccountAndTransactionApiVersion.Version4p0,
-                    BaseUrl =
-                        GetApiBaseUrl(bank, "v4.0/aisp")
-                }
-                : null,
+            new AccountAndTransactionApi { BaseUrl = GetApiBaseUrl(bank, "v3.1/aisp") },
+            new AccountAndTransactionApi
+            {
+                ApiVersion = AccountAndTransactionApiVersion.Version4p0,
+                BaseUrl = GetApiBaseUrl(bank, "v4.0/aisp")
+            },
             new PaymentInitiationApi { BaseUrl = GetPaymentsApiBaseUrl(bank, false) },
             new PaymentInitiationApi
             {
@@ -241,11 +232,6 @@ bank is not LloydsBank.Sandbox
             },
             AccountAndTransactionApiSettings = new AccountAndTransactionApiSettings
             {
-                GetFinancialId = useV4NotV3 => useV4NotV3 switch
-                {
-                    true => GetFinancialId(LloydsBank.LloydsPersonal),
-                    false => null
-                },
                 AccountAccessConsentTemplateExternalApiRequestAdjustments = externalApiRequest =>
                 {
                     var elementsToRemove = new List<AccountAndTransactionModelsPublic.Permissions>
@@ -261,10 +247,6 @@ bank is not LloydsBank.Sandbox
                     return externalApiRequest;
                 }
             },
-            PaymentInitiationApiSettings =
-                new PaymentInitiationApiSettings { FinancialId = GetFinancialId(LloydsBank.LloydsPersonal) },
-            VariableRecurringPaymentsApiSettings =
-                new VariableRecurringPaymentsApiSettings { FinancialId = GetFinancialId(LloydsBank.LloydsPersonal) },
             AspspBrandId = bank switch
             {
                 LloydsBank.Sandbox => 10004, // sandbox
@@ -333,31 +315,18 @@ private string GetPaymentsApiBaseUrl(LloydsBank bank, bool useV4NotV3) =>
     {
         LloydsBank.Sandbox => GetPaymentInitiationApiBaseUrl(LloydsBank.Sandbox),
         LloydsBank.LloydsPersonal or LloydsBank.LloydsBusiness or LloydsBank.LloydsCommerical =>
-            $"https://secure-api.lloydsbank.com/prod01/lbg/lyds/open-banking/{suffix}", // from https://developer.lloydsbanking.com/node/4055#post-domestic-payment-consents-3.1.10
+            $"https://secure-api.lloydsbank.com/prod01/lbg/lyds/open-banking/{suffix}", // from https://developer.lloydsbanking.com/node/4045,
+        // https://developer.lloydsbanking.com/node/4055#post-domestic-payment-consents-3.1.10
         LloydsBank.HalifaxPersonal =>
-            $"https://secure-api.halifax.co.uk/prod01/lbg/lyds/open-banking/{suffix}", // from https://developer.lloydsbanking.com/node/4055#post-domestic-payment-consents-3.1.10
+            $"https://secure-api.halifax.co.uk/prod01/lbg/hfx/open-banking/{suffix}", // from https://developer.lloydsbanking.com/node/4045,
+        // https://developer.lloydsbanking.com/node/4055#post-domestic-payment-consents-3.1.10
         LloydsBank.BankOfScotlandPersonal or LloydsBank.BankOfScotlandBusiness
             or LloydsBank.BankOfScotlandCommerical =>
-            $"https://secure-api.bankofscotland.co.uk/prod01/lbg/lyds/open-banking/{suffix}", // from https://developer.lloydsbanking.com/node/4055#post-domestic-payment-consents-3.1.10
+            $"https://secure-api.bankofscotland.co.uk/prod01/lbg/bos/open-banking/{suffix}", // from https://developer.lloydsbanking.com/node/4045,
+        // https://developer.lloydsbanking.com/node/4055#post-domestic-payment-consents-3.1.10
         LloydsBank.MbnaPersonal =>
-            $"https://secure-api.mbna.co.uk/prod01/lbg/lyds/open-banking/{suffix}", // from https://developer.lloydsbanking.com/node/4055#post-domestic-payment-consents-3.1.10
+            $"https://secure-api.mbna.co.uk/prod01/lbg/mbn/open-banking/{suffix}", // from https://developer.lloydsbanking.com/node/4045,
+        // https://developer.lloydsbanking.com/node/4055#post-domestic-payment-consents-3.1.10
         _ => throw new ArgumentOutOfRangeException(nameof(bank), bank, null)
     };
-
-    private static string GetAccountAndTransactionV3BaseUrl(LloydsBank bank) =>
-        bank switch
-        {
-            LloydsBank.Sandbox =>
-                "https://matls.rs.aspsp.sandbox.lloydsbanking.com/open-banking/v3.1.10/aisp", // from API discovery endpoint
-            LloydsBank.LloydsPersonal or LloydsBank.LloydsBusiness or LloydsBank.LloydsCommerical =>
-                "https://secure-api.lloydsbank.com/prod01/lbg/lyds/open-banking/v3.1/aisp", // from https://developer.lloydsbanking.com/node/4045
-            LloydsBank.HalifaxPersonal =>
-                "https://secure-api.halifax.co.uk/prod01/lbg/hfx/open-banking/v3.1/aisp", // from https://developer.lloydsbanking.com/node/4045
-            LloydsBank.BankOfScotlandPersonal or LloydsBank.BankOfScotlandBusiness
-                or LloydsBank.BankOfScotlandCommerical =>
-                "https://secure-api.bankofscotland.co.uk/prod01/lbg/bos/open-banking/v3.1/aisp", // from https://developer.lloydsbanking.com/node/4045
-            LloydsBank.MbnaPersonal =>
-                "https://secure-api.mbna.co.uk/prod01/lbg/mbn/open-banking/v3.1/aisp", // from https://developer.lloydsbanking.com/node/4045
-            _ => throw new ArgumentOutOfRangeException(nameof(bank), bank, null)
-        };
 }

src/OpenBanking.WebApp.Connector/OpenBanking.WebApp.Connector.csproj

@@ -7,7 +7,7 @@
         <UserSecretsId>aa921213-9461-4f9e-8fec-153624ec67ad</UserSecretsId>
         <AssemblyName>FinnovationLabs.OpenBanking.WebApp.Connector</AssemblyName>
         <RootNamespace>FinnovationLabs.OpenBanking.WebApp.Connector</RootNamespace>
-        <Version>16.1.0</Version>
+        <Version>16.1.1</Version>
         <Copyright>Finnovation Labs Limited and Contributors</Copyright>
         <Company>Finnovation Labs Limited</Company>
         <IsPackable>false</IsPackable>