diff options
| author | John Christopher Anderson <jchris@apache.org> | 2010-01-05 18:11:58 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2010-01-05 18:11:58 +0000 |
| commit | 3a1f041e07c75001cf52cbae1391dcd801c17396 (patch) | |
| tree | 749cf6441f847bea450f007b46b01a506beb4a58 /src/couchdb/couch_httpd_oauth.erl | |
| parent | 47d4f324ec2fe0e4ab907b8a023bc689c8192fb1 (diff) | |
merge account branch to apache branch
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/account@896158 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..ab786162 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)), + % weird that this is in the config and not a db Name = case couch_config:get("oauth_token_users", AccessToken) of undefined -> throw({bad_request, unknown_oauth_token}); Value -> ?l2b(Value) |