diff options
| author | Adam Kocoloski <adam@cloudant.com> | 2010-09-13 11:02:23 -0400 |
|---|---|---|
| committer | Adam Kocoloski <adam@cloudant.com> | 2010-09-13 11:51:08 -0400 |
| commit | ab5b2301dc713640170a7026c5ab1870a9ce4a5b (patch) | |
| tree | e3998b2570843217d393721033c929aede91efa6 /apps | |
| parent | 7031dd615e80f0b42571119776cf9066b0d97828 (diff) | |
accept logins with 'name' instead of 'username', thanks artemb
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/chttpd/src/chttpd_auth.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/chttpd/src/chttpd_auth.erl b/apps/chttpd/src/chttpd_auth.erl index ac4679c5..24fe8c05 100644 --- a/apps/chttpd/src/chttpd_auth.erl +++ b/apps/chttpd/src/chttpd_auth.erl @@ -351,7 +351,8 @@ delete_user(#httpd{user_ctx=UserCtx}=Req, Db, UserName) -> end. extract_username(Form) -> - try ?l2b(couch_util:get_value("username", Form)) + CouchFormat = couch_util:get_value("name", Form), + try ?l2b(couch_util:get_value("username", Form, CouchFormat)) catch error:badarg -> throw({bad_request, <<"user accounts must have a username">>}) end. @@ -363,8 +364,9 @@ extract_password(Form) -> end. extract_username_password(Form) -> + CouchFormat = couch_util:get_value("name", Form), try - {?l2b(couch_util:get_value("username", Form)), + {?l2b(couch_util:get_value("username", Form, CouchFormat)), ?l2b(couch_util:get_value("password", Form))} catch error:badarg -> Msg = <<"user accounts must have a username and password">>, |