diff options
author | John Christopher Anderson <jchris@apache.org> | 2010-01-07 20:02:46 +0000 |
---|---|---|
committer | John Christopher Anderson <jchris@apache.org> | 2010-01-07 20:02:46 +0000 |
commit | cd0e9c9b6384e4c9200d10088a13164ce4229ea6 (patch) | |
tree | 0ac40098a49b2dd62b0099f742323a7811399489 /src/couchdb/couch_httpd_oauth.erl | |
parent | dd15c8ed5bf5873aec08a99a0687849f1d29f4c3 (diff) |
merge account branch to trunk
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@896989 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd_oauth.erl')
-rw-r--r-- | src/couchdb/couch_httpd_oauth.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/couchdb/couch_httpd_oauth.erl b/src/couchdb/couch_httpd_oauth.erl index e46ea5bc..ddf84008 100644 --- a/src/couchdb/couch_httpd_oauth.erl +++ b/src/couchdb/couch_httpd_oauth.erl @@ -36,8 +36,7 @@ oauth_authentication_handler(#httpd{mochi_req=MochiReq}=Req) -> % Look up the consumer key and get the roles to give the consumer set_user_ctx(Req, AccessToken) -> - DbName = couch_config:get("couch_httpd_auth", "authentication_db"), - {ok, _Db} = couch_httpd_auth:ensure_users_db_exists(?l2b(DbName)), + % TODO move to db storage Name = case couch_config:get("oauth_token_users", AccessToken) of undefined -> throw({bad_request, unknown_oauth_token}); Value -> ?l2b(Value) |