diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-11-24 18:44:13 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-11-24 18:44:13 +0300 |
| commit | 95265dd3ad8e149d94d08e1a73970fb0bbf55b49 (patch) | |
| tree | a00a134cf0148a121ea505809cef0d9d49799652 /src/ejabberd_oauth.erl | |
| parent | 7eddfe073b0daf74796a7aac6bc3f9c3da0a2dbd (diff) | |
Move JID related functions to jid.erl (#847)
Diffstat (limited to 'src/ejabberd_oauth.erl')
| -rw-r--r-- | src/ejabberd_oauth.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ejabberd_oauth.erl b/src/ejabberd_oauth.erl index c7138981f..4855a7573 100644 --- a/src/ejabberd_oauth.erl +++ b/src/ejabberd_oauth.erl @@ -125,7 +125,7 @@ get_client_identity(Client, Ctx) -> {ok, {Ctx, {client, Client}}}. verify_redirection_uri(_, _, Ctx) -> {ok, Ctx}. authenticate_user({User, Server}, {password, Password} = Ctx) -> - case jlib:make_jid(User, Server, <<"">>) of + case jid:make(User, Server, <<"">>) of #jid{} = JID -> Access = ejabberd_config:get_option( @@ -173,8 +173,8 @@ associate_access_token(AccessToken, Context, AppContext) -> proplists:get_value(<<"resource_owner">>, Context, <<"">>), Scope = proplists:get_value(<<"scope">>, Context, []), Expire = proplists:get_value(<<"expiry_time">>, Context, 0), - LUser = jlib:nodeprep(User), - LServer = jlib:nameprep(Server), + LUser = jid:nodeprep(User), + LServer = jid:nameprep(Server), R = #oauth_token{ token = AccessToken, us = {LUser, LServer}, @@ -190,8 +190,8 @@ associate_refresh_token(RefreshToken, Context, AppContext) -> check_token(User, Server, Scope, Token) -> - LUser = jlib:nodeprep(User), - LServer = jlib:nameprep(Server), + LUser = jid:nodeprep(User), + LServer = jid:nameprep(Server), case catch mnesia:dirty_read(oauth_token, Token) of [#oauth_token{us = {LUser, LServer}, scope = TokenScope, |