github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-13 18:27:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change to "GET" for getting the Access & Request Token

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2139 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-10-13 13:25:09 +00:00
commit e1fbc6a10e
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
GreenshotPlugin/Core/OAuthHelper.cs
View file

@ -189,7 +189,7 @@ namespace GreenshotPlugin.Core {
throw new ArgumentNullException("data"); throw new ArgumentNullException("data");
} }
byte[] dataBuffer = System.Text.Encoding.UTF8.GetBytes(data); byte[] dataBuffer = Encoding.UTF8.GetBytes(data);
byte[] hashBytes = hashAlgorithm.ComputeHash(dataBuffer); byte[] hashBytes = hashAlgorithm.ComputeHash(dataBuffer);
return Convert.ToBase64String(hashBytes); return Convert.ToBase64String(hashBytes);
@ -268,8 +268,8 @@ namespace GreenshotPlugin.Core {
foreach(var value in requestTokenParameters) { foreach(var value in requestTokenParameters) {
parameters.Add(value); parameters.Add(value);
} }
Sign(HTTPMethod.POST, RequestTokenUrl, parameters); Sign(HTTPMethod.GET, RequestTokenUrl, parameters);
string response = MakeRequest(HTTPMethod.POST, RequestTokenUrl, parameters, null); string response = MakeRequest(HTTPMethod.GET, RequestTokenUrl, parameters, null);
if (response.Length > 0) { if (response.Length > 0) {
response = NetworkHelper.UrlDecode(response); response = NetworkHelper.UrlDecode(response);
LOG.DebugFormat("Request token response: {0}", response); LOG.DebugFormat("Request token response: {0}", response);
@ -319,8 +319,8 @@ namespace GreenshotPlugin.Core {
} }
IDictionary<string, object> parameters = new Dictionary<string, object>(); IDictionary<string, object> parameters = new Dictionary<string, object>();
Sign(HTTPMethod.POST, AccessTokenUrl, parameters); Sign(HTTPMethod.GET, AccessTokenUrl, parameters);
string response = MakeRequest(HTTPMethod.POST, AccessTokenUrl, parameters, null); string response = MakeRequest(HTTPMethod.GET, AccessTokenUrl, parameters, null);
if (response.Length > 0) { if (response.Length > 0) {
response = NetworkHelper.UrlDecode(response); response = NetworkHelper.UrlDecode(response);
LOG.DebugFormat("Access token response: {0}", response); LOG.DebugFormat("Access token response: {0}", response);
@ -482,7 +482,8 @@ namespace GreenshotPlugin.Core {
LOG.DebugFormat("Signature base: {0}", signatureBase); LOG.DebugFormat("Signature base: {0}", signatureBase);
// Generate Signature and add it to the parameters // Generate Signature and add it to the parameters
HMACSHA1 hmacsha1 = new HMACSHA1(); HMACSHA1 hmacsha1 = new HMACSHA1();
hmacsha1.Key = Encoding.UTF8.GetBytes(string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}&{1}", UrlEncode3986(consumerSecret), string.IsNullOrEmpty(TokenSecret) ? string.Empty : UrlEncode3986(TokenSecret))); string key = string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}&{1}", UrlEncode3986(consumerSecret), string.IsNullOrEmpty(TokenSecret) ? string.Empty : UrlEncode3986(TokenSecret));
hmacsha1.Key = Encoding.UTF8.GetBytes(key);
string signature = ComputeHash(hmacsha1, signatureBase.ToString()); string signature = ComputeHash(hmacsha1, signatureBase.ToString());
parameters.Add(OAUTH_SIGNATURE_KEY, signature); parameters.Add(OAUTH_SIGNATURE_KEY, signature);
} }
@ -503,7 +504,7 @@ namespace GreenshotPlugin.Core {
IDictionary<string, object> requestParameters = null; IDictionary<string, object> requestParameters = null;
// Add oAuth values as HTTP headers, if this is allowed // Add oAuth values as HTTP headers, if this is allowed
StringBuilder authHeader = null; StringBuilder authHeader = null;
if (HTTPMethod.POST == method && UseHTTPHeadersForAuthorization) { if (UseHTTPHeadersForAuthorization) {
authHeader = new StringBuilder(); authHeader = new StringBuilder();
requestParameters = new Dictionary<string, object>(); requestParameters = new Dictionary<string, object>();
foreach (string parameterKey in parameters.Keys) { foreach (string parameterKey in parameters.Keys) {
@ -517,14 +518,16 @@ namespace GreenshotPlugin.Core {
if (authHeader.Length > 0) { if (authHeader.Length > 0) {
authHeader.Remove(authHeader.Length - 2, 2); authHeader.Remove(authHeader.Length - 2, 2);
} }
} else if (HTTPMethod.GET == method) {
if (parameters.Count > 0) {
// Add the parameters to the request
requestURL += "?" + NetworkHelper.GenerateQueryParameters(parameters);
}
} else { } else {
requestParameters = parameters; requestParameters = parameters;
} }
if (HTTPMethod.GET == method) {
if (requestParameters.Count > 0) {
// Add the parameters to the request
requestURL += "?" + NetworkHelper.GenerateQueryParameters(requestParameters);
}
}
// Create webrequest // Create webrequest
HttpWebRequest webRequest = (HttpWebRequest)NetworkHelper.CreateWebRequest(requestURL); HttpWebRequest webRequest = (HttpWebRequest)NetworkHelper.CreateWebRequest(requestURL);
webRequest.Method = method.ToString(); webRequest.Method = method.ToString();