You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/12 07:15:47 UTC
[4/7] couch commit: updated refs/heads/import-master to bc467c3
Adopt to the recent erlang-oauth (1.3+)
Signed-off-by: Peter Lemenkov <le...@gmail.com>
Signed-off-by: Alexander Shorin <kx...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/529e4162
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/529e4162
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/529e4162
Branch: refs/heads/import-master
Commit: 529e41621dd95c8d176b4d18a47d14779cfcf5dd
Parents: 589936c
Author: Peter Lemenkov <le...@gmail.com>
Authored: Fri Jan 10 16:30:25 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Jan 29 04:18:16 2014 +0400
----------------------------------------------------------------------
couch_httpd_oauth.erl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/529e4162/couch_httpd_oauth.erl
----------------------------------------------------------------------
diff --git a/couch_httpd_oauth.erl b/couch_httpd_oauth.erl
index 2094c08..60a937c 100644
--- a/couch_httpd_oauth.erl
+++ b/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.