Merge branch 'release/1.13.0'

Author: nickvandegroes

BunqSdk.Tests/Model/Generated/Endpoint/CardDebitTest.cs

@@ -26,6 +26,7 @@ public class CardDebitTest : BunqSdkTestBase
         private const int NonnegativeIntegerMinimum = 0;
         private const int CardSecondLineLengthMaximum = 20;
         private const string CardTypeMaestro = "MAESTRO";
+        private const string ProductTypeMaestroDebit = "MAESTRO_DEBIT";
 
         /// <summary>
         /// Number constants.
@@ -55,6 +56,7 @@ public void TestOrderNewMaestroCard()
                 GetAnAllowedName(),
                 CardTypeMaestro,
                 GetAlias(),
+                ProductTypeMaestroDebit,
                 allCardPinAssignments
             ).Value;
 

BunqSdk.Tests/Model/Generated/Object/NotificationUrlTest.cs

@@ -212,7 +212,7 @@ public void TestShareInviteBankModel()
         {
             ExecuteNotificationUrlTest(
                 JsonPathShareInviteBankInquiryModel,
-                typeof(ShareInviteBankInquiry),
+                typeof(ShareInviteMonetaryAccountInquiry),
                 GetShareInviteBankInquiry
             );
         }
@@ -222,7 +222,7 @@ public void TestShareInviteBankResponse()
         {
             ExecuteNotificationUrlTest(
                 JsonPathShareInviteBankResponseModel,
-                typeof(ShareInviteBankResponse),
+                typeof(ShareInviteMonetaryAccountResponse),
                 GetShareInviteBankResponse
             );
         }

BunqSdk/BunqSdk.csproj

@@ -8,7 +8,7 @@
     <PackageId>Bunq.Sdk</PackageId>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>1.12.1</VersionPrefix>
+    <VersionPrefix>1.13.0</VersionPrefix>
   </PropertyGroup>
   <PropertyGroup>
     <RootNamespace>Bunq.Sdk</RootNamespace>

BunqSdk/CHANGELOG.md

@@ -64,7 +64,7 @@ public class ApiClient
         /// Values for the default headers
         /// </summary>
         private const string CACHE_CONTROL_NONE = "no-cache";
-        private const string USER_AGENT_BUNQ = "bunq-sdk-csharp/1.12.1";
+        private const string USER_AGENT_BUNQ = "bunq-sdk-csharp/1.13.0";
         private const string LANGUAGE_EN_US = "en_US";
         private const string REGION_NL_NL = "nl_NL";
         private const string GEOLOCATION_ZERO = "0 0 0 0 NL";

BunqSdk/Http/ApiClient.cs

@@ -0,0 +1,208 @@
+using Bunq.Sdk.Context;
+using Bunq.Sdk.Http;
+using Bunq.Sdk.Json;
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Text;
+using System;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// View for requesting Bancontact transactions and polling their status.
+    /// </summary>
+    public class BancontactMerchantTransaction : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/bancontact-merchant-transaction";
+
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/bancontact-merchant-transaction/{2}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/bancontact-merchant-transaction";
+
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_AMOUNT_REQUESTED = "amount_requested";
+
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "BancontactMerchantTransaction";
+
+        /// <summary>
+        /// The requested amount of money to add.
+        /// </summary>
+        [JsonProperty(PropertyName = "amount_requested")]
+        public Amount AmountRequested { get; set; }
+
+        /// <summary>
+        /// The id of the monetary account this bancontact merchant transaction links to.
+        /// </summary>
+        [JsonProperty(PropertyName = "monetary_account_id")]
+        public int? MonetaryAccountId { get; set; }
+
+        /// <summary>
+        /// The alias of the monetary account to add money to.
+        /// </summary>
+        [JsonProperty(PropertyName = "alias")]
+        public MonetaryAccountReference Alias { get; set; }
+
+        /// <summary>
+        /// When the transaction will expire.
+        /// </summary>
+        [JsonProperty(PropertyName = "expiration")]
+        public string Expiration { get; set; }
+
+        /// <summary>
+        /// The URL to visit complete the bancontact transaction.
+        /// </summary>
+        [JsonProperty(PropertyName = "url_redirect")]
+        public string UrlRedirect { get; set; }
+
+        /// <summary>
+        /// The deep link to visit complete the bancontact transaction.
+        /// </summary>
+        [JsonProperty(PropertyName = "url_deep_link")]
+        public string UrlDeepLink { get; set; }
+
+        /// <summary>
+        /// The status of the transaction.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+
+        /// <summary>
+        /// When the status was last updated.
+        /// </summary>
+        [JsonProperty(PropertyName = "status_timestamp")]
+        public string StatusTimestamp { get; set; }
+
+        /// <summary>
+        /// The transaction ID of the bancontact transaction.
+        /// </summary>
+        [JsonProperty(PropertyName = "transaction_id")]
+        public string TransactionId { get; set; }
+
+
+        /// <summary>
+        /// </summary>
+        /// <param name="amountRequested">The requested amount of money to add.</param>
+        public static BunqResponse<int> Create(Amount amountRequested, int? monetaryAccountId = null,
+            IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+
+            var apiClient = new ApiClient(GetApiContext());
+
+            var requestMap = new Dictionary<string, object>
+            {
+                {FIELD_AMOUNT_REQUESTED, amountRequested},
+            };
+
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw =
+                apiClient.Post(
+                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
+                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+
+            return ProcessForId(responseRaw);
+        }
+
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<BancontactMerchantTransaction> Get(int bancontactMerchantTransactionId,
+            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw =
+                apiClient.Get(
+                    string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
+                        bancontactMerchantTransactionId), new Dictionary<string, string>(), customHeaders);
+
+            return FromJson<BancontactMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
+        }
+
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<List<BancontactMerchantTransaction>> List(int? monetaryAccountId = null,
+            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        {
+            if (urlParams == null) urlParams = new Dictionary<string, string>();
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw =
+                apiClient.Get(
+                    string.Format(ENDPOINT_URL_LISTING, DetermineUserId(),
+                        DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+
+            return FromJsonList<BancontactMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
+        }
+
+
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.MonetaryAccountId != null)
+            {
+                return false;
+            }
+
+            if (this.Alias != null)
+            {
+                return false;
+            }
+
+            if (this.AmountRequested != null)
+            {
+                return false;
+            }
+
+            if (this.Expiration != null)
+            {
+                return false;
+            }
+
+            if (this.UrlRedirect != null)
+            {
+                return false;
+            }
+
+            if (this.UrlDeepLink != null)
+            {
+                return false;
+            }
+
+            if (this.Status != null)
+            {
+                return false;
+            }
+
+            if (this.StatusTimestamp != null)
+            {
+                return false;
+            }
+
+            if (this.TransactionId != null)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// </summary>
+        public static BancontactMerchantTransaction CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<BancontactMerchantTransaction>(json);
+        }
+    }
+}

BunqSdk/Model/Generated/Endpoint/BancontactMerchantTransaction.cs

@@ -3,7 +3,6 @@
 using Bunq.Sdk.Json;
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Object;
-using Bunq.Sdk.Security;
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Text;
@@ -33,10 +32,8 @@ public class Card : BunqModel
         public const string FIELD_STATUS = "status";
         public const string FIELD_CARD_LIMIT = "card_limit";
         public const string FIELD_CARD_LIMIT_ATM = "card_limit_atm";
-        public const string FIELD_MAG_STRIPE_PERMISSION = "mag_stripe_permission";
         public const string FIELD_COUNTRY_PERMISSION = "country_permission";
         public const string FIELD_PIN_CODE_ASSIGNMENT = "pin_code_assignment";
-        public const string FIELD_PRIMARY_ACCOUNT_NUMBERS_VIRTUAL = "primary_account_numbers_virtual";
         public const string FIELD_PRIMARY_ACCOUNT_NUMBERS = "primary_account_numbers";
         public const string FIELD_MONETARY_ACCOUNT_ID_FALLBACK = "monetary_account_id_fallback";
 
@@ -78,12 +75,6 @@ public class Card : BunqModel
         [JsonProperty(PropertyName = "card_limit_atm")]
         public Amount CardLimitAtm { get; set; }
 
-        /// <summary>
-        /// DEPRECATED: Whether or not it is allowed to use the mag stripe for the card.
-        /// </summary>
-        [JsonProperty(PropertyName = "mag_stripe_permission")]
-        public CardMagStripePermission MagStripePermission { get; set; }
-
         /// <summary>
         /// The countries for which to grant (temporary) permissions to use the card.
         /// </summary>
@@ -96,12 +87,6 @@ public class Card : BunqModel
         [JsonProperty(PropertyName = "pin_code_assignment")]
         public List<CardPinAssignment> PinCodeAssignment { get; set; }
 
-        /// <summary>
-        /// Array of PANs, status, description and account id for online cards.
-        /// </summary>
-        [JsonProperty(PropertyName = "primary_account_numbers_virtual")]
-        public List<CardVirtualPrimaryAccountNumber> PrimaryAccountNumbersVirtual { get; set; }
-
         /// <summary>
         /// Array of PANs and their attributes.
         /// </summary>
@@ -182,12 +167,6 @@ public class Card : BunqModel
         [JsonProperty(PropertyName = "name_on_card")]
         public string NameOnCard { get; set; }
 
-        /// <summary>
-        /// The last 4 digits of the PAN of the card.
-        /// </summary>
-        [JsonProperty(PropertyName = "primary_account_number_four_digit")]
-        public string PrimaryAccountNumberFourDigit { get; set; }
-
         /// <summary>
         /// The monetary account this card was ordered on and the label user that owns the card.
         /// </summary>
@@ -217,17 +196,13 @@ public class Card : BunqModel
         /// <param name="status">The status to set for the card. Can be ACTIVE, DEACTIVATED, LOST, STOLEN or CANCELLED, and can only be set to LOST/STOLEN/CANCELLED when order status is ACCEPTED_FOR_PRODUCTION/DELIVERED_TO_CUSTOMER/CARD_UPDATE_REQUESTED/CARD_UPDATE_SENT/CARD_UPDATE_ACCEPTED. Can only be set to DEACTIVATED after initial activation, i.e. order_status is DELIVERED_TO_CUSTOMER/CARD_UPDATE_REQUESTED/CARD_UPDATE_SENT/CARD_UPDATE_ACCEPTED. Mind that all the possible choices (apart from ACTIVE and DEACTIVATED) are permanent and cannot be changed after.</param>
         /// <param name="cardLimit">The spending limit for the card.</param>
         /// <param name="cardLimitAtm">The ATM spending limit for the card.</param>
-        /// <param name="magStripePermission">DEPRECATED: Whether or not it is allowed to use the mag stripe for the card.</param>
         /// <param name="countryPermission">The countries for which to grant (temporary) permissions to use the card.</param>
         /// <param name="pinCodeAssignment">Array of Types, PINs, account IDs assigned to the card.</param>
-        /// <param name="primaryAccountNumbersVirtual">Array of PANs, status, description and account id for online cards.</param>
         /// <param name="primaryAccountNumbers">Array of PANs and their attributes.</param>
         /// <param name="monetaryAccountIdFallback">ID of the MA to be used as fallback for this card if insufficient balance. Fallback account is removed if not supplied.</param>
         public static BunqResponse<Card> Update(int cardId, string pinCode = null, string activationCode = null,
             string status = null, Amount cardLimit = null, Amount cardLimitAtm = null,
-            CardMagStripePermission magStripePermission = null, List<CardCountryPermission> countryPermission = null,
-            List<CardPinAssignment> pinCodeAssignment = null,
-            List<CardVirtualPrimaryAccountNumber> primaryAccountNumbersVirtual = null,
+            List<CardCountryPermission> countryPermission = null, List<CardPinAssignment> pinCodeAssignment = null,
             List<CardPrimaryAccountNumber> primaryAccountNumbers = null, int? monetaryAccountIdFallback = null,
             IDictionary<string, string> customHeaders = null)
         {
@@ -242,16 +217,13 @@ public static BunqResponse<Card> Update(int cardId, string pinCode = null, strin
                 {FIELD_STATUS, status},
                 {FIELD_CARD_LIMIT, cardLimit},
                 {FIELD_CARD_LIMIT_ATM, cardLimitAtm},
-                {FIELD_MAG_STRIPE_PERMISSION, magStripePermission},
                 {FIELD_COUNTRY_PERMISSION, countryPermission},
                 {FIELD_PIN_CODE_ASSIGNMENT, pinCodeAssignment},
-                {FIELD_PRIMARY_ACCOUNT_NUMBERS_VIRTUAL, primaryAccountNumbersVirtual},
                 {FIELD_PRIMARY_ACCOUNT_NUMBERS, primaryAccountNumbers},
                 {FIELD_MONETARY_ACCOUNT_ID_FALLBACK, monetaryAccountIdFallback},
             };
 
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            requestBytes = SecurityUtils.Encrypt(GetApiContext(), requestBytes, customHeaders);
             var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), cardId), requestBytes,
                 customHeaders);
 
@@ -353,16 +325,6 @@ public override bool IsAllFieldNull()
                 return false;
             }
 
-            if (this.PrimaryAccountNumberFourDigit != null)
-            {
-                return false;
-            }
-
-            if (this.PrimaryAccountNumbersVirtual != null)
-            {
-                return false;
-            }
-
             if (this.PrimaryAccountNumbers != null)
             {
                 return false;