Implement IDisposable

ShareX.UploadersLib/Forms/UploadersConfigForm.cs

@@ -3051,6 +3051,11 @@ private async void oauth2YouTube_OpenButtonClicked()
             {
                 Config.YouTubeOAuth2Info = listener.OAuth.AuthInfo;
             }
+            else
+            {
+                Config.YouTubeOAuth2Info = null;
+            }
+            this.ForceActivate();
             ConfigureOAuthStatus(oauth2YouTube, result);
         }
 

ShareX.UploadersLib/OAuth/OAuthListener.cs

@@ -33,17 +33,31 @@
 
 namespace ShareX.UploadersLib
 {
-    public class OAuthListener
+    public class OAuthListener : IDisposable
     {
         public IOAuth2Loopback OAuth { get; private set; }
+        public string Code { get; private set; }
+
+        private HttpListener listener;
 
         public OAuthListener(IOAuth2Loopback oauth)
         {
             OAuth = oauth;
         }
 
+        public void Dispose()
+        {
+            listener?.Close();
+            listener = null;
+        }
+
         public async Task<bool> ConnectAsync()
         {
+            try
+            {
+                Dispose();
+                Code = null;
+
                 IPAddress ip = IPAddress.Loopback;
                 int port = URLHelpers.GetRandomUnusedPort();
                 string redirectURI = string.Format($"http://{ip}:{port}/");
@@ -64,19 +78,18 @@ public async Task<bool> ConnectAsync()
 
                 try
                 {
-                using (HttpListener listener = new HttpListener())
+                    listener = new HttpListener();
-                {
                     listener.Prefixes.Add(redirectURI);
                     listener.Start();
 
                     HttpListenerContext context = await listener.GetContextAsync();
-                    string code = context.Request.QueryString.Get("code");
+                    Code = context.Request.QueryString.Get("code");
 
                     using (HttpListenerResponse response = context.Response)
                     {
                         string status;
 
-                        if (!string.IsNullOrEmpty(code))
+                        if (!string.IsNullOrEmpty(Code))
                         {
                             status = "Authorization completed successfully.";
                         }
@@ -96,16 +109,21 @@ public async Task<bool> ConnectAsync()
                             await responseOutput.FlushAsync();
                         }
                     }
-
-                    if (!string.IsNullOrEmpty(code))
-                    {
-                        return await Task.Run(() => OAuth.GetAccessToken(code));
                 }
+                finally
+                {
+                    Dispose();
+                }
+
+                if (!string.IsNullOrEmpty(Code))
+                {
+                    return await Task.Run(() => OAuth.GetAccessToken(Code));
                 }
             }
             catch (Exception e)
             {
                 DebugHelper.WriteException(e);
+                e.ShowError();
             }
 
             return false;

ShareX.UploadersLib/Resources/OAuthCallbackPage.html

@@ -37,12 +37,6 @@
         <p>{0}</p>
         <p>You can now close this page.</p>
     </div>
-
-    <script>
-        setTimeout(function() {
-            window.close();
-        }, 30000);
-    </script>
 </body>
 
 </html>