Fix Dialyzer inconsistency

diff --git a/include/ejabberd_http.hrl b/include/ejabberd_http.hrl
index b8cbe37087b6af33bc40229fc32f77eba75049d0..25209f76c923cd0992113e06da4909e9a5a74780 100644 (file)
--- a/include/ejabberd_http.hrl
+++ b/include/ejabberd_http.hrl
@@ -23,8 +23,7 @@
         path = []         :: [binary()],
         q = []            :: [{binary() | nokey, binary()}],
         us = {<<>>, <<>>} :: {binary(), binary()},
-        auth              :: {binary(), binary()} |
-        {auth_jid, {binary(), binary()}, jlib:jid()},
+        auth              :: {binary(), binary()} | {oauth, binary(), []} | undefined,
         lang = <<"">>     :: binary(),
         data = <<"">>     :: binary(),
         ip                :: {inet:ip_address(), inet:port_number()},

diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl
index d8d1ddd44d75e5e8ffd076e2de23f0ba033ee16c..6b53f46c6a27be1183c41bdc35a585e8bc71327e 100644 (file)
--- a/src/ejabberd_http.erl
+++ b/src/ejabberd_http.erl
@@ -753,6 +753,7 @@ code_to_phrase(503) -> <<"Service Unavailable">>;
 code_to_phrase(504) -> <<"Gateway Timeout">>;
 code_to_phrase(505) -> <<"HTTP Version Not Supported">>.
 
+-spec parse_auth(binary()) -> {binary(), binary()} | {oauth, binary(), []} | undefined.
 parse_auth(<<"Basic ", Auth64/binary>>) ->
     Auth = jlib:decode_base64(Auth64),
     %% Auth should be a string with the format: user@server:password