couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From beno...@apache.org
Subject couch-httpd commit: updated refs/heads/1994-merge-rcouch to e0ba70f
Date Thu, 13 Feb 2014 15:27:31 GMT
Updated Branches:
  refs/heads/1994-merge-rcouch d936233c8 -> e0ba70fea


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-couch-httpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/commit/e0ba70fe
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/e0ba70fe
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/e0ba70fe

Branch: refs/heads/1994-merge-rcouch
Commit: e0ba70feabac1c69aaa01402f45388210c213ef2
Parents: d936233
Author: Peter Lemenkov <lemenkov@gmail.com>
Authored: Fri Jan 10 16:30:25 2014 +0400
Committer: benoitc <bchesneau@gmail.com>
Committed: Thu Feb 13 16:24:20 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/e0ba70fe/src/couch_httpd_oauth.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_oauth.erl b/src/couch_httpd_oauth.erl
index 07229d3..012a8ce 100644
--- a/src/couch_httpd_oauth.erl
+++ b/src/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