Due to api serialisation, must use LdapDn rather than LdapDN (the lat…

…ter turns into ldap_d_n instead of ldap_dn)

Get rid of LdapTeam and LdapUser, the regular Team and User objects contain ldap_dn field if LDAP sync is enabled

Octokit.Reactive/Clients/Enterprise/IObservableEnterpriseLdapClient.cs

@@ -21,8 +21,8 @@ public interface IObservableEnterpriseLdapClient
         /// </remarks>
         /// <param name="userName">The username to update LDAP mapping</param>
         /// <param name="newLdapMapping">The <see cref="NewLdapMapping"/></param>
-        /// <returns>The <see cref="LdapUser"/> object.</returns>
-        IObservable<LdapUser> UpdateUserMapping(string userName, NewLdapMapping newLdapMapping);
+        /// <returns>The <see cref="User"/> object.</returns>
+        IObservable<User> UpdateUserMapping(string userName, NewLdapMapping newLdapMapping);
 
         /// <summary>
         /// Queue an LDAP Sync job for a user on a GitHub Enterprise appliance (must be Site Admin user).
@@ -31,7 +31,7 @@ public interface IObservableEnterpriseLdapClient
         /// https://developer.github.com/v3/enterprise/ldap/#sync-ldap-mapping-for-a-user
         /// </remarks>
         /// <param name="userName">The username to sync LDAP mapping</param>
-        /// <returns>The <see cref="HttpStatusCode"/> of the queue request.</returns>
+        /// <returns>The <see cref="LdapSyncResponse"/> of the queue request.</returns>
         IObservable<LdapSyncResponse> QueueSyncUserMapping(string userName);
 
         /// <summary>
@@ -42,8 +42,8 @@ public interface IObservableEnterpriseLdapClient
         /// </remarks>
         /// <param name="teamId">The teamId to update LDAP mapping</param>
         /// <param name="newLdapMapping">The <see cref="NewLdapMapping"/></param>
-        /// <returns>The <see cref="LdapTeam"/> object.</returns>
-        IObservable<LdapTeam> UpdateTeamMapping(int teamId, NewLdapMapping newLdapMapping);
+        /// <returns>The <see cref="Team"/> object.</returns>
+        IObservable<Team> UpdateTeamMapping(int teamId, NewLdapMapping newLdapMapping);
 
         /// <summary>
         /// Queue an LDAP Sync job for a team on a GitHub Enterprise appliance (must be Site Admin user).
@@ -52,7 +52,7 @@ public interface IObservableEnterpriseLdapClient
         /// https://developer.github.com/v3/enterprise/ldap/#sync-ldap-mapping-for-a-team
         /// </remarks>
         /// <param name="teamId">The teamId to update LDAP mapping</param>
-        /// <returns>The <see cref="HttpStatusCode"/> of the queue request.</returns>
+        /// <returns>The <see cref="LdapSyncResponse"/> of the queue request.</returns>
         IObservable<LdapSyncResponse> QueueSyncTeamMapping(int teamId);
     }
 }

Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseLdapClient.cs

@@ -31,8 +31,8 @@ public ObservableEnterpriseLdapClient(IGitHubClient client)
         /// </remarks>
         /// <param name="userName">The username to update LDAP mapping</param>
         /// <param name="newLdapMapping">The <see cref="NewLdapMapping"/></param>
-        /// <returns>The <see cref="LdapUser"/> object.</returns>
-        public IObservable<LdapUser> UpdateUserMapping(string userName, NewLdapMapping newLdapMapping)
+        /// <returns>The <see cref="User"/> object.</returns>
+        public IObservable<User> UpdateUserMapping(string userName, NewLdapMapping newLdapMapping)
         {
             return _client.UpdateUserMapping(userName, newLdapMapping).ToObservable();
         }
@@ -44,7 +44,7 @@ public IObservable<LdapUser> UpdateUserMapping(string userName, NewLdapMapping n
         /// https://developer.github.com/v3/enterprise/ldap/#sync-ldap-mapping-for-a-user
         /// </remarks>
         /// <param name="userName">The username to sync LDAP mapping</param>
-        /// <returns>The <see cref="HttpStatusCode"/> of the queue request.</returns>
+        /// <returns>The <see cref="LdapSyncResponse"/> of the queue request.</returns>
         public IObservable<LdapSyncResponse> QueueSyncUserMapping(string userName)
         {
             return _client.QueueSyncUserMapping(userName).ToObservable();
@@ -58,8 +58,8 @@ public IObservable<LdapSyncResponse> QueueSyncUserMapping(string userName)
         /// </remarks>
         /// <param name="teamId">The teamId to update LDAP mapping</param>
         /// <param name="newLdapMapping">The <see cref="NewLdapMapping"/></param>
-        /// <returns>The <see cref="LdapTeam"/> object.</returns>
-        public IObservable<LdapTeam> UpdateTeamMapping(int teamId, NewLdapMapping newLdapMapping)
+        /// <returns>The <see cref="Team"/> object.</returns>
+        public IObservable<Team> UpdateTeamMapping(int teamId, NewLdapMapping newLdapMapping)
         {
             return _client.UpdateTeamMapping(teamId, newLdapMapping).ToObservable();
         }
@@ -71,7 +71,7 @@ public IObservable<LdapTeam> UpdateTeamMapping(int teamId, NewLdapMapping newLda
         /// https://developer.github.com/v3/enterprise/ldap/#sync-ldap-mapping-for-a-team
         /// </remarks>
         /// <param name="teamId">The teamId to update LDAP mapping</param>
-        /// <returns>The <see cref="HttpStatusCode"/> of the queue request.</returns>
+        /// <returns>The <see cref="LdapSyncResponse"/> of the queue request.</returns>
         public IObservable<LdapSyncResponse> QueueSyncTeamMapping(int teamId)
         {
             return _client.QueueSyncTeamMapping(teamId).ToObservable();

Octokit/Clients/Enterprise/EnterpriseLdapClient.cs

@@ -23,15 +23,15 @@ public EnterpriseLdapClient(IApiConnection apiConnection)
         /// </remarks>
         /// <param name="userName">The username to update LDAP mapping</param>
         /// <param name="newLdapMapping">The <see cref="NewLdapMapping"/></param>
-        /// <returns>The <see cref="LdapUser"/> object.</returns>
-        public async Task<LdapUser> UpdateUserMapping(string userName, NewLdapMapping newLdapMapping)
+        /// <returns>The <see cref="User"/> object.</returns>
+        public async Task<User> UpdateUserMapping(string userName, NewLdapMapping newLdapMapping)
         {
             Ensure.ArgumentNotNull(userName, "userName");
             Ensure.ArgumentNotNull(newLdapMapping, "newLdapMapping");
 
             var endpoint = ApiUrls.EnterpriseLdapUserMapping(userName);
 
-            return await ApiConnection.Patch<LdapUser>(endpoint, newLdapMapping);
+            return await ApiConnection.Patch<User>(endpoint, newLdapMapping);
         }
 
         /// <summary>
@@ -41,7 +41,7 @@ public async Task<LdapUser> UpdateUserMapping(string userName, NewLdapMapping ne
         /// https://developer.github.com/v3/enterprise/ldap/#sync-ldap-mapping-for-a-user
         /// </remarks>
         /// <param name="userName">The userName to sync LDAP mapping</param>
-        /// <returns>The <see cref="HttpStatusCode"/> of the queue request.</returns>
+        /// <returns>The <see cref="LdapSyncResponse"/> of the queue request.</returns>
         public async Task<LdapSyncResponse> QueueSyncUserMapping(string userName)
         {
             Ensure.ArgumentNotNull(userName, "userName");
@@ -65,25 +65,25 @@ public async Task<LdapSyncResponse> QueueSyncUserMapping(string userName)
         /// </remarks>
         /// <param name="teamId">The teamId to update LDAP mapping</param>
         /// <param name="newLdapMapping">The <see cref="NewLdapMapping"/></param>
-        /// <returns>The <see cref="LdapTeam"/> object.</returns>
-        public async Task<LdapTeam> UpdateTeamMapping(int teamId, NewLdapMapping newLdapMapping)
+        /// <returns>The <see cref="Team"/> object.</returns>
+        public async Task<Team> UpdateTeamMapping(int teamId, NewLdapMapping newLdapMapping)
         {
             Ensure.ArgumentNotNull(teamId, "teamId");
             Ensure.ArgumentNotNull(newLdapMapping, "newLdapMapping");
 
             var endpoint = ApiUrls.EnterpriseLdapTeamMapping(teamId);
 
-            return await ApiConnection.Patch<LdapTeam>(endpoint, newLdapMapping);
+            return await ApiConnection.Patch<Team>(endpoint, newLdapMapping);
         }
-        
+
         /// <summary>
         /// Queue an LDAP Sync job for a team on a GitHub Enterprise appliance (must be Site Admin user).
         /// </summary>
         /// <remarks>
         /// https://developer.github.com/v3/enterprise/ldap/#sync-ldap-mapping-for-a-team
         /// </remarks>
         /// <param name="teamId">The teamId to update LDAP mapping</param>
-        /// <returns>The <see cref="HttpStatusCode"/> of the queue request.</returns>
+        /// <returns>The <see cref="LdapSyncResponse"/> of the queue request.</returns>
         public async Task<LdapSyncResponse> QueueSyncTeamMapping(int teamId)
         {
             Ensure.ArgumentNotNull(teamId, "teamId");

Octokit/Clients/Enterprise/IEnterpriseLdapClient.cs

@@ -18,8 +18,8 @@ public interface IEnterpriseLdapClient
         /// </remarks>
         /// <param name="userName">The username to update LDAP mapping</param>
         /// <param name="newLdapMapping">The <see cref="NewLdapMapping"/></param>
-        /// <returns>The <see cref="LdapUser"/> object.</returns>
-        Task<LdapUser> UpdateUserMapping(string userName, NewLdapMapping newLdapMapping);
+        /// <returns>The <see cref="User"/> object.</returns>
+        Task<User> UpdateUserMapping(string userName, NewLdapMapping newLdapMapping);
 
         /// <summary>
         /// Queue an LDAP Sync job for a user on a GitHub Enterprise appliance (must be Site Admin user).
@@ -28,7 +28,7 @@ public interface IEnterpriseLdapClient
         /// https://developer.github.com/v3/enterprise/ldap/#sync-ldap-mapping-for-a-user
         /// </remarks>
         /// <param name="userName">The username to sync LDAP mapping</param>
-        /// <returns>The <see cref="HttpStatusCode"/> of the queue request.</returns>
+        /// <returns>The <see cref="LdapSyncResponse"/> of the queue request.</returns>
         Task<LdapSyncResponse> QueueSyncUserMapping(string userName);
 
         /// <summary>
@@ -39,8 +39,8 @@ public interface IEnterpriseLdapClient
         /// </remarks>
         /// <param name="teamId">The teamId to update LDAP mapping</param>
         /// <param name="newLdapMapping">The <see cref="NewLdapMapping"/></param>
-        /// <returns>The <see cref="LdapTeam"/> object.</returns>
-        Task<LdapTeam> UpdateTeamMapping(int teamId, NewLdapMapping newLdapMapping);
+        /// <returns>The <see cref="Team"/> object.</returns>
+        Task<Team> UpdateTeamMapping(int teamId, NewLdapMapping newLdapMapping);
 
         /// <summary>
         /// Queue an LDAP Sync job for a team on a GitHub Enterprise appliance (must be Site Admin user).
@@ -49,7 +49,7 @@ public interface IEnterpriseLdapClient
         /// https://developer.github.com/v3/enterprise/ldap/#sync-ldap-mapping-for-a-team
         /// </remarks>
         /// <param name="teamId">The teamId to update LDAP mapping</param>
-        /// <returns>The <see cref="HttpStatusCode"/> of the queue request.</returns>
+        /// <returns>The <see cref="LdapSyncResponse"/> of the queue request.</returns>
         Task<LdapSyncResponse> QueueSyncTeamMapping(int teamId);
     }
 }

Octokit/Models/Request/Enterprise/NewLdapMapping.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 
 namespace Octokit
@@ -15,21 +16,25 @@ public class NewLdapMapping
         /// Initializes a new instance of the <see cref="NewLdapMapping"/> class.
         /// </summary>
         /// <param name="ldapDn">The LDAP Distinguished Name</param>
-        public NewLdapMapping(string ldapDN)
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Dn")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Dn")]
+        public NewLdapMapping(string ldapDn)
         {
-            LdapDN = ldapDN;
+            LdapDn = ldapDn;
         }
 
         /// <summary>
         /// The LDAP Distinguished Name (required)
         /// </summary>
-        public string LdapDN { get; private set; }
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Dn")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Dn")]
+        public string LdapDn { get; private set; }
 
         internal string DebuggerDisplay
         {
             get
             {
-                return string.Format(CultureInfo.InvariantCulture, "LdapDn: {0}", LdapDN);
+                return string.Format(CultureInfo.InvariantCulture, "LdapDn: {0}", LdapDn);
             }
         }
     }

Octokit/Models/Response/Enterprise/LdapSyncResponse.cs

@@ -11,12 +11,12 @@ public class LdapSyncResponse
     {
         public LdapSyncResponse() { }
 
-        public LdapSyncResponse(IReadOnlyList<string> status)
+        public LdapSyncResponse(string status)
         {
             Status = status;
         }
 
-        public IReadOnlyList<string> Status
+        public string Status
         {
             get;
             private set;
@@ -26,7 +26,7 @@ internal string DebuggerDisplay
         {
             get
             {
-                return String.Format(CultureInfo.InvariantCulture, "Status: {0}", string.Join("\r\n", Status));
+                return String.Format(CultureInfo.InvariantCulture, "Status: {0}", Status);
             }
         }
     }

Octokit/Models/Response/Team.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 
 namespace Octokit
@@ -12,7 +13,9 @@ public class Team
     {
         public Team() { }
 
-        public Team(Uri url, int id, string name, Permission permission, int membersCount, int reposCount, Organization organization)
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="Dn")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Dn")]
+        public Team(Uri url, int id, string name, Permission permission, int membersCount, int reposCount, Organization organization, string ldapDn)
         {
             Url = url;
             Id = id;
@@ -21,6 +24,7 @@ public Team(Uri url, int id, string name, Permission permission, int membersCoun
             MembersCount = membersCount;
             ReposCount = reposCount;
             Organization = organization;
+            LdapDn = ldapDn;
         }
 
         /// <summary>
@@ -58,6 +62,13 @@ public Team(Uri url, int id, string name, Permission permission, int membersCoun
         /// </summary>
         public Organization Organization { get; protected set; }
 
+        /// <summary>
+        /// LDAP Binding (GitHub Enterprise only)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Dn")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Dn")]
+        public string LdapDn { get; protected set; }
+
         internal string DebuggerDisplay
         {
             get { return string.Format(CultureInfo.InvariantCulture, "Name: {0} ", Name); }

Octokit/Models/Response/User.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 
 namespace Octokit
@@ -12,17 +13,27 @@ public class User : Account
     {
         public User() { }
 
-        public User(string avatarUrl, string bio, string blog, int collaborators, string company, DateTimeOffset createdAt, int diskUsage, string email, int followers, int following, bool? hireable, string htmlUrl, int totalPrivateRepos, int id, string location, string login, string name, int ownedPrivateRepos, Plan plan, int privateGists, int publicGists, int publicRepos, string url, bool siteAdmin)
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Dn")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Dn")]
+        public User(string avatarUrl, string bio, string blog, int collaborators, string company, DateTimeOffset createdAt, int diskUsage, string email, int followers, int following, bool? hireable, string htmlUrl, int totalPrivateRepos, int id, string location, string login, string name, int ownedPrivateRepos, Plan plan, int privateGists, int publicGists, int publicRepos, string url, bool siteAdmin, string ldapDn)
             : base(avatarUrl, bio, blog, collaborators, company, createdAt, diskUsage, email, followers, following, hireable, htmlUrl, totalPrivateRepos, id, location, login, name, ownedPrivateRepos, plan, privateGists, publicGists, publicRepos, AccountType.User, url)
         {
             SiteAdmin = siteAdmin;
+            LdapDn = ldapDn;
         }
 
         /// <summary>
         /// Whether or not the user is an administrator of the site
         /// </summary>
         public bool SiteAdmin { get; protected set; }
 
+        /// <summary>
+        /// LDAP Binding (GitHub Enterprise only)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Dn")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Dn")]
+        public string LdapDn { get; protected set; }
+
         internal string DebuggerDisplay
         {
             get

Octokit/Octokit-Mono.csproj

@@ -450,8 +450,6 @@
     <Compile Include="Clients\Enterprise\EnterpriseLdapClient.cs" />
     <Compile Include="Clients\Enterprise\IEnterpriseLdapClient.cs" />
     <Compile Include="Models\Request\Enterprise\NewLdapMapping.cs" />
-    <Compile Include="Models\Response\Enterprise\LdapTeam.cs" />
-    <Compile Include="Models\Response\Enterprise\LdapUser.cs" />
     <Compile Include="Models\Response\Enterprise\LdapSyncResponse.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

Octokit/Octokit-MonoAndroid.csproj

@@ -458,8 +458,6 @@
     <Compile Include="Clients\Enterprise\EnterpriseLdapClient.cs" />
     <Compile Include="Clients\Enterprise\IEnterpriseLdapClient.cs" />
     <Compile Include="Models\Request\Enterprise\NewLdapMapping.cs" />
-    <Compile Include="Models\Response\Enterprise\LdapTeam.cs" />
-    <Compile Include="Models\Response\Enterprise\LdapUser.cs" />
     <Compile Include="Models\Response\Enterprise\LdapSyncResponse.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />