Permalink
Browse files

update erlang-oauth to 1.3.0

  • Loading branch information...
1 parent ae8c01a commit 7422882e63259e8d59b832b266d30b719fdabbd4 @janl janl committed Nov 12, 2012
View
@@ -450,7 +450,7 @@ For the src/ibrowse component:
For the src/erlang-oauth component:
- Copyright (c) 2008-2009 Tim Fletcher <http://tfletcher.com/>
+ Copyright the authors and contributors. All rights reserved.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
View
4 NOTICE
@@ -38,9 +38,9 @@ This product also includes the following third-party components:
Copyright 2009, Chandrashekhar Mullaparthi
- * Erlang OAuth (http://github.com/tim/erlang-oauth/tree/master)
+ * Erlang OAuth (http://github.com/tim/erlang-oauth)
- Copyright 2009, Tim Fletcher <http://tfletcher.com/>
+ Copyright 2012, the authors and contributors
* ETap (http://github.com/ngerakines/etap/)
@@ -244,11 +244,11 @@ oauth_header(#httpdb{url = BaseUrl, oauth = OAuth}, ConnParams) ->
head -> "HEAD"
end,
QSL = get_value(qs, ConnParams, []),
- OAuthParams = oauth:signed_params(Method,
+ OAuthParams = oauth:sign(Method,
BaseUrl ++ get_value(path, ConnParams, []),
QSL, Consumer, OAuth#oauth.token, OAuth#oauth.token_secret) -- QSL,
[{"Authorization",
- "OAuth " ++ oauth_uri:params_to_header_string(OAuthParams)}].
+ "OAuth " ++ oauth:header_params_encode(OAuthParams)}].
do_redirect(Worker, Code, Headers, #httpdb{url = Url} = HttpDb, Params, Cb) ->
@@ -189,7 +189,7 @@ serve_oauth(#httpd{mochi_req=MochiReq}=Req, Fun, FailSilently) ->
_ -> ""
end
end,
- HeaderParams = oauth_uri:params_from_header_string(AuthHeader),
+ HeaderParams = oauth:header_params_decode(AuthHeader),
%Realm = couch_util:get_value("realm", HeaderParams),
% get requested path
@@ -14,25 +14,14 @@ oauthebindir = $(localerlanglibdir)/erlang-oauth/ebin
oauth_file_collection = \
oauth.app.in \
- oauth.erl \
- oauth_hmac_sha1.erl \
- oauth_http.erl \
- oauth_plaintext.erl \
- oauth_rsa_sha1.erl \
- oauth_unix.erl \
- oauth_uri.erl
+ oauth.erl
# Removed oauth_rsa_sha1.beam until we require R12B5 or
# we add a ./configure option to enable it.
oauthebin_make_generated_file_list = \
oauth.app \
- oauth.beam \
- oauth_hmac_sha1.beam \
- oauth_http.beam \
- oauth_plaintext.beam \
- oauth_unix.beam \
- oauth_uri.beam
+ oauth.beam
oauthebin_DATA = \
$(oauthebin_make_generated_file_list)
Oops, something went wrong.

0 comments on commit 7422882

Please sign in to comment.