Fold oauth_unix module into oauth module.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-oauth/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-oauth/commit/546d0ee7 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-oauth/tree/546d0ee7 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-oauth/diff/546d0ee7 Branch: refs/heads/import Commit: 546d0ee7e45dca21c9ae74f82fbb25e191d8dae7 Parents: cfe8271 Author: Tim Fletcher <[email protected]> Authored: Fri Nov 26 14:48:37 2010 +0000 Committer: Tim Fletcher <[email protected]> Committed: Fri Nov 26 14:48:37 2010 +0000 ---------------------------------------------------------------------- ebin/oauth.app | 1 - src/oauth.erl | 14 +++++++++++++- src/oauth_unix.erl | 15 --------------- 3 files changed, 13 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-oauth/blob/546d0ee7/ebin/oauth.app ---------------------------------------------------------------------- diff --git a/ebin/oauth.app b/ebin/oauth.app index f368f9c..4a2563b 100644 --- a/ebin/oauth.app +++ b/ebin/oauth.app @@ -8,7 +8,6 @@ oauth_http, oauth_plaintext, oauth_rsa_sha1, - oauth_unix, oauth_uri ]}, {registered, []}, http://git-wip-us.apache.org/repos/asf/couchdb-oauth/blob/546d0ee7/src/oauth.erl ---------------------------------------------------------------------- diff --git a/src/oauth.erl b/src/oauth.erl index 77eed92..c6467d9 100644 --- a/src/oauth.erl +++ b/src/oauth.erl @@ -71,7 +71,7 @@ token_param(Token, Params) -> params(Consumer, Params) -> Nonce = base64:encode_to_string(crypto:rand_bytes(32)), % cf. ruby-oauth - params(Consumer, oauth_unix:timestamp(), Nonce, Params). + params(Consumer, unix_timestamp(), Nonce, Params). params(Consumer, Timestamp, Nonce, Params) -> [ {"oauth_version", "1.0"} @@ -82,6 +82,18 @@ params(Consumer, Timestamp, Nonce, Params) -> | Params ]. +unix_timestamp() -> + unix_timestamp(calendar:universal_time()). + +unix_timestamp(DateTime) -> + unix_seconds(DateTime) - unix_epoch(). + +unix_epoch() -> + unix_seconds({{1970,1,1},{00,00,00}}). + +unix_seconds(DateTime) -> + calendar:datetime_to_gregorian_seconds(DateTime). + signature_method_string(Consumer) -> case signature_method(Consumer) of plaintext -> http://git-wip-us.apache.org/repos/asf/couchdb-oauth/blob/546d0ee7/src/oauth_unix.erl ---------------------------------------------------------------------- diff --git a/src/oauth_unix.erl b/src/oauth_unix.erl deleted file mode 100644 index 27f6de9..0000000 --- a/src/oauth_unix.erl +++ /dev/null @@ -1,15 +0,0 @@ --module(oauth_unix). - --export([timestamp/0]). - -timestamp() -> - timestamp(calendar:universal_time()). - -timestamp(DateTime) -> - seconds(DateTime) - epoch(). - -epoch() -> - seconds({{1970,1,1},{00,00,00}}). - -seconds(DateTime) -> - calendar:datetime_to_gregorian_seconds(DateTime).
