-rw-r--r-- | include/opkele/oauth/consumer.h | 14 | ||||
-rw-r--r-- | lib/oauth-consumer.cc | 18 |
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 @@ -12,5 +12,6 @@ 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 }; @@ -20,5 +21,6 @@ namespace opkele { 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) { } }; @@ -66,14 +68,18 @@ namespace opkele { 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( 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 @@ -157,5 +157,5 @@ namespace opkele { } - void basic_consumer::prepare_request( + http_request_t& basic_consumer::prepare_request( http_request_t& req, const basic_fields& qf,const basic_fields& pf, @@ -210,12 +210,13 @@ namespace opkele { 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, @@ -223,4 +224,15 @@ 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) { CURLcode r; |