couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [02/22] couchdb commit: updated refs/heads/paginate-api-options to 5d2a6f9
Date Mon, 03 Feb 2014 10:12:26 GMT
Adopt to the recent erlang-oauth (1.3+)

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Signed-off-by: Alexander Shorin <kxepal@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5c9f9a9f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5c9f9a9f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5c9f9a9f

Branch: refs/heads/paginate-api-options
Commit: 5c9f9a9f056ca71c516ddd7eb9ab32f8eb01dc12
Parents: 6d171cb
Author: Peter Lemenkov <lemenkov@gmail.com>
Authored: Fri Jan 10 16:30:25 2014 +0400
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Wed Jan 29 04:18:16 2014 +0400

----------------------------------------------------------------------
 src/couchdb/couch_httpd_oauth.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/5c9f9a9f/src/couchdb/couch_httpd_oauth.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_httpd_oauth.erl b/src/couchdb/couch_httpd_oauth.erl
index 2094c08..60a937c 100644
--- a/src/couchdb/couch_httpd_oauth.erl
+++ b/src/couchdb/couch_httpd_oauth.erl
@@ -43,6 +43,7 @@ oauth_auth_callback(#httpd{mochi_req = MochiReq} = Req, CbParams) ->
     Method = atom_to_list(MochiReq:get(method)),
     #callback_params{
         consumer = Consumer,
+        token = Token,
         token_secret = TokenSecret,
         url = Url,
         signature = Sig,
@@ -61,7 +62,7 @@ oauth_auth_callback(#httpd{mochi_req = MochiReq} = Req, CbParams) ->
             "Consumer is `~p`, token secret is `~p`~n"
             "Expected signature was `~p`~n",
             [User, Sig, Method, Url, Params, Consumer, TokenSecret,
-                oauth:signature(Method, Url, Params, Consumer, TokenSecret)]),
+                oauth:sign(Method, Url, Params, Consumer, Token, TokenSecret)]),
         Req
     end.
 


Mime
View raw message