Merge branch 'master' into fixes/null-view-model

Author: Meaghan Lewis

src/GitHub.Api/IOAuthCallbackListener.cs

@@ -16,5 +16,11 @@ public interface IOAuthCallbackListener
         /// <param name="cancel">A cancellation token.</param>
         /// <returns>The temporary code included in the callback.</returns>
         Task<string> Listen(string id, CancellationToken cancel);
+
+        /// <summary>
+        /// Redirects the last context to respond with listen and stops the underlying http listener
+        /// </summary>
+        /// <param name="url">Url to redirect to.</param>
+        void RedirectLastContext(Uri url);
     }
 }

src/GitHub.Api/LoginManager.cs

@@ -157,6 +157,8 @@ public async Task<LoginResult> LoginViaOAuth(
             await keychain.Save("[oauth]", token.AccessToken, hostAddress).ConfigureAwait(false);
             var result = await ReadUserWithRetry(client).ConfigureAwait(false);
             await keychain.Save(result.User.Login, token.AccessToken, hostAddress).ConfigureAwait(false);
+            oauthListener.RedirectLastContext(hostAddress.WebUri.Append(result.User.Login));
+
             return result;
         }
 

src/GitHub.App/Services/OAuthCallbackListener.cs

@@ -1,4 +1,6 @@
-using System.ComponentModel.Composition;
+using System;
+using System.ComponentModel.Composition;
+using System.Diagnostics;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
@@ -39,6 +41,7 @@ public OAuthCallbackListener(IHttpListener httpListener)
         }
 
         public readonly static string CallbackUrl = Invariant($"http://localhost:{CallbackPort}/");
+        private IHttpListenerContext lastContext;
 
         public async Task<string> Listen(string id, CancellationToken cancel)
         {
@@ -51,22 +54,29 @@ public async Task<string> Listen(string id, CancellationToken cancel)
                 {
                     while (true)
                     {
-                        var context = await httpListener.GetContextAsync().ConfigureAwait(false);
-                        var foo = context.Request;
-                        var queryParts = HttpUtility.ParseQueryString(context.Request.Url.Query);
+                        lastContext = await httpListener.GetContextAsync().ConfigureAwait(false);
+                        var queryParts = HttpUtility.ParseQueryString(lastContext.Request.Url.Query);
 
                         if (queryParts["state"] == id)
                         {
-                            context.Response.Close();
                             return queryParts["code"];
                         }
                     }
                 }
             }
-            finally
+            catch(Exception)
             {
                 httpListener.Stop();
+                throw;
             }
         }
+
+        public void RedirectLastContext(Uri url)
+        {
+            lastContext.Response.Redirect(url);
+            lastContext.Response.Close();
+
+            httpListener.Stop();
+        }
     }
 }

test/GitHub.App.UnitTests/Services/OAuthCallbackListenerTests.cs

@@ -5,6 +5,7 @@
 using GitHub.Extensions;
 using GitHub.Services;
 using NSubstitute;
+using NSubstitute.ExceptionExtensions;
 using Rothko;
 using NUnit.Framework;
 
@@ -32,6 +33,8 @@ public async Task ListenStopsHttpListenerAsync()
 
             await target.Listen("id1", CancellationToken.None);
 
+            target.RedirectLastContext(new Uri("http://github.com"));
+
             httpListener.Received(1).Stop();
         }
 
@@ -70,9 +73,39 @@ public async Task SuccessfulResponseClosesResponseAsync()
 
             await target.Listen("id1", CancellationToken.None);
 
+            target.RedirectLastContext(new Uri("http://github.com"));
+
             context.Response.Received(1).Close();
         }
 
+        [Test]
+        public async Task ContextFailureStopsListener()
+        {
+            var httpListener = Substitute.For<IHttpListener>();
+            httpListener
+                .When(x => x.Start())
+                .Do(_ => httpListener.IsListening.Returns(true));
+
+            var context = Substitute.For<IHttpListenerContext>();
+            context.Request.Url.Returns(new Uri($"https://localhost:42549?code=1234&state={"id1"}"));
+            httpListener.GetContext().Returns(context);
+            httpListener.GetContextAsync().Returns(context);
+
+            httpListener.GetContextAsync().Throws(new Exception());
+            var target = new OAuthCallbackListener(httpListener);
+
+            try
+            {
+                await target.Listen("id1", CancellationToken.None);
+            }
+            catch (Exception e)
+            {
+                
+            }
+
+            httpListener.Received(1).Stop();
+        }
+
         static IHttpListener CreateHttpListener(string id)
         {
             var result = Substitute.For<IHttpListener>();