diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-26 10:07:12 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-26 10:07:12 +0300 |
| commit | c1439ddd5bff82292919774c224a2bf3c8f63258 (patch) | |
| tree | cc80ebe280ac56fcdfa9656f8f03a1938f53bdeb /src/mod_http_api.erl | |
| parent | 603ec9cb19ec8664ca75dd74b1cb3541878a27da (diff) | |
Get rid of jid:to_string/1 and jid:from_string/1
Diffstat (limited to 'src/mod_http_api.erl')
| -rw-r--r-- | src/mod_http_api.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_http_api.erl b/src/mod_http_api.erl index c0e2d8421..e3b1edc9c 100644 --- a/src/mod_http_api.erl +++ b/src/mod_http_api.erl @@ -139,16 +139,16 @@ depends(_Host, _Opts) -> extract_auth(#request{auth = HTTPAuth, ip = {IP, _}}) -> Info = case HTTPAuth of {SJID, Pass} -> - case jid:from_string(SJID) of + try jid:decode(SJID) of #jid{luser = User, lserver = Server} -> case ejabberd_auth:check_password(User, <<"">>, Server, Pass) of true -> #{usr => {User, Server, <<"">>}, caller_server => Server}; false -> {error, invalid_auth} - end; - _ -> - {error, invalid_auth} + end + catch _:{bad_jid, _} -> + {error, invalid_auth} end; {oauth, Token, _} -> case ejabberd_oauth:check_token(Token) of |