diff options
author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-25 10:01:01 +0300 |
---|---|---|
committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-25 10:01:01 +0300 |
commit | 603ec9cb19ec8664ca75dd74b1cb3541878a27da (patch) | |
tree | 89e0802baeeda5859938e089733d2d426746cfbf /src/ejabberd_oauth.erl | |
parent | Don't pass 'from' and 'to' along with stanza in hooks' arguments (diff) |
Don't pass empty resource to jid:make()
Diffstat (limited to 'src/ejabberd_oauth.erl')
-rw-r--r-- | src/ejabberd_oauth.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_oauth.erl b/src/ejabberd_oauth.erl index a4e8bb6c..bda38fc0 100644 --- a/src/ejabberd_oauth.erl +++ b/src/ejabberd_oauth.erl @@ -127,7 +127,7 @@ oauth_list_tokens() -> Tokens = mnesia:dirty_match_object(#oauth_token{_ = '_'}), {MegaSecs, Secs, _MiniSecs} = os:timestamp(), TS = 1000000 * MegaSecs + Secs, - [{Token, jid:to_string(jid:make(U,S,<<>>)), Scope, integer_to_list(Expires - TS) ++ " seconds"} || + [{Token, jid:to_string(jid:make(U,S)), Scope, integer_to_list(Expires - TS) ++ " seconds"} || #oauth_token{token=Token, scope=Scope, us= {U,S},expire=Expires} <- Tokens]. @@ -193,7 +193,7 @@ get_client_identity(Client, Ctx) -> {ok, {Ctx, {client, Client}}}. verify_redirection_uri(_, _, Ctx) -> {ok, Ctx}. authenticate_user({User, Server}, Ctx) -> - case jid:make(User, Server, <<"">>) of + case jid:make(User, Server) of #jid{} = JID -> Access = ejabberd_config:get_option( |