kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile

Browse Source
This commit is contained in:
Joshua Granick
2015-11-21 00:43:42 -08:00
parent f16716c2e8
commit da62ffee2a
2 changed files with 121 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lime/net/HTTPRequest.hx
View File

@@ -1,7 +1,6 @@
package lime.net;
import flash.utils.ByteArray;
import haxe.io.Bytes;
import lime.app.Future;
import lime.app.Promise;

242
lime/net/oauth/OAuthRequest.hx
View File

@@ -1,124 +1,124 @@
package lime.net.oauth;
import haxe.crypto.Base64;
import haxe.crypto.Hmac;
import haxe.io.Bytes;
import lime.net.URLRequestMethod;
import lime.net.URLRequestHeader;
import lime.net.URLRequest;
import lime.net.URIParser;
import lime.net.oauth.OAuthToken;
using StringTools;
class OAuthRequest {
public var version:OAuthVersion = V1;
public var parameters:Map<String, String>;
public var request:URLRequest;
private var uri:URIParser;
public function new (version:OAuthVersion = V1, method:URLRequestMethod, url:String, parameters:Map<String, String>) {
this.version = version;
request = new URLRequest();
request.url = url;
request.method = cast method;
this.parameters = parameters;
uri = new URIParser(url);
}
public function getHeader ():URLRequestHeader {
var result = "";
switch(version) {
case V1:
result = "OAuth ";
var keys = parameters.keys();
for(key in keys) {
result += '${key.urlEncode()}="${parameters.get(key).urlEncode()}"';
if(keys.hasNext()) {
result += ", ";
}
}
case V2:
// TODO
}
return new URLRequestHeader("Authorization", result);
}
/**
* Signs the petition, only for OAuth 1.0
*/
public function sign (consumer:OAuthConsumer, ?accessToken:OAuth1AccessToken, ?signatureMethod:OAuthSignatureMethod = HMAC_SHA1):Void {
var key = consumer.secret.urlEncode() + "&";
if(accessToken != null) {
key += accessToken.secret == null ? "" : accessToken.secret.urlEncode();
}
var message = request.method + "&" + normalizeURI() + "&" + normalizeParameters();
var hash = new Hmac (SHA1);
var bytes = hash.make (Bytes.ofString (key), Bytes.ofString (message));
parameters.set("oauth_signature", Base64.encode (bytes));
}
// SIGNING FUNCTIONS
/**
* Prepares the message parameters for the signing process
*/
private function normalizeParameters():String {
var result = new Array<KVPair>();
if(uri.queryArray != null) {
result = result.concat(uri.queryArray);
}
// TODO add data if POST
for(key in parameters.keys()) {
if(key == "realm") continue;
result.push( { k: key, v: parameters.get(key) } );
}
result.sort(OAuthSort);
return result.map(function(p:KVPair) return p.k.urlEncode()+"="+p.v.urlEncode()).join("&").urlEncode();
}
private function normalizeURI():String {
var scheme = uri.protocol == null ? "https" : uri.protocol.toLowerCase();
var authority = uri.authority.toLowerCase();
var port = (scheme == "https" || scheme == "http") ? null : uri.port;
var path = uri.path;
var result = (scheme + "://" + authority + (port == null ? "" : ":" + port) + path);
return result.urlEncode();
}
/**
* Parameters are sorted by name, using lexicographical byte value ordering.
* If two or more parameters share the same name, they are sorted by their value.
*/
private function OAuthSort(a:KVPair, b:KVPair) {
return if(a.k < b.k) -1 else if (a.k > b.k) 1 else if (a.v < b.v) -1 else 1;
}
}
typedef KVPair = {k:String, v:String};
//import haxe.crypto.Base64;
//import haxe.crypto.Hmac;
//import haxe.io.Bytes;
//import lime.net.URLRequestMethod;
//import lime.net.URLRequestHeader;
//import lime.net.URLRequest;
//import lime.net.URIParser;
//import lime.net.oauth.OAuthToken;
//
//using StringTools;
//
//class OAuthRequest {
//
//public var version:OAuthVersion = V1;
//public var parameters:Map<String, String>;
//public var request:URLRequest;
//
//private var uri:URIParser;
//
//
//public function new (version:OAuthVersion = V1, method:URLRequestMethod, url:String, parameters:Map<String, String>) {
//
//this.version = version;
//request = new URLRequest();
//request.url = url;
//request.method = cast method;
//this.parameters = parameters;
//
//uri = new URIParser(url);
//
//}
//
//
//public function getHeader ():URLRequestHeader {
//
//var result = "";
//
//switch(version) {
//
//case V1:
//result = "OAuth ";
//
//var keys = parameters.keys();
//for(key in keys) {
//result += '${key.urlEncode()}="${parameters.get(key).urlEncode()}"';
//if(keys.hasNext()) {
//result += ", ";
//}
//}
//
//case V2:
//// TODO
//}
//
//return new URLRequestHeader("Authorization", result);
//
//}
//
///**
//* Signs the petition, only for OAuth 1.0
//*/
//public function sign (consumer:OAuthConsumer, ?accessToken:OAuth1AccessToken, ?signatureMethod:OAuthSignatureMethod = HMAC_SHA1):Void {
//
//var key = consumer.secret.urlEncode() + "&";
//if(accessToken != null) {
//key += accessToken.secret == null ? "" : accessToken.secret.urlEncode();
//}
//var message = request.method + "&" + normalizeURI() + "&" + normalizeParameters();
//var hash = new Hmac (SHA1);
//var bytes = hash.make (Bytes.ofString (key), Bytes.ofString (message));
//
//parameters.set("oauth_signature", Base64.encode (bytes));
//}
//
//// SIGNING FUNCTIONS
//
///**
//* Prepares the message parameters for the signing process
//*/
//private function normalizeParameters():String {
//
//var result = new Array<KVPair>();
//
//if(uri.queryArray != null) {
//result = result.concat(uri.queryArray);
//}
//// TODO add data if POST
//
//for(key in parameters.keys()) {
//
//if(key == "realm") continue;
//result.push( { k: key, v: parameters.get(key) } );
//
//}
//
//result.sort(OAuthSort);
//
//return result.map(function(p:KVPair) return p.k.urlEncode()+"="+p.v.urlEncode()).join("&").urlEncode();
//}
//
//private function normalizeURI():String {
//var scheme = uri.protocol == null ? "https" : uri.protocol.toLowerCase();
//var authority = uri.authority.toLowerCase();
//var port = (scheme == "https" || scheme == "http") ? null : uri.port;
//var path = uri.path;
//var result = (scheme + "://" + authority + (port == null ? "" : ":" + port) + path);
//return result.urlEncode();
//}
//
///**
//* Parameters are sorted by name, using lexicographical byte value ordering.
//* If two or more parameters share the same name, they are sorted by their value.
//*/
//private function OAuthSort(a:KVPair, b:KVPair) {
//return if(a.k < b.k) -1 else if (a.k > b.k) 1 else if (a.v < b.v) -1 else 1;
//}
//
//}
//
//
//typedef KVPair = {k:String, v:String};