diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-26 20:59:35 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-26 20:59:35 +0000 |
| commit | 7c018c6fb691b65ac1cb181a95f5766e2933eb3c (patch) | |
| tree | b12eb4fd6fc05faebd9d481f1d57599cd0b2829e /sca-cpp/trunk/modules/oauth/mod-oauth1.cpp | |
| parent | 0ee21c5d9657a1259a731722f53666ad135279bb (diff) | |
Correctly pass query strings through component wiring redirects and improve format of XML and JSON response documents.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1074924 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/oauth/mod-oauth1.cpp')
| -rw-r--r-- | sca-cpp/trunk/modules/oauth/mod-oauth1.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp b/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp index 84de8f2d05..acf39601b3 100644 --- a/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp +++ b/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp @@ -193,7 +193,7 @@ const failable<int> authorize(const list<list<value> >& args, request_rec* r, co // Build the redirect URI const list<list<value> > redirargs = mklist<list<value> >(mklist<value>("mod_oauth1_step", "access_token"), tok, cid, info); - const string redir = httpd::url(r->uri, r) + string("?") + httpd::queryString(redirargs); + const string redir = httpd::url(r->uri, r) + string("?") + http::queryString(redirargs); debug(redir, "modoauth1::authorize::redir"); // Lookup client app configuration @@ -203,7 +203,7 @@ const failable<int> authorize(const list<list<value> >& args, request_rec* r, co list<value> appkey = cadr(app); // Build and sign the request token URI - const string requri = httpd::unescape(cadr(req)) + string("&") + httpd::queryString(mklist<list<value> >(mklist<value>("oauth_callback", httpd::escape(redir)))); + const string requri = httpd::unescape(cadr(req)) + string("&") + http::queryString(mklist<list<value> >(mklist<value>("oauth_callback", httpd::escape(redir)))); const list<string> srequri = sign("POST", requri, appkey, "", ""); debug(srequri, "modoauth1::authorize::srequri"); @@ -236,7 +236,7 @@ const failable<int> authorize(const list<list<value> >& args, request_rec* r, co return mkfailure<int>(reason(prc)); // Redirect to the authorize URI - const string authuri = httpd::unescape(cadr(auth)) + string("?") + httpd::queryString(mklist<list<value> >(tv)); + const string authuri = httpd::unescape(cadr(auth)) + string("?") + http::queryString(mklist<list<value> >(tv)); debug(authuri, "modoauth1::authorize::authuri"); return httpd::externalRedirect(authuri, r); } @@ -325,7 +325,7 @@ const failable<int> access_token(const list<list<value> >& args, request_rec* r, return mkfailure<int>(reason(sv)); // Build and sign access token request URI - const string tokuri = httpd::unescape(cadr(tok)) + string("?") + httpd::queryString(mklist<list<value> >(vv)); + const string tokuri = httpd::unescape(cadr(tok)) + string("?") + http::queryString(mklist<list<value> >(vv)); const list<string> stokuri = sign("POST", tokuri, appkey, cadr(tv), content(sv)); debug(stokuri, "modoauth1::access_token::stokuri"); |