Restore old Credentials API as Obsolete

LibGit2Sharp.Tests/CloneFixture.cs

@@ -151,7 +151,7 @@ public void CanCloneWithCredentials()
             string clonedRepoPath = Repository.Clone(Constants.PrivateRepoUrl, scd.DirectoryPath,
                 new CloneOptions()
                 {
-                    CredentialsProvider = (_url, _user, _cred) => Constants.PrivateRepoCredentials
+                    CredentialsProvider = Constants.PrivateRepoCredentials
                 });
 
 

LibGit2Sharp.Tests/FetchFixture.cs

@@ -60,7 +60,7 @@ public void CanFetchIntoAnEmptyRepositoryWithCredentials()
                 // Perform the actual fetch
                 repo.Network.Fetch(remote, new FetchOptions
                 {
-                    CredentialsProvider = (_url, _user, _credtype) => Constants.PrivateRepoCredentials
+                    CredentialsProvider = Constants.PrivateRepoCredentials
                 });
             }
         }

LibGit2Sharp.Tests/MetaFixture.cs

@@ -109,12 +109,12 @@ public void TypesInLibGit2SharpMustBeExtensibleInATestingContext()
         }
 
         [Fact]
-        public void LibGit2SharpInterfacesCoverAllPublicMembers()
+        public void LibGit2SharpPublicInterfacesCoverAllPublicMembers()
         {
             var methodsMissingFromInterfaces =
                 from t in Assembly.GetAssembly(typeof(IRepository)).GetExportedTypes()
                 where !t.IsInterface
-                where t.GetInterfaces().Any(i => i.Namespace == typeof(IRepository).Namespace)
+                where t.GetInterfaces().Any(i => i.IsPublic && i.Namespace == typeof(IRepository).Namespace)
                 let interfaceTargetMethods = from i in t.GetInterfaces()
                                              from im in t.GetInterfaceMap(i).TargetMethods
                                              select im

LibGit2Sharp.Tests/NetworkFixture.cs

@@ -121,7 +121,7 @@ public void CanListRemoteReferencesWithCredentials()
             {
                 Remote remote = repo.Network.Remotes.Add(remoteName, Constants.PrivateRepoUrl);
 
-                var references = repo.Network.ListReferences(remote, (_url, _user, _credtype) => Constants.PrivateRepoCredentials);
+                var references = repo.Network.ListReferences(remote, Constants.PrivateRepoCredentials);
 
                 foreach (var directReference in references)
                 {

LibGit2Sharp.Tests/TestHelpers/Constants.cs

@@ -10,19 +10,24 @@ public static class Constants
 
         // Populate these to turn on live credential tests:  set the
         // PrivateRepoUrl to the URL of a repository that requires
-        // authentication.  Set PrivateRepoCredentials to an instance of
+        // authentication. Define PrivateRepoCredentials to return an instance of
         // UsernamePasswordCredentials (for HTTP Basic authentication) or
         // DefaultCredentials (for NTLM/Negotiate authentication).
         //
         // For example:
         // public const string PrivateRepoUrl = "https://github.com/username/PrivateRepo";
-        // public static readonly Credentials PrivateRepoCredentials = new UsernamePasswordCredentials { Username = "username", Password = "swordfish" };
+        // ... return new UsernamePasswordCredentials { Username = "username", Password = "swordfish" };
         //
         // Or:
         // public const string PrivateRepoUrl = "https://tfs.contoso.com/tfs/DefaultCollection/project/_git/project";
-        // public static readonly Credentials PrivateRepoCredentials = new DefaultCredentials();
+        // ... return new DefaultCredentials();
 
         public const string PrivateRepoUrl = "";
-        public static readonly Credentials PrivateRepoCredentials;
+
+        public static Credentials PrivateRepoCredentials(string url, string usernameFromUrl,
+                                                         SupportedCredentialTypes types)
+        {
+            return null;
+        }
     }
 }

LibGit2Sharp/CloneOptions.cs

@@ -7,7 +7,7 @@ namespace LibGit2Sharp
     /// <summary>
     /// Options to define clone behaviour
     /// </summary>
-    public sealed class CloneOptions : IConvertableToGitCheckoutOpts
+    public sealed class CloneOptions : IConvertableToGitCheckoutOpts, ICredentialsProvider
     {
         /// <summary>
         /// Creates default <see cref="CloneOptions"/> for a non-bare clone
@@ -41,6 +41,12 @@ public CloneOptions()
         /// <summary>
         /// Credentials to use for user/pass authentication
         /// </summary>
+        [Obsolete("This will be removed in future release. Use CredentialsProvider.")]
+        public Credentials Credentials { get; set; }
+
+        /// <summary>
+        /// Handler to generate <see cref="LibGit2Sharp.Credentials"/> for authentication.
+        /// </summary>
         public CredentialsHandler CredentialsProvider { get; set; }
 
         #region IConvertableToGitCheckoutOpts

LibGit2Sharp/Credentials.cs

@@ -1,5 +1,6 @@
 using System;
 using LibGit2Sharp.Core;
+using LibGit2Sharp.Handlers;
 
 namespace LibGit2Sharp
 {
@@ -19,4 +20,41 @@ public abstract class Credentials
         /// <returns>0 for success, &lt; 0 to indicate an error, &gt; 0 to indicate no credential was acquired.</returns>
         protected internal abstract int GitCredentialHandler(out IntPtr cred, IntPtr url, IntPtr usernameFromUrl, GitCredentialType types, IntPtr payload);
     }
+
+    internal interface ICredentialsProvider
+    {
+        /// <summary>
+        /// The <see cref="Credentials"/> to authenticate with during the push.
+        /// </summary>
+        [Obsolete("This will be removed in future release. Use CredentialsProvider.")]
+        Credentials Credentials { get; }
+
+        /// <summary>
+        /// Handler to generate <see cref="LibGit2Sharp.Credentials"/> for authentication.
+        /// </summary>
+        CredentialsHandler CredentialsProvider { get; }
+    }
+
+    internal static class CredentialsProviderExtensions
+    {
+        public static CredentialsHandler GetCredentialsHandler(this ICredentialsProvider provider)
+        {
+            if (provider == null)
+            {
+                return null;
+            }
+
+            if (provider.CredentialsProvider != null)
+            {
+                return provider.CredentialsProvider;
+            }
+
+            if (provider.Credentials == null)
+            {
+                return null;
+            }
+
+            return (url, user, type) => provider.Credentials;
+        }
+    }
 }

LibGit2Sharp/FetchOptions.cs

@@ -6,7 +6,7 @@ namespace LibGit2Sharp
     /// <summary>
     /// Collection of parameters controlling Fetch behavior.
     /// </summary>
-    public sealed class FetchOptions
+    public sealed class FetchOptions : ICredentialsProvider
     {
         /// <summary>
         /// Specifies the tag-following behavior of the fetch operation.
@@ -42,6 +42,12 @@ public sealed class FetchOptions
         /// <summary>
         /// Credentials to use for username/password authentication.
         /// </summary>
+        [Obsolete("This will be removed in future release. Use CredentialsProvider.")]
+        public Credentials Credentials { get; set; }
+
+        /// <summary>
+        /// Handler to generate <see cref="LibGit2Sharp.Credentials"/> for authentication.
+        /// </summary>
         public CredentialsHandler CredentialsProvider { get; set; }
     }
 }

LibGit2Sharp/Handlers.cs

@@ -25,8 +25,8 @@
     /// <summary>
     /// Delegate definition for the credentials retrieval callback
     /// </summary>
-    /// <param name="usernameFromUrl">Username which was extracted form the url, if any</param>
     /// <param name="url">The url</param>
+    /// <param name="usernameFromUrl">Username which was extracted from the url, if any</param>
     /// <param name="types">Credential types which the server accepts</param>
     public delegate Credentials CredentialsHandler(string url, string usernameFromUrl, SupportedCredentialTypes types);
 

LibGit2Sharp/Network.cs

@@ -36,6 +36,25 @@ public virtual RemoteCollection Remotes
             get { return remotes.Value; }
         }
 
+        /// <summary>
+        /// List references in a <see cref="Remote"/> repository.
+        /// <para>
+        /// When the remote tips are ahead of the local ones, the retrieved
+        /// <see cref="DirectReference"/>s may point to non existing
+        /// <see cref="GitObject"/>s in the local repository. In that
+        /// case, <see cref="DirectReference.Target"/> will return <c>null</c>.
+        /// </para>
+        /// </summary>
+        /// <param name="remote">The <see cref="Remote"/> to list from.</param>
+        /// <param name="credentials">The optional <see cref="Credentials"/> used to connect to remote repository.</param>
+        /// <returns>The references in the <see cref="Remote"/> repository.</returns>
+        [Obsolete("This will be removed in future release. Use the overload ListReferences(Remote, CredentialsHandler).")]
+        public virtual IEnumerable<DirectReference> ListReferences(Remote remote, Credentials credentials)
+        {
+            return ListReferences(remote,
+                                  credentials == null ? null : new CredentialsHandler((url, user, type) => credentials));
+        }
+
         /// <summary>
         /// List references in a <see cref="Remote"/> repository.
         /// <para>
@@ -272,7 +291,7 @@ public virtual void Push(
             // Load the remote.
             using (RemoteSafeHandle remoteHandle = Proxy.git_remote_load(repository.Handle, remote.Name, true))
             {
-                var callbacks = new RemoteCallbacks(null, null, null, pushOptions.CredentialsProvider);
+                var callbacks = new RemoteCallbacks(null, null, null, pushOptions);
                 GitRemoteCallbacks gitCallbacks = callbacks.GenerateCallbacks();
                 Proxy.git_remote_set_callbacks(remoteHandle, ref gitCallbacks);
 

LibGit2Sharp/PushOptions.cs

@@ -6,10 +6,16 @@ namespace LibGit2Sharp
     /// <summary>
     /// Collection of parameters controlling Push behavior.
     /// </summary>
-    public sealed class PushOptions
+    public sealed class PushOptions : ICredentialsProvider
     {
         /// <summary>
-        /// The <see cref="Credentials"/> to authenticate with during the push.
+        /// The <see cref="LibGit2Sharp.Credentials"/> to authenticate with during the push.
+        /// </summary>
+        [Obsolete("This will be removed in future release. Use CredentialsProvider.")]
+        public Credentials Credentials { get; set; }
+
+        /// <summary>
+        /// Handler to generate <see cref="LibGit2Sharp.Credentials"/> for authentication.
         /// </summary>
         public CredentialsHandler CredentialsProvider { get; set; }
 

LibGit2Sharp/RemoteCallbacks.cs

@@ -12,6 +12,18 @@ namespace LibGit2Sharp
     /// </summary>
     internal class RemoteCallbacks
     {
+        internal RemoteCallbacks(
+            ProgressHandler onProgress = null,
+            TransferProgressHandler onDownloadProgress = null,
+            UpdateTipsHandler onUpdateTips = null,
+            ICredentialsProvider credentialsProvider = null)
+        {
+            Progress = onProgress;
+            DownloadTransferProgress = onDownloadProgress;
+            UpdateTips = onUpdateTips;
+            CredentialsProvider = credentialsProvider.GetCredentialsHandler();
+        }
+
         internal RemoteCallbacks(
             ProgressHandler onProgress = null,
             TransferProgressHandler onDownloadProgress = null,
@@ -30,7 +42,7 @@ internal RemoteCallbacks(FetchOptions fetchOptions)
             Progress = fetchOptions.OnProgress;
             DownloadTransferProgress = fetchOptions.OnTransferProgress;
             UpdateTips = fetchOptions.OnUpdateTips;
-            CredentialsProvider = fetchOptions.CredentialsProvider;
+            CredentialsProvider = fetchOptions.GetCredentialsHandler();
         }
 
         #region Delegates