moving towards simplifying request-making.

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 15 insertions, 3 deletions

diff --git a/lib/oauth-consumer.cc b/lib/oauth-consumer.cc
index 0c4c9e3..bb4e89b 100644
--- a/lib/oauth-consumer.cc
+++ b/lib/oauth-consumer.cc
@@ -153,13 +153,13 @@ namespace opkele {
 		    rv.secret = util::url_decode(part.substr(eq+1));
 		}
 	    }
 	    return rv;
 	}
 
-	void basic_consumer::prepare_request(
+	http_request_t& basic_consumer::prepare_request(
 		http_request_t& req,
 		const basic_fields& qf,const basic_fields& pf,
 		oauth_method_t om,const string& sm,
 		const token_t *t,const string& realm) {
 	    fields_t op;
 	    op.set_field("oauth_consumer_key",consumer_token.key);
@@ -206,25 +206,37 @@ namespace opkele {
 		qf.append_to(q); op.append_to(q);
 		req.url = q.append_query(req.url);
 		req.body = pf.query_string();
 	    }else
 		throw opkele::exception(OPKELE_CP_ /* TODO: specialize */
 			"Unknown oauth method");
+	    return req;
 	}
 
-	void basic_consumer::prepare_request(
+	http_request_t& basic_consumer::prepare_request(
 		http_request_t& req,
 		const basic_fields& qf,const basic_fields& pf,
 		const service_endpoint_t& sep,
 		const token_t *t,const string& realm) {
-	    prepare_request(
+	    return prepare_request(
 		    req, qf, pf,
 		    sep.oauth_method,sep.signature_method,
 		    t,realm);
 	}
 
+	http_request_t& basic_consumer::prepare_request(
+		http_request_t& req,
+		const basic_fields& qf,const basic_fields& pf,
+		const token_t *t,const string& realm) {
+	    service_endpoint_t sep;
+	    return prepare_request(
+		    req, qf, pf,
+		    get_endpoints().get_url_endpoint(sep,req.url),
+		    t, realm );
+	}
+
 	void http_request_t::setup_curl(CURL *curl) {
 	    CURLcode r;
 	    r = curl_easy_setopt(curl,CURLOPT_URL,url.c_str());
 	    if(r)
 		throw exception_curl(OPKELE_CP_ "failed to set curly urlie",r);
 	    if(method=="POST") {