CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3413 from SupSuper/clean-oauth

Browse source 
Clean up OAuth2 Uploaders
This commit is contained in:
Jaex 2018-05-17 09:16:59 +03:00 committed by GitHub
commit 70d769d79e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 593 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View file

@ -29,6 +29,7 @@ You should have received a copy of the GNU General Public License
using ShareX.UploadersLib.ImageUploaders;
using ShareX.UploadersLib.Properties;
using ShareX.UploadersLib.TextUploaders;
using ShareX.UploadersLib.URLShorteners;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@ -831,12 +832,13 @@ private void atcImgurAccountType_AccountTypeChanged(AccountType accountType)
private void oauth2Imgur_OpenButtonClicked()
{
ImgurAuthOpen();
OAuth2Info oauth = new OAuth2Info(APIKeys.ImgurClientID, APIKeys.ImgurClientSecret);
Config.ImgurOAuth2Info = OAuth2Open(new Imgur(oauth));
}
private void oauth2Imgur_CompleteButtonClicked(string code)
{
ImgurAuthComplete(code);
btnImgurRefreshAlbumList.Enabled = OAuth2Complete(new Imgur(Config.ImgurOAuth2Info), code, oauth2Imgur);
}
private void oauth2Imgur_ClearButtonClicked()
@ -846,7 +848,7 @@ private void oauth2Imgur_ClearButtonClicked()
private void oauth2Imgur_RefreshButtonClicked()
{
ImgurAuthRefresh();
btnImgurRefreshAlbumList.Enabled = OAuth2Refresh(new Imgur(Config.ImgurOAuth2Info), oauth2Imgur);
}
private void cbImgurDirectLink_CheckedChanged(object sender, EventArgs e)
@ -1078,12 +1080,13 @@ private void btnPhotobucketRemoveAlbum_Click(object sender, EventArgs e)
private void oauth2Picasa_OpenButtonClicked()
{
GooglePhotosAuthOpen();
OAuth2Info oauth = new OAuth2Info(APIKeys.GoogleClientID, APIKeys.GoogleClientSecret);
Config.PicasaOAuth2Info = OAuth2Open(new GooglePhotos(oauth));
}
private void oauth2Picasa_CompleteButtonClicked(string code)
{
GooglePhotosAuthComplete(code);
btnPicasaRefreshAlbumList.Enabled = OAuth2Complete(new GooglePhotos(Config.PicasaOAuth2Info), code, oauth2Picasa);
}
private void oauth2Picasa_ClearButtonClicked()
@ -1093,7 +1096,7 @@ private void oauth2Picasa_ClearButtonClicked()
private void oauth2Picasa_RefreshButtonClicked()
{
GooglePhotosAuthRefresh();
btnPicasaRefreshAlbumList.Enabled = OAuth2Refresh(new GooglePhotos(Config.PicasaOAuth2Info), oauth2Picasa);
}
private void txtPicasaAlbumID_TextChanged(object sender, EventArgs e)
@ -1264,12 +1267,13 @@ private void txtPaste_eeUserAPIKey_TextChanged(object sender, EventArgs e)
private void oAuth2Gist_OpenButtonClicked()
{
GistAuthOpen();
OAuth2Info oauth = new OAuth2Info(APIKeys.GitHubID, APIKeys.GitHubSecret);
Config.GistOAuth2Info = OAuth2Open(new GitHubGist(oauth));
}
private void oAuth2Gist_CompleteButtonClicked(string code)
{
GistAuthComplete(code);
OAuth2Complete(new GitHubGist(Config.GistOAuth2Info), code, oAuth2Gist);
}
private void oAuth2Gist_ClearButtonClicked()
@ -1686,12 +1690,13 @@ private void pbDropboxLogo_Click(object sender, EventArgs e)
private void oauth2Dropbox_OpenButtonClicked()
{
DropboxAuthOpen();
OAuth2Info oauth = new OAuth2Info(APIKeys.DropboxConsumerKey, APIKeys.DropboxConsumerSecret);
Config.DropboxOAuth2Info = OAuth2Open(new Dropbox(oauth));
}
private void oauth2Dropbox_CompleteButtonClicked(string code)
{
DropboxAuthComplete(code);
OAuth2Complete(new Dropbox(Config.DropboxOAuth2Info), code, oauth2Dropbox);
}
private void oauth2Dropbox_ClearButtonClicked()
@ -1721,17 +1726,19 @@ private void cbDropboxUseDirectLink_CheckedChanged(object sender, EventArgs e)
private void oAuth2OneDrive_OpenButtonClicked()
{
OneDriveAuthOpen();
OAuth2Info oauth = new OAuth2Info(APIKeys.OneDriveClientID, APIKeys.OneDriveClientSecret);
oauth.Proof = new OAuth2ProofKey(OAuth2ChallengeMethod.SHA256);
Config.OneDriveV2OAuth2Info = OAuth2Open(new OneDrive(oauth));
}
private void oAuth2OneDrive_CompleteButtonClicked(string code)
{
OneDriveAuthComplete(code);
tvOneDrive.Enabled = OAuth2Complete(new OneDrive(Config.OneDriveV2OAuth2Info), code, oAuth2OneDrive);
}
private void oAuth2OneDrive_RefreshButtonClicked()
{
OneDriveAuthRefresh();
tvOneDrive.Enabled = OAuth2Refresh(new OneDrive(Config.OneDriveV2OAuth2Info), oAuth2OneDrive);
}
private void oAuth2OneDrive_ClearButtonClicked()
@ -1898,17 +1905,18 @@ private void txtPuushAPIKey_TextChanged(object sender, EventArgs e)
private void oauth2Box_OpenButtonClicked()
{
BoxAuthOpen();
OAuth2Info oauth = new OAuth2Info(APIKeys.BoxClientID, APIKeys.BoxClientSecret);
Config.BoxOAuth2Info = OAuth2Open(new Box(oauth));
}
private void oauth2Box_CompleteButtonClicked(string code)
{
BoxAuthComplete(code);
btnBoxRefreshFolders.Enabled = OAuth2Complete(new Box(Config.BoxOAuth2Info), code, oauth2Box);
}
private void oauth2Box_RefreshButtonClicked()
{
BoxAuthRefresh();
btnBoxRefreshFolders.Enabled = OAuth2Refresh(new Box(Config.BoxOAuth2Info), oauth2Box);
}
private void oauth2Box_ClearButtonClicked()
@ -2948,12 +2956,13 @@ private void atcGfycatAccountType_AccountTypeChanged(AccountType accountType)
private void oauth2Gfycat_OpenButtonClicked()
{
GfycatAuthOpen();
OAuth2Info oauth = new OAuth2Info(APIKeys.GfycatClientID, APIKeys.GfycatClientSecret);
Config.GfycatOAuth2Info = OAuth2Open(new GfycatUploader(oauth));
}
private void oauth2Gfycat_CompleteButtonClicked(string code)
{
GfycatAuthComplete(code);
OAuth2Complete(new GfycatUploader(Config.GfycatOAuth2Info), code, oauth2Gfycat);
}
private void oauth2Gfycat_ClearButtonClicked()
@ -2963,7 +2972,7 @@ private void oauth2Gfycat_ClearButtonClicked()
private void oauth2Gfycat_RefreshButtonClicked()
{
GfycatAuthRefresh();
OAuth2Refresh(new GfycatUploader(Config.GfycatOAuth2Info), oauth2Gfycat);
}
private void cbGfycatIsPublic_CheckedChanged(object sender, EventArgs e)
@ -3059,12 +3068,13 @@ private void txtGoogleCloudStorageObjectPrefix_TextChanged(object sender, EventA
private void oauth2Bitly_OpenButtonClicked()
{
BitlyAuthOpen();
OAuth2Info oauth = new OAuth2Info(APIKeys.BitlyClientID, APIKeys.BitlyClientSecret);
Config.BitlyOAuth2Info = OAuth2Open(new BitlyURLShortener(oauth));
}
private void oauth2Bitly_CompleteButtonClicked(string code)
{
BitlyAuthComplete(code);
OAuth2Complete(new BitlyURLShortener(Config.BitlyOAuth2Info), code, oauth2Bitly);
}
private void oauth2Bitly_ClearButtonClicked()

574
ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs
View file

@ -43,88 +43,6 @@ public partial class UploadersConfigForm
{
#region Imgur
private void ImgurAuthOpen()
{
try
{
OAuth2Info oauth = new OAuth2Info(APIKeys.ImgurClientID, APIKeys.ImgurClientSecret);
string url = new Imgur(oauth).GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
{
Config.ImgurOAuth2Info = oauth;
URLHelpers.OpenURL(url);
DebugHelper.WriteLine("ImgurAuthOpen - Authorization URL is opened: " + url);
}
else
{
DebugHelper.WriteLine("ImgurAuthOpen - Authorization URL is empty.");
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
private void ImgurAuthComplete(string code)
{
try
{
if (!string.IsNullOrEmpty(code) && Config.ImgurOAuth2Info != null)
{
bool result = new Imgur(Config.ImgurOAuth2Info).GetAccessToken(code);
if (result)
{
oauth2Imgur.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oauth2Imgur.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
btnImgurRefreshAlbumList.Enabled = result;
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
private void ImgurAuthRefresh()
{
try
{
if (OAuth2Info.CheckOAuth(Config.ImgurOAuth2Info))
{
bool result = new Imgur(Config.ImgurOAuth2Info).RefreshAccessToken();
if (result)
{
oauth2Imgur.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oauth2Imgur.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
atcImgurAccountType.SelectedAccountType = AccountType.Anonymous;
}
btnImgurRefreshAlbumList.Enabled = result;
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
private void ImgurRefreshAlbumList()
{
try
@ -292,87 +210,6 @@ public void PhotobucketCreateAlbum()
#region Google Photos
public void GooglePhotosAuthOpen()
{
try
{
OAuth2Info oauth = new OAuth2Info(APIKeys.GoogleClientID, APIKeys.GoogleClientSecret);
string url = new GooglePhotos(oauth).GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
{
Config.PicasaOAuth2Info = oauth;
URLHelpers.OpenURL(url);
DebugHelper.WriteLine("GooglePhotosAuthOpen - Authorization URL is opened: " + url);
}
else
{
DebugHelper.WriteLine("GooglePhotosAuthOpen - Authorization URL is empty.");
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void GooglePhotosAuthComplete(string code)
{
try
{
if (!string.IsNullOrEmpty(code) && Config.PicasaOAuth2Info != null)
{
bool result = new GoogleDrive(Config.PicasaOAuth2Info).GetAccessToken(code);
if (result)
{
oauth2Picasa.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oauth2Picasa.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
btnPicasaRefreshAlbumList.Enabled = result;
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void GooglePhotosAuthRefresh()
{
try
{
if (OAuth2Info.CheckOAuth(Config.PicasaOAuth2Info))
{
bool result = new GoogleDrive(Config.PicasaOAuth2Info).RefreshAccessToken();
if (result)
{
oauth2Picasa.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oauth2Picasa.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
btnPicasaRefreshAlbumList.Enabled = result;
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void GooglePhotosRefreshAlbumList()
{
try
@ -404,64 +241,6 @@ public void GooglePhotosRefreshAlbumList()
#endregion Google Photos
#region Dropbox
public void DropboxAuthOpen()
{
try
{
OAuth2Info oauth = new OAuth2Info(APIKeys.DropboxConsumerKey, APIKeys.DropboxConsumerSecret);
string url = new Dropbox(oauth).GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
{
Config.DropboxOAuth2Info = oauth;
URLHelpers.OpenURL(url);
DebugHelper.WriteLine("DropboxAuthOpen - Authorization URL is opened: " + url);
}
else
{
DebugHelper.WriteLine("DropboxAuthOpen - Authorization URL is empty.");
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void DropboxAuthComplete(string code)
{
try
{
if (!string.IsNullOrEmpty(code) && Config.DropboxOAuth2Info != null)
{
Dropbox dropbox = new Dropbox(Config.DropboxOAuth2Info);
bool result = dropbox.GetAccessToken(code);
if (result)
{
oauth2Dropbox.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
else
{
oauth2Dropbox.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
catch (Exception ex)
{
DebugHelper.WriteException(ex);
ex.ShowError();
}
}
#endregion Dropbox
#region Amazon S3
private void UpdateAmazonS3Status()
@ -521,87 +300,6 @@ private void GoogleDriveRefreshFolders()
#region Box
public void BoxAuthOpen()
{
try
{
OAuth2Info oauth = new OAuth2Info(APIKeys.BoxClientID, APIKeys.BoxClientSecret);
string url = new Box(oauth).GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
{
Config.BoxOAuth2Info = oauth;
URLHelpers.OpenURL(url);
DebugHelper.WriteLine("BoxAuthOpen - Authorization URL is opened: " + url);
}
else
{
DebugHelper.WriteLine("BoxAuthOpen - Authorization URL is empty.");
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void BoxAuthComplete(string code)
{
try
{
if (!string.IsNullOrEmpty(code) && Config.BoxOAuth2Info != null)
{
bool result = new Box(Config.BoxOAuth2Info).GetAccessToken(code);
if (result)
{
oauth2Box.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oauth2Box.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
btnBoxRefreshFolders.Enabled = result;
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void BoxAuthRefresh()
{
try
{
if (OAuth2Info.CheckOAuth(Config.BoxOAuth2Info))
{
bool result = new Box(Config.BoxOAuth2Info).RefreshAccessToken();
if (result)
{
oauth2Box.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oauth2Box.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
btnBoxRefreshFolders.Enabled = result;
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void BoxListFolders()
{
lvBoxFolders.Items.Clear();
@ -641,88 +339,6 @@ private void BoxAddFolder(BoxFileEntry folder)
#region OneDrive
public void OneDriveAuthOpen()
{
try
{
OAuth2Info oauth = new OAuth2Info(APIKeys.OneDriveClientID, APIKeys.OneDriveClientSecret);
oauth.Proof = new OAuth2ProofKey(OAuth2ChallengeMethod.SHA256);
string url = new OneDrive(oauth).GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
{
Config.OneDriveV2OAuth2Info = oauth;
URLHelpers.OpenURL(url);
DebugHelper.WriteLine("OneDriveAuthOpen - Authorization URL is opened: " + url);
}
else
{
DebugHelper.WriteLine("OneDriveAuthOpen - Authorization URL is empty.");
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void OneDriveAuthComplete(string code)
{
try
{
if (!string.IsNullOrEmpty(code) && Config.OneDriveV2OAuth2Info != null)
{
bool result = new OneDrive(Config.OneDriveV2OAuth2Info).GetAccessToken(code);
if (result)
{
oAuth2OneDrive.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oAuth2OneDrive.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
tvOneDrive.Enabled = result;
}
}
catch (Exception ex)
{
DebugHelper.WriteException(ex);
ex.ShowError();
}
}
public void OneDriveAuthRefresh()
{
try
{
if (OAuth2Info.CheckOAuth(Config.OneDriveV2OAuth2Info))
{
bool result = new OneDrive(Config.OneDriveV2OAuth2Info).RefreshAccessToken();
if (result)
{
oAuth2OneDrive.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oAuth2OneDrive.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
tvOneDrive.Enabled = result;
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void OneDriveListFolders(OneDriveFileInfo fileEntry, TreeNode tnParent)
{
Application.DoEvents();
@ -1248,61 +864,6 @@ private void TwitterAuthClear()
#endregion Twitter
#region bit.ly
public void BitlyAuthOpen()
{
try
{
OAuth2Info oauth = new OAuth2Info(APIKeys.BitlyClientID, APIKeys.BitlyClientSecret);
string url = new BitlyURLShortener(oauth).GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
{
Config.BitlyOAuth2Info = oauth;
URLHelpers.OpenURL(url);
DebugHelper.WriteLine("BitlyAuthOpen - Authorization URL is opened: " + url);
}
else
{
DebugHelper.WriteLine("BitlyAuthOpen - Authorization URL is empty.");
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void BitlyAuthComplete(string code)
{
try
{
if (!string.IsNullOrEmpty(code) && Config.BitlyOAuth2Info != null)
{
bool result = new BitlyURLShortener(Config.BitlyOAuth2Info).GetAccessToken(code);
if (result)
{
oauth2Bitly.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oauth2Bitly.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
#endregion bit.ly
#region Custom uploader
private bool CustomUploaderCheck(int index)
@ -1825,137 +1386,6 @@ public void JiraAuthComplete(string code)
#endregion Jira
#region Gist
public void GistAuthOpen()
{
try
{
OAuth2Info oauth = new OAuth2Info(APIKeys.GitHubID, APIKeys.GitHubSecret);
string url = new GitHubGist(oauth).GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
{
Config.GistOAuth2Info = oauth;
URLHelpers.OpenURL(url);
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
public void GistAuthComplete(string code)
{
try
{
if (!string.IsNullOrEmpty(code) && Config.GistOAuth2Info != null)
{
bool result = new GitHubGist(Config.GistOAuth2Info).GetAccessToken(code);
if (result)
{
oAuth2Gist.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oAuth2Gist.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
#endregion Gist
#region Gfycat
private void GfycatAuthOpen()
{
try
{
OAuth2Info oauth = new OAuth2Info(APIKeys.GfycatClientID, APIKeys.GfycatClientSecret);
string url = new GfycatUploader(oauth).GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
{
Config.GfycatOAuth2Info = oauth;
URLHelpers.OpenURL(url);
DebugHelper.WriteLine("GfycatAuthOpen - Authorization URL is opened: " + url);
}
else
{
DebugHelper.WriteLine("GfycatAuthOpen - Authorization URL is empty.");
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
private void GfycatAuthComplete(string code)
{
try
{
if (!string.IsNullOrEmpty(code) && Config.GfycatOAuth2Info != null)
{
bool result = new GfycatUploader(Config.GfycatOAuth2Info).GetAccessToken(code);
if (result)
{
oauth2Gfycat.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oauth2Gfycat.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
private void GfycatAuthRefresh()
{
try
{
if (OAuth2Info.CheckOAuth(Config.GfycatOAuth2Info))
{
bool result = new GfycatUploader(Config.GfycatOAuth2Info).RefreshAccessToken();
if (result)
{
oauth2Gfycat.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
oauth2Gfycat.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
atcGfycatAccountType.SelectedAccountType = AccountType.Anonymous;
}
}
}
catch (Exception ex)
{
ex.ShowError();
}
}
#endregion Gfycat
#region Shared folder
private void SharedFolderUpdateControls()
@ -2029,7 +1459,7 @@ private bool SharedFolderRemoveItem(int index)
#region Generic OAuth2
private OAuth2Info OAuth2Open(IOAuth2 uploader)
private OAuth2Info OAuth2Open(IOAuth2Basic uploader)
{
try
{
@ -2054,7 +1484,7 @@ private OAuth2Info OAuth2Open(IOAuth2 uploader)
return null;
}
private bool OAuth2Complete(IOAuth2 uploader, string code, OAuthControl control)
private bool OAuth2Complete(IOAuth2Basic uploader, string code, OAuthControl control)
{
try
{