make compatible with .NET Framework

git-ecosystem · Oct 30, 2024 · f20d75b · f20d75b
1 parent b4db44a
commit f20d75b
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 22 deletions.
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketHostProvider.cs b/src/shared/Atlassian.Bitbucket/BitbucketHostProvider.cs
@@ -473,5 +473,7 @@ public void Dispose()
             _restApiRegistry.Dispose();
             _bitbucketAuth.Dispose();
         }
+
+        public Task<bool> ValidateCredentialAsync(Uri remoteUri, ICredential credential) => Task.FromResult(credential.PasswordExpiry == null || credential.PasswordExpiry >= DateTimeOffset.UtcNow);
     }
 }
diff --git a/src/shared/Core/Credential.cs b/src/shared/Core/Credential.cs
@@ -23,13 +23,13 @@ public interface ICredential
         /// The expiry date of the password. This is Git's password_expiry_utc
         /// attribute. https://git-scm.com/docs/git-credential#Documentation/git-credential.txt-codepasswordexpiryutccode
         /// </summary>
-        DateTimeOffset? PasswordExpiry { get => null; }
+        DateTimeOffset? PasswordExpiry { get; }
 
         /// <summary>
         /// An OAuth refresh token. This is Git's oauth_refresh_token
         /// attribute. https://git-scm.com/docs/git-credential#Documentation/git-credential.txt-codeoauthrefreshtokencode
         /// </summary>
-        string OAuthRefreshToken { get => null; }
+        string OAuthRefreshToken { get; }
     }
 
     /// <summary>
@@ -63,12 +63,12 @@ public GitCredential(OAuth2TokenResult tokenResult, string userName)
             }
         }
 
-        public string Account { get; init; }
+        public string Account { get; set; }
 
-        public string Password { get; init; }
+        public string Password { get; set; }
 
-        public DateTimeOffset? PasswordExpiry { get; init; }
+        public DateTimeOffset? PasswordExpiry { get; set; }
 
-        public string OAuthRefreshToken { get; init; }
+        public string OAuthRefreshToken { get; set; }
     }
 }
diff --git a/src/shared/Core/FileCredential.cs b/src/shared/Core/FileCredential.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace GitCredentialManager
 {
     public class FileCredential : ICredential
@@ -17,5 +19,9 @@ public FileCredential(string fullPath, string service, string account, string pa
         public string Account { get; }
 
         public string Password { get; }
+
+        public DateTimeOffset? PasswordExpiry => null;
+
+        public string OAuthRefreshToken => null;
     }
 }
diff --git a/src/shared/Core/HostProvider.cs b/src/shared/Core/HostProvider.cs
@@ -59,8 +59,8 @@ public interface IHostProvider : IDisposable
         /// <param name="input">Input arguments of a Git credential query.</param>
         Task EraseCredentialAsync(InputArguments input);
 
-        Task<bool> ValidateCredentialAsync(Uri remoteUri, ICredential credential)
-        => Task.FromResult(credential.PasswordExpiry == null || credential.PasswordExpiry >= DateTimeOffset.UtcNow);
+        Task<bool> ValidateCredentialAsync(Uri remoteUri, ICredential credential);
+//        => Task.FromResult(credential.PasswordExpiry == null || credential.PasswordExpiry >= DateTimeOffset.UtcNow);
     }
 
     /// <summary>

diff --git a/src/shared/Core/ICredentialStore.cs b/src/shared/Core/ICredentialStore.cs
@@ -32,8 +32,7 @@ public interface ICredentialStore
 //        [Obsolete("Prefer AddOrUpdate(string, ICredential)")]
         void AddOrUpdate(string service, string account, string secret);
 
-        void AddOrUpdate(string service, ICredential credential)
-        => AddOrUpdate(service, credential.Account, credential.Password);
+        void AddOrUpdate(string service, ICredential credential);
 
         /// <summary>
         /// Delete credential from the store that matches the given query.
@@ -44,10 +43,9 @@ void AddOrUpdate(string service, ICredential credential)
 //        [Obsolete("Prefer Remove(string, ICredential)")]
         bool Remove(string service, string account);
 
-        bool Remove(string service, ICredential credential)
-        => Remove(service, credential.Account);
+        bool Remove(string service, ICredential credential);
 
-        bool CanStorePasswordExpiry => false;
-        bool CanStoreOAuthRefreshToken => false;
+        bool CanStorePasswordExpiry { get; }
+        bool CanStoreOAuthRefreshToken { get; }
     }
 }
diff --git a/src/shared/Core/InputArguments.cs b/src/shared/Core/InputArguments.cs
@@ -39,7 +39,7 @@ public InputArguments(IDictionary<string, IList<string>> dict)
         /// Return a copy of input, with additional OAuth refresh token.
         /// </summary>
         public InputArguments(InputArguments input, string oauthRefreshToken) {
-            _dict = new Dictionary<string, IList<string>>(input._dict)
+            _dict = new Dictionary<string, IList<string>>(input._dict.ToDictionary(p => p.Key, p => p.Value))
             {
                 ["oauth_refresh_token"] = new List<string>() { oauthRefreshToken }
             };

diff --git a/src/shared/Core/Interop/Linux/SecretServiceCollection.cs b/src/shared/Core/Interop/Linux/SecretServiceCollection.cs
@@ -315,7 +315,7 @@ private static unsafe ICredential CreateCredentialFromItem(SecretItem* item)
                 string oauth_refresh_token = null;
                 DateTimeOffset? password_expiry_utc = null;
                 for(int i = 1; i < lines.Length; i++) {
-                    var parts = lines[i].Split('=', 2);
+                    var parts = lines[i].Split(['='], 2);
                     if (parts.Length != 2)
                         continue;
                     if (parts[0] == "oauth_refresh_token")
@@ -395,6 +395,8 @@ private static SecretSchema GetSchema()
             return schema;
         }
 
+        public bool Remove(string service, ICredential credential) => Remove(service, credential.Account);
+
         public bool CanStorePasswordExpiry => true;
         public bool CanStoreOAuthRefreshToken => true;
     }

diff --git a/src/shared/Core/Interop/Linux/SecretServiceCredential.cs b/src/shared/Core/Interop/Linux/SecretServiceCredential.cs
@@ -18,8 +18,8 @@ internal SecretServiceCredential(string service, string account, string password
 
         public string Password { get; }
 
-        public string OAuthRefreshToken { get; init; }
+        public string OAuthRefreshToken { get; set; }
 
-        public DateTimeOffset? PasswordExpiry { get; init; }
+        public DateTimeOffset? PasswordExpiry { get; set; }
     }
 }
diff --git a/src/shared/Core/Interop/MacOS/MacOSKeychain.cs b/src/shared/Core/Interop/MacOS/MacOSKeychain.cs
@@ -14,6 +14,10 @@ public class MacOSKeychain : ICredentialStore
     {
         private readonly string _namespace;
 
+        public bool CanStorePasswordExpiry => false;
+
+        public bool CanStoreOAuthRefreshToken => false;
+
         #region Constructors
 
         /// <summary>
@@ -348,5 +352,8 @@ private string CreateServiceName(string service)
             sb.Append(service);
             return sb.ToString();
         }
+
+        public void AddOrUpdate(string service, ICredential credential) => AddOrUpdate(service, credential.Account, credential.Password);
+        public bool Remove(string service, ICredential credential) => Remove(service, credential.Account);
     }
 }
diff --git a/src/shared/Core/Interop/MacOS/MacOSKeychainCredential.cs b/src/shared/Core/Interop/MacOS/MacOSKeychainCredential.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Diagnostics;
 
 namespace GitCredentialManager.Interop.MacOS
@@ -21,6 +22,10 @@ internal MacOSKeychainCredential(string service, string account, string password
 
         public string Password { get; }
 
+        public DateTimeOffset? PasswordExpiry => null;
+
+        public string OAuthRefreshToken => null;
+
         private string DebuggerDisplay => $"{Label} [Service: {Service}, Account: {Account}]";
     }
 }
diff --git a/src/shared/Core/Interop/Windows/WindowsCredential.cs b/src/shared/Core/Interop/Windows/WindowsCredential.cs
@@ -1,4 +1,6 @@
 
+using System;
+
 namespace GitCredentialManager.Interop.Windows
 {
     public record WindowsCredential : ICredential
@@ -19,7 +21,9 @@ public WindowsCredential(string service, string userName, string password, strin
 
         public string TargetName { get; }
 
-        public string OAuthRefreshToken { get; init; }
+        public string OAuthRefreshToken { get; set; }
+
+        public DateTimeOffset? PasswordExpiry => null;
 
         string ICredential.Account => UserName;
     }

diff --git a/src/shared/Core/Interop/Windows/WindowsCredentialManager.cs b/src/shared/Core/Interop/Windows/WindowsCredentialManager.cs
@@ -225,7 +225,7 @@ private WindowsCredential CreateCredentialFromStructure(Win32Credential credenti
             var password = lines[0];
             string oauth_refresh_token = null;
             for(int i = 1; i < lines.Length; i++) {
-                var parts = lines[i].Split('=', 2);
+                var parts = lines[i].Split(['='], 2);
                 if (parts.Length != 2)
                     continue;
                 if (parts[0] == "oauth_refresh_token")
@@ -401,6 +401,10 @@ private WindowsCredential CreateCredentialFromStructure(Win32Credential credenti
             return sb.ToString();
         }
 
+        public bool Remove(string service, ICredential credential) => Remove(service, credential.Account);
+
         public bool CanStoreOAuthRefreshToken => true;
+
+        public bool CanStorePasswordExpiry => false;
     }
 }
diff --git a/src/shared/Core/NullCredentialStore.cs b/src/shared/Core/NullCredentialStore.cs
@@ -9,11 +9,17 @@ namespace GitCredentialManager;
 /// </summary>
 public class NullCredentialStore : ICredentialStore
 {
+    public bool CanStorePasswordExpiry => false;
+
+    public bool CanStoreOAuthRefreshToken => false;
+
     public IList<string> GetAccounts(string service) => Array.Empty<string>();
 
     public ICredential Get(string service, string account) => null;
 
     public void AddOrUpdate(string service, string account, string secret) { }
 
     public bool Remove(string service, string account) => false;
+    public void AddOrUpdate(string service, ICredential credential) { }
+    public bool Remove(string service, ICredential credential) => false;
 }
diff --git a/src/shared/Core/PlaintextCredentialStore.cs b/src/shared/Core/PlaintextCredentialStore.cs
@@ -23,6 +23,10 @@ public PlaintextCredentialStore(IFileSystem fileSystem, string storeRoot, string
         protected string Namespace { get; }
         protected virtual string CredentialFileExtension => ".credential";
 
+        public bool CanStorePasswordExpiry => false;
+
+        public bool CanStoreOAuthRefreshToken => false;
+
         public IList<string> GetAccounts(string service)
         {
             return Enumerate(service, null).Select(x => x.Account).Distinct().ToList();
@@ -216,5 +220,8 @@ private string CreateServiceSlug(string service)
 
             return sb.ToString();
         }
+
+        public void AddOrUpdate(string service, ICredential credential) => AddOrUpdate(service, credential.Account, credential.Password);
+        public bool Remove(string service, ICredential credential) => Remove(service, credential.Account);
     }
 }
diff --git a/src/shared/GitHub/GitHubHostProvider.cs b/src/shared/GitHub/GitHubHostProvider.cs
@@ -514,6 +514,8 @@ internal static Uri NormalizeUri(Uri uri)
             return uri;
         }
 
+        public Task<bool> ValidateCredentialAsync(Uri remoteUri, ICredential credential) => Task.FromResult(credential.PasswordExpiry == null || credential.PasswordExpiry >= DateTimeOffset.UtcNow);
+
         #endregion
     }
 }
diff --git a/src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs b/src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs
@@ -850,6 +850,8 @@ private Task<int> UnbindCmd(string organization, bool local)
             return Task.FromResult(0);
         }
 
+        public Task<bool> ValidateCredentialAsync(Uri remoteUri, ICredential credential) => Task.FromResult(credential.PasswordExpiry == null || credential.PasswordExpiry >= DateTimeOffset.UtcNow);
+
         #endregion
     }
 }
diff --git a/src/shared/TestInfrastructure/Objects/TestCredentialStore.cs b/src/shared/TestInfrastructure/Objects/TestCredentialStore.cs
@@ -1,3 +1,4 @@
+using Avalonia.OpenGL;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -49,6 +50,10 @@ bool ICredentialStore.Remove(string service, string account)
 
         public int Count => _store.Count;
 
+        public bool CanStorePasswordExpiry => false;
+
+        public bool CanStoreOAuthRefreshToken => false;
+
         public bool TryGet(string service, string account, out TestCredential credential)
         {
             credential = Query(service, account).FirstOrDefault();
@@ -92,6 +97,9 @@ private IEnumerable<TestCredential> Query(string service, string account)
                 yield return credential;
             }
         }
+
+        void ICredentialStore.AddOrUpdate(string service, ICredential credential) => (this as ICredentialStore).AddOrUpdate(service, credential.Account, credential.Password);
+        bool ICredentialStore.Remove(string service, ICredential credential) => (this as ICredentialStore).Remove(service, credential.Account);
     }
 
     public record TestCredential : ICredential
@@ -109,8 +117,8 @@ public TestCredential(string service, string account, string password)
 
         public string Password { get; }
 
-        public DateTimeOffset? PasswordExpiry { get; init; }
+        public DateTimeOffset? PasswordExpiry { get; set; }
 
-        public string OAuthRefreshToken { get; init; }
+        public string OAuthRefreshToken { get; set; }
     }
 }