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
@@ -11,7 +11,8 @@ namespace opkele {
         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 {
@@ -19,7 +20,8 @@ namespace opkele {
             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) { }
         };
 
@@ -65,16 +67,20 @@ namespace opkele {
                 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,
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
@@ -156,7 +156,7 @@ namespace opkele {
             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,
@@ -209,19 +209,31 @@ namespace opkele {
             }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());