moving towards simplifying request-making.

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

2 files changed, 25 insertions, 7 deletions

diff --git a/include/opkele/oauth/consumer.h b/include/opkele/oauth/consumer.h
index 9196297..eb4f753 100644
--- a/include/opkele/oauth/consumer.h
+++ b/include/opkele/oauth/consumer.h
@@ -8,21 +8,23 @@
 
 namespace opkele {
     namespace oauth {
         using std::string;
 
         enum oauth_method_t {
-            oauth_auth_header, oauth_post_body, oauth_url_query
+            oauth_auth_header, oauth_post_body, oauth_url_query,
+            oauth_method_default = oauth_auth_header
         };
 
         struct service_endpoint_t {
             string url;
             string signature_method;
             oauth_method_t oauth_method;
 
-            service_endpoint_t(const string& u,const string& sm,oauth_method_t om)
+            service_endpoint_t() : oauth_method(oauth_method_default) { }
+            service_endpoint_t(const string& u,const string& sm,oauth_method_t om=oauth_method_default)
                 : url(u), signature_method(sm), oauth_method(om) { }
         };
 
         class basic_provider_endpoints {
             public:
 
@@ -62,22 +64,26 @@ namespace opkele {
                 virtual const string allocate_nonce(time_t ts) = 0;
 
                 token_t get_request_token();
                 const string get_authorize_url(const token_t& rt,const string& callback="");
                 token_t get_access_token(const token_t& rt);
 
-                void prepare_request(
+                http_request_t& 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=0,const string& realm="");
-                void prepare_request(
+                http_request_t& prepare_request(
                         http_request_t& req,
                         const basic_fields& qf,const basic_fields& pf,
                         const service_endpoint_t& sep,
                         const token_t *t=0,const string& realm="");
+                http_request_t& prepare_request(
+                        http_request_t& req,
+                        const basic_fields& qf,const basic_fields& pf,
+                        const token_t *t=0,const string& realm="");
 
                 const string signature(
                         const string& method,
                         const string& url,
                         const basic_fields& fields,
                         const token_t* rt=0);
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") {