From 66427c39329edefd9214b92d8fb7941f0aa5b566 Mon Sep 17 00:00:00 2001
From: RKrom <robin@getgreenshot.org>
Date: Fri, 14 Sep 2012 06:36:06 +0000
Subject: [PATCH] OAuth Code cleanup and Dropbox CallbackUrl fix.

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2029 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
---
 GreenshotPlugin/Controls/OAuthLoginForm.cs |  2 +-
 GreenshotPlugin/Core/OAuthHelper.cs        | 26 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/GreenshotPlugin/Controls/OAuthLoginForm.cs b/GreenshotPlugin/Controls/OAuthLoginForm.cs
index a4c32cfa2..2de8d2460 100644
--- a/GreenshotPlugin/Controls/OAuthLoginForm.cs
+++ b/GreenshotPlugin/Controls/OAuthLoginForm.cs
@@ -88,7 +88,7 @@ namespace GreenshotPlugin.Controls {
 		}
 
 		private void checkUrl() {
-			if (browser.Url.ToString().Contains(_oauth.CallbackUrl)) {
+			if (browser.Url.ToString().StartsWith(_oauth.CallbackUrl)) {
 				string queryParams = browser.Url.Query;
 				if (queryParams.Length > 0) {
 					//Store the Token and Token Secret
diff --git a/GreenshotPlugin/Core/OAuthHelper.cs b/GreenshotPlugin/Core/OAuthHelper.cs
index f89fd10da..abf48a1dd 100644
--- a/GreenshotPlugin/Core/OAuthHelper.cs
+++ b/GreenshotPlugin/Core/OAuthHelper.cs
@@ -96,7 +96,7 @@ namespace GreenshotPlugin.Core {
 		protected const string OAuthTimestampKey = "oauth_timestamp";
 		protected const string OAuthNonceKey = "oauth_nonce";
 		protected const string OAuthTokenKey = "oauth_token";
-		protected const string oAauthVerifier = "oauth_verifier";
+		protected const string oAauthVerifierKey = "oauth_verifier";
 		protected const string OAuthTokenSecretKey = "oauth_token_secret";
 
 		protected const string HMACSHA1SignatureType = "HMAC-SHA1";
@@ -313,7 +313,7 @@ namespace GreenshotPlugin.Core {
 			}
 
 			if (!string.IsNullOrEmpty(oauth_verifier)) {
-				parameters.Add(new QueryParameter(oAauthVerifier, oauth_verifier));
+				parameters.Add(new QueryParameter(oAauthVerifierKey, oauth_verifier));
 			}
 
 
@@ -419,9 +419,9 @@ namespace GreenshotPlugin.Core {
 			string response = oAuthWebRequest(Method.POST, RequestTokenUrl, String.Empty);
 			if (response.Length > 0) {
 				NameValueCollection qs = NetworkHelper.ParseQueryString(response);
-				if (qs["oauth_token"] != null) {
-					this.Token = qs["oauth_token"];
-					this.TokenSecret = qs["oauth_token_secret"];
+				if (qs[OAuthTokenKey] != null) {
+					this.Token = qs[OAuthTokenKey];
+					this.TokenSecret = qs[OAuthTokenSecretKey];
 					ret = this.Token;
 				}
 			}
@@ -437,7 +437,7 @@ namespace GreenshotPlugin.Core {
 				Exception e = new Exception("The request token is not set");
 				throw e;
 			}
-			LOG.DebugFormat("Opening browser for URL: {0}", AuthorizationLink);
+			LOG.DebugFormat("Opening AuthorizationLink: {0}", AuthorizationLink);
 			OAuthLoginForm oAuthLoginForm = new OAuthLoginForm(this, browserTitle, BrowserWidth, BrowserHeight);
 			oAuthLoginForm.ShowDialog();
 			Token = oAuthLoginForm.Token;
@@ -467,11 +467,11 @@ namespace GreenshotPlugin.Core {
 
 			if (response.Length > 0) {
 				NameValueCollection qs = NetworkHelper.ParseQueryString(response);
-				if (qs["oauth_token"] != null) {
-					this.Token = qs["oauth_token"];
+				if (qs[OAuthTokenKey] != null) {
+					this.Token = qs[OAuthTokenKey];
 				}
-				if (qs["oauth_token_secret"] != null) {
-					this.TokenSecret = qs["oauth_token_secret"];
+				if (qs[OAuthTokenSecretKey] != null) {
+					this.TokenSecret = qs[OAuthTokenSecretKey];
 				}
 			}
 
@@ -484,7 +484,7 @@ namespace GreenshotPlugin.Core {
 		/// <returns>The url with a valid request token, or a null string.</returns>
 		public string AuthorizationLink {
 			get {
-				return AuthorizeUrl + "?oauth_token=" + this.Token;
+				return AuthorizeUrl + "?" + OAuthTokenKey + "=" + this.Token + "&" + OAuthCallbackKey + "=" + UrlEncode3986(CallbackUrl);
 			}
 		}
 
@@ -525,7 +525,7 @@ namespace GreenshotPlugin.Core {
 			if (querystring.Length > 0) {
 				querystring += "&";
 			}
-			querystring += "oauth_signature=" + NetworkHelper.UrlEncode(sig);
+			querystring += OAuthSignatureKey + "=" + NetworkHelper.UrlEncode(sig);
 
 			if (querystring.Length > 0) {
 				outUrl += "?";
@@ -597,7 +597,7 @@ namespace GreenshotPlugin.Core {
 			if (querystring.Length > 0) {
 				querystring += "&";
 			}
-			querystring += "oauth_signature=" + NetworkHelper.UrlEncode(sig);
+			querystring += OAuthSignatureKey + "=" + NetworkHelper.UrlEncode(sig);
 
 			//Convert the querystring to postData
 			if (method == Method.POST) {