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
@@ -13,3 +13,4 @@ namespace opkele {
         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
         };
@@ -21,3 +22,4 @@ namespace opkele {
 
-            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) { }
@@ -67,3 +69,3 @@ namespace opkele {
 
-                void prepare_request(
+                http_request_t& prepare_request(
                         http_request_t& req,
@@ -72,3 +74,3 @@ namespace opkele {
                         const token_t *t=0,const string& realm="");
-                void prepare_request(
+                http_request_t& prepare_request(
                         http_request_t& req,
@@ -77,2 +79,6 @@ namespace opkele {
                         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="");
 
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
@@ -158,3 +158,3 @@ namespace opkele {
 
-        void basic_consumer::prepare_request(
+        http_request_t& basic_consumer::prepare_request(
                 http_request_t& req,
@@ -211,5 +211,6 @@ namespace opkele {
                         "Unknown oauth method");
+            return req;
         }
 
-        void basic_consumer::prepare_request(
+        http_request_t& basic_consumer::prepare_request(
                 http_request_t& req,
@@ -218,3 +219,3 @@ namespace opkele {
                 const token_t *t,const string& realm) {
-            prepare_request(
+            return prepare_request(
                     req, qf, pf,
@@ -224,2 +225,13 @@ namespace opkele {
 
+        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) {