Redirecting to the profile page after OAuth login

Author: StanleyGoldman

src/GitHub.Api/IOAuthCallbackListener.cs

@@ -16,5 +16,7 @@ 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);
+
+        void RedirectCloseStop(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.RedirectCloseStop(hostAddress.WebUri.Append(result.User.Login));
+
             return result;
         }
 

src/GitHub.App/Services/OAuthCallbackListener.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.Composition;
+using System;
+using System.ComponentModel.Composition;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
@@ -39,6 +40,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 +53,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 RedirectCloseStop(Uri url)
+        {
+            lastContext.Response.Redirect(url);
+            lastContext.Response.Close();
+
+            httpListener.Stop();
+        }
     }
 }