Merge branch 'master' into bugfix-batchpayments

Author: MJMortimer

CoreTests/Integration/Contacts/Find.cs

@@ -28,6 +28,16 @@ public void find_by_id()
             Assert.AreEqual(expected, id);
         }
 
+        [Test]
+        public void find_by_id_list()
+        {
+            var created = Given_a_contact();
+            var contacts = Api.Contacts.Ids(new[] { created.Id }).Find().ToList();
+
+            Assert.AreEqual(1, contacts.Count());
+            Assert.AreEqual(created.Id, contacts.First().Id);
+        }
+
         [Test]
         public void find_by_value()
         {

README.md

@@ -1,5 +1,16 @@
 Xero-Net
 ========
+
+## Looking for OAuth 2.0?
+Please checkout [Xero-NetStandard SDK for OAuth 2.0](https://github.com/XeroAPI/Xero-NetStandard) and it's companion [sample app](https://github.com/XeroAPI/xero-netstandard-oauth2-samples)
+
+## What about updating Xero-Net to OAuth 2.0?
+We are devoting resources towards building and improving our new OAuth 2.0 SDKs which don't share a code base with this library. For those using Xero-Net, you have the option of forking the Xero-Net.
+
+Xero-Net maintenance for OAuth 1.0a
+-----------------------
+We will continue to periodically review pull requests to fix small issues and watch for secruity issues until December 2020.  Maintenance **does not** include adding new features, oauth 2 support or large refactoring of the code base. 
+
 [![xero-api-sdk MyGet Build Status](https://www.myget.org/BuildSource/Badge/xero-api-sdk?identifier=045754d8-de3f-4f0c-960a-ae6e16608e24)](https://www.myget.org/)
 [![Build status](https://ci.appveyor.com/api/projects/status/087ia0i385l506bn/branch/master?svg=true)](https://ci.appveyor.com/project/XeroAPI/xero-net/branch/master)
 

Xero.Api/Common/XeroReadEndpoint.cs

@@ -172,7 +172,8 @@ private IEnumerable<TResult> Get(string endpoint, string child)
                 Client.ModifiedSince = _modifiedSince;
                 Client.Parameters = Parameters;
 
-                return Client.Get<TResult, TResponse>(endpoint + (child ?? string.Empty));
+                var result = Client.Get<TResult, TResponse>(endpoint + (child ?? string.Empty));
+                return result;
             }
             finally
             {

Xero.Api/Core/Endpoints/ContactsEndpoint.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Xero.Api.Common;
 using Xero.Api.Core.Endpoints.Base;
@@ -15,6 +16,7 @@ public interface IContactsEndpoint
     {
         IContactsEndpoint IncludeArchived(bool include);
         ContactCisSetting GetCisSettings(Guid id);
+        IContactsEndpoint Ids(IEnumerable<Guid> ids);
     }
 
     public class ContactsEndpoint
@@ -52,6 +54,13 @@ public override void ClearQueryString()
         {
             base.ClearQueryString();
             Page(1);
+        }
+
+		public IContactsEndpoint Ids(IEnumerable<Guid> ids)
+        {
+            AddParameter("ids", string.Join(",", ids));
+
+            return this;
         }
     }
 }

Xero.Api/Core/Model/Organisation.cs

@@ -54,6 +54,9 @@ public class Organisation
         [DataMember(EmitDefaultValue = false)]
         public int? FinancialYearEndMonth { get; set; }
 
+        [DataMember(EmitDefaultValue = false)]
+        public string EmployerIdentificationNumber { get; set; }
+
         [DataMember(EmitDefaultValue = false)]
         public DateTime? PeriodLockDate { get; set; }
 
@@ -75,12 +78,18 @@ public class Organisation
         [DataMember(EmitDefaultValue = false)]
         public PaymentTerms PaymentTerms { get; set; }
 
-        [DataMember(EmitDefaultValue = false)]
+        [DataMember(Name = "SalesTaxBasis", EmitDefaultValue = false)]
         public SalesTaxBasisType SalesTaxBasisType { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
         public SalesTaxPeriodType SalesTaxPeriod { get; set; }
 
+        [DataMember(EmitDefaultValue = false)]
+        public string DefaultSalesTax { get; set; }
+
+        [DataMember(EmitDefaultValue = false)]
+        public string DefaultPurchasesTax { get; set; }
+
         [DataMember(EmitDefaultValue = false)]
         public List<Address> Addresses { get; set; }
 

Xero.Api/Core/Model/Types/SalesTaxBasisType.cs

@@ -7,8 +7,10 @@ public enum SalesTaxBasisType
     {
         [EnumMember(Value = "NONE")]
         None,
+        [EnumMember(Value = "ACCRUALS")]
+        Accurals=1,
         [EnumMember(Value = "ACCRUAL")]
-        Accural,
+        Accural = 1,
         [EnumMember(Value = "CASH")]
         Cash,
         [EnumMember(Value = "INVOICE")]

Xero.Api/Infrastructure/Http/Response.cs

@@ -15,8 +15,8 @@ internal Response(HttpWebResponse inner)
             StatusCode = inner.StatusCode;
             ContentLength = (int) inner.ContentLength;
             ContentType = inner.ContentType;
-
-            var stream = inner.GetResponseStream();
+			HttpWebRequest.DefaultMaximumErrorResponseLength = ContentLength;
+			var stream = inner.GetResponseStream();
             if (stream != null)
             {
                 Stream = new MemoryStream();

Xero.Api/Infrastructure/RateLimiter/RateLimiter.cs

@@ -31,7 +31,7 @@ public RateLimiter() : this(TimeSpan.FromMinutes(1), 60) { }
         /// </summary>
         public void WaitUntilLimit()
         {
-            while (rateLimiter.Count >= _qty)
+            if (rateLimiter.Count == _qty)
             {
                 var diff = rateLimiter.Peek().Add(_duration) - DateTime.UtcNow;
                 if (diff.TotalMilliseconds > 0)
@@ -47,7 +47,7 @@ public void WaitUntilLimit()
         /// <returns>True if we're over the limit, false if we've got some allocation left</returns>
         public bool CheckLimit()
         {
-            return (rateLimiter.Count >= _qty && rateLimiter.Peek().Add(_duration) > DateTime.UtcNow);
+            return (rateLimiter.Count == _qty && rateLimiter.Peek().Add(_duration) > DateTime.UtcNow);
         }
     }
 }

Xero.Api/Payroll/Australia/Model/Employee.cs

@@ -29,6 +29,9 @@ public class Employee : HasUpdatedDate
 
         [DataMember(EmitDefaultValue = false)]
         public string Gender { get; set; }
+        
+        [DataMember(EmitDefaultValue = false)]
+        public string JobTitle { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
         public HomeAddress HomeAddress { get; set; }

Xero.Api/Xero.Api.csproj

@@ -42,7 +42,7 @@
     <Reference Include="System.Data.Linq" />
     <Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.XML" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Common\IHasAttachment.cs" />