ShareX
/
ShareX
mirror of https://github.com/ShareX/ShareX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement IDisposable

This commit is contained in:
Jaex 2022-12-07 17:26:58 +03:00
parent 4ae7cc56a9
commit 09500ebaa8
3 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View File

@ -3051,6 +3051,11 @@ namespace ShareX.UploadersLib
{
Config.YouTubeOAuth2Info = listener.OAuth.AuthInfo;
}
else
{
Config.YouTubeOAuth2Info = null;
}
this.ForceActivate();
ConfigureOAuthStatus(oauth2YouTube, result);
}

70
ShareX.UploadersLib/OAuth/OAuthListener.cs
View File

@ -33,50 +33,63 @@ using System.Threading.Tasks;
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()
{
IPAddress ip = IPAddress.Loopback;
int port = URLHelpers.GetRandomUnusedPort();
string redirectURI = string.Format($"http://{ip}:{port}/");
OAuth.RedirectURI = redirectURI;
string url = OAuth.GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
{
URLHelpers.OpenURL(url);
DebugHelper.WriteLine("Authorization URL is opened: " + url);
}
else
{
DebugHelper.WriteLine("Authorization URL is empty.");
return false;
}
try
{
using (HttpListener listener = new HttpListener())
Dispose();
Code = null;
IPAddress ip = IPAddress.Loopback;
int port = URLHelpers.GetRandomUnusedPort();
string redirectURI = string.Format($"http://{ip}:{port}/");
OAuth.RedirectURI = redirectURI;
string url = OAuth.GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
{
URLHelpers.OpenURL(url);
DebugHelper.WriteLine("Authorization URL is opened: " + url);
}
else
{
DebugHelper.WriteLine("Authorization URL is empty.");
return false;
}
try
{
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 @@ namespace ShareX.UploadersLib
await responseOutput.FlushAsync();
}
}
}
finally
{
Dispose();
}
if (!string.IsNullOrEmpty(code))
{
return await Task.Run(() => OAuth.GetAccessToken(code));
}
if (!string.IsNullOrEmpty(Code))
{
return await Task.Run(() => OAuth.GetAccessToken(Code));
}
}
catch (Exception e)
{
DebugHelper.WriteException(e);
e.ShowError();
}
return false;

6
ShareX.UploadersLib/Resources/OAuthCallbackPage.html
View File

@ -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>