Trying to fix all Imgur related tickets for the 1.2.10 version: BUG-2241, BUG-2239, BUG-2236, BUG-2235, BUG-2231

[skip ci]

GreenshotImgurPlugin/ImgurUtils.cs

@@ -36,7 +36,7 @@ namespace GreenshotImgurPlugin {
 		private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(ImgurUtils));
 		private const string SmallUrlPattern = "http://i.imgur.com/{0}s.jpg";
 		private static readonly ImgurConfiguration Config = IniConfig.GetIniSection<ImgurConfiguration>();
-		private const string AuthUrlPattern = "https://api.imgur.com/oauth2/authorize?response_type=code&client_id={ClientId}&redirect_uri={RedirectUrl}&state={State}";
+		private const string AuthUrlPattern = "https://api.imgur.com/oauth2/authorize?response_type=token&client_id={ClientId}&state={State}";
 		private const string TokenUrl = "https://api.imgur.com/oauth2/token";
 
 		/// <summary>

GreenshotPlugin/Controls/OAuthLoginForm.cs

@@ -85,7 +85,9 @@ namespace GreenshotPlugin.Controls {
 
 		private void CheckUrl() {
 			if (_browser.Url.ToString().StartsWith(_callbackUrl)) {
-				string queryParams = _browser.Url.Query;
+				var correctedUri = new Uri(_browser.Url.AbsoluteUri.Replace("#", "&"));
+
+				string queryParams = correctedUri.Query;
 				if (queryParams.Length > 0) {
 					queryParams = NetworkHelper.UrlDecode(queryParams);
 					//Store the Token and Token Secret

GreenshotPlugin/Core/OAuthHelper.cs

@@ -1012,6 +1012,37 @@ Greenshot received information from CloudServiceName. You can close this browser
 			settings.Code = null;
 		}
 
+		/// <summary>
+		/// Used to update the settings with the callback information
+		/// </summary>
+		/// <param name="settings">OAuth2Settings</param>
+		/// <param name="callbackParameters">IDictionary</param>
+		/// <returns>true if the access token is already in the callback</returns>
+		private static bool UpdateFromCallback(OAuth2Settings settings, IDictionary<string, string> callbackParameters)
+		{
+			if (!callbackParameters.ContainsKey(AccessToken))
+			{
+				return false;
+			}
+			if (callbackParameters.ContainsKey(RefreshToken))
+			{
+				// Refresh the refresh token :)
+				settings.RefreshToken = callbackParameters[RefreshToken];
+			}
+			var expiresIn = callbackParameters[ExpiresIn];
+			settings.AccessTokenExpires = DateTimeOffset.MaxValue;
+			if (expiresIn != null)
+			{
+				double seconds;
+				if (double.TryParse(expiresIn, out seconds))
+				{
+					settings.AccessTokenExpires = DateTimeOffset.Now.AddSeconds(seconds);
+				}
+			}
+			settings.AccessToken = callbackParameters[AccessToken];
+			return true;
+		}
+
 		/// <summary>
 		/// Go out and retrieve a new access token via refresh-token with the TokenUrl in the settings
 		/// Will upate the access token, refresh token, expire date
@@ -1109,6 +1140,7 @@ Greenshot received information from CloudServiceName. You can close this browser
 					GenerateRefreshToken(settings);
 					return true;
 				}
+				return UpdateFromCallback(settings, loginForm.CallbackParameters);
 			}
 			return false;
 		}

appveyor12.yml

@@ -1,7 +1,7 @@
-version: 1.2.9.{build}
+version: 1.2.10.{build}
 branches:
   only:
-  - release/1.2.9BF2
+  - release/1.2.10
 skip_tags: true
 configuration: Release
 platform: Any CPU
@@ -38,7 +38,7 @@ environment:
     secure: bjKXhFZkDqaq98XBrz5oQKQfT8CLpuv2ZAiBIwkzloaAPUs97b5yx6h/xFaE4NLS
   credentials_picasa_consumer_secret:
     secure: yNptTpmJWypbu9alOQtetxU66drr2FKxoPflNgRJdag=
-  build_type: RELEASE
+  build_type: RC
   rsakey:
     secure: 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
 before_build: