From da62ffee2a917644e1cf06345185d23feb5e0944 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Sat, 21 Nov 2015 00:43:42 -0800 Subject: [PATCH] Fix compile --- lime/net/HTTPRequest.hx | 1 - lime/net/oauth/OAuthRequest.hx | 242 ++++++++++++++++----------------- 2 files changed, 121 insertions(+), 122 deletions(-) diff --git a/lime/net/HTTPRequest.hx b/lime/net/HTTPRequest.hx index 91dc7f4c9..cd96cac05 100644 --- a/lime/net/HTTPRequest.hx +++ b/lime/net/HTTPRequest.hx @@ -1,7 +1,6 @@ package lime.net; -import flash.utils.ByteArray; import haxe.io.Bytes; import lime.app.Future; import lime.app.Promise; diff --git a/lime/net/oauth/OAuthRequest.hx b/lime/net/oauth/OAuthRequest.hx index 71e8079dc..b05bad06a 100644 --- a/lime/net/oauth/OAuthRequest.hx +++ b/lime/net/oauth/OAuthRequest.hx @@ -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; - public var request:URLRequest; - - private var uri:URIParser; - - - public function new (version:OAuthVersion = V1, method:URLRequestMethod, url:String, parameters:Map) { - - 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(); - - 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}; \ No newline at end of file +//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; + //public var request:URLRequest; +// + //private var uri:URIParser; + // + // + //public function new (version:OAuthVersion = V1, method:URLRequestMethod, url:String, parameters:Map) { + // + //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(); +// + //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}; \ No newline at end of file