Merge pull request #630 from whoisj/find-git

[Series 1/2] alm: read URL from git-remote-https process.

Author: J Wyman

Bitbucket.Authentication/Src/OAuth/OAuthAuthenticator.cs

@@ -176,7 +176,7 @@ private async Task<AuthenticationResult> GetAccessToken(TargetUri targetUri, str
                 Timeout = TimeSpan.FromMilliseconds(RequestTimeout),
             };
             var grantUri = GetGrantUrl(targetUri, authCode);
-            var requestUri = new TargetUri(grantUri, targetUri.ProxyUri);
+            var requestUri = targetUri.CreateWith(grantUri);
             var content = GetGrantRequestContent(authCode);
 
             using (var response = await Network.HttpPostAsync(requestUri, content, options))
@@ -223,7 +223,7 @@ private async Task<AuthenticationResult> RefreshAccessToken(TargetUri targetUri,
                 throw new ArgumentNullException(nameof(currentRefreshToken));
 
             var refreshUri = GetRefreshUri();
-            var requestUri = new TargetUri(refreshUri, targetUri.ProxyUri);
+            var requestUri = targetUri.CreateWith(refreshUri);
             var options = new NetworkRequestOptions(true)
             {
                 Timeout = TimeSpan.FromMilliseconds(RequestTimeout),

Bitbucket.Authentication/Src/Rest/RestClient.cs

@@ -26,7 +26,7 @@ public async Task<AuthenticationResult> TryGetUser(TargetUri targetUri, int requ
                 Authorization = authorization,
                 Timeout = TimeSpan.FromMilliseconds(requestTimeout),
             };
-            var requestUri = new TargetUri(restRootUrl, targetUri.ProxyUri);
+            var requestUri = targetUri.CreateWith(restRootUrl);
 
             using (var response = await Network.HttpGetAsync(requestUri, options))
             {

Cli/Askpass/GlobalSuppressions.cs

@@ -278,6 +278,7 @@ internal void Delete()
                         throw new ArgumentException(inner.Message, nameof(operationArguments), inner);
                     }
 
+                    // Load operation arguments.
                     await LoadOperationArguments(operationArguments);
                     EnableTraceLogging(operationArguments);
 
@@ -350,9 +351,13 @@ internal void Erase()
                         throw new ArgumentException(inner.Message, nameof(operationArguments), inner);
                     }
 
+                    // Load operation arguments.
                     await LoadOperationArguments(operationArguments);
                     EnableTraceLogging(operationArguments);
 
+                    // Read the details of any git-remote-http(s).exe parent process.
+                    ReadGitRemoteDetails(operationArguments);
+
                     // Set the parent window handle.
                     ParentHwnd = operationArguments.ParentHwnd;
 
@@ -386,9 +391,13 @@ internal void Get()
                         throw new ArgumentException(inner.Message, nameof(operationArguments), inner);
                     }
 
+                    // Load operation arguments.
                     await LoadOperationArguments(operationArguments);
                     EnableTraceLogging(operationArguments);
 
+                    // Read the details of any git-remote-http(s).exe parent process.
+                    ReadGitRemoteDetails(operationArguments);
+
                     // Set the parent window handle.
                     ParentHwnd = operationArguments.ParentHwnd;
 
@@ -473,9 +482,13 @@ internal void Store()
                         throw new ArgumentException(inner.Message, nameof(operationArguments), inner);
                     }
 
+                    // Load operation arguments.
                     await LoadOperationArguments(operationArguments);
                     EnableTraceLogging(operationArguments);
 
+                    // Read the details of any git-remote-http(s).exe parent process.
+                    ReadGitRemoteDetails(operationArguments);
+
                     // Set the parent window handle.
                     ParentHwnd = operationArguments.ParentHwnd;
 

Cli/Manager/Program.cs

@@ -89,6 +89,8 @@ internal delegate bool ModalPromptDisplayDialogDelegate(Program program,
 
         internal delegate Task<Credential> QueryCredentialsDelegate(Program program, OperationArguments operationArguments);
 
+        internal delegate void ReadGitRemoteDetailsDelegate(Program program, OperationArguments operationArguments);
+
         internal delegate ConsoleKeyInfo ReadKeyDelegate(Program program, bool intercept);
 
         internal delegate void SetStandardReaderDelegate(Program program, TextReader writer);

Cli/Shared/Delegates.cs

@@ -170,7 +170,7 @@ public static async Task<BaseAuthentication> CreateAuthentication(Program progra
                                                                   null);
 
                 case AuthorityType.Bitbucket:
-                    program.Trace.WriteLine($"authority for '{operationArguments.TargetUri}'  is Bitbucket");
+                    program.Trace.WriteLine($"authority for '{operationArguments.TargetUri}'  is Bitbucket.");
 
                     // Return a Bitbucket authentication object.
                     return authority ?? new Bitbucket.Authentication(program.Context,
@@ -845,6 +845,19 @@ public static async Task<Credential> QueryCredentials(Program program, Operation
             return credentials;
         }
 
+        public static void ReadGitRemoteDetails(Program program, OperationArguments operationArguments)
+        {
+            if (program is null)
+                throw new ArgumentNullException(nameof(program));
+            if (operationArguments is null)
+                throw new ArgumentNullException(nameof(operationArguments));
+
+            if (program.Context.Utilities.TryReadGitRemoteHttpDetails(out string commandLine, out _))
+            {
+                operationArguments.GitRemoteHttpCommandLine = commandLine;
+            }
+        }
+
         public static bool TryParse(string text, out int result)
         {
             return (text.StartsWith("0x", StringComparison.OrdinalIgnoreCase)