diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
| commit | fd8e07af4789be362a61755ea47f216baeb64989 (patch) | |
| tree | 0ac0a7a779fd27e79e940519441161dc0c4dfd5f /src/ejabberd_oauth_sql.erl | |
| parent | Log modules startup (diff) | |
Get rid of ejabberd.hrl header
The header consisted of too many unrelated stuff and macros misuse.
Some stuff is moved into scram.hrl and type_compat.hrl.
All macros have been replaced with the corresponding function calls.
TODO: probably type_compat.hrl is not even needed anymore since
we support only Erlang >= OTP 17.5
Diffstat (limited to 'src/ejabberd_oauth_sql.erl')
| -rw-r--r-- | src/ejabberd_oauth_sql.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ejabberd_oauth_sql.erl b/src/ejabberd_oauth_sql.erl index 503315eca..f8daa51bd 100644 --- a/src/ejabberd_oauth_sql.erl +++ b/src/ejabberd_oauth_sql.erl @@ -34,7 +34,6 @@ clean/1]). -include("ejabberd_oauth.hrl"). --include("ejabberd.hrl"). -include("ejabberd_sql_pt.hrl"). -include("jid.hrl"). -include("logger.hrl"). @@ -49,7 +48,7 @@ store(R) -> Scope = str:join(R#oauth_token.scope, <<" ">>), Expire = R#oauth_token.expire, case ?SQL_UPSERT( - ?MYNAME, + ejabberd_config:get_myname(), "oauth_token", ["!token=%(Token)s", "jid=%(SJID)s", @@ -63,7 +62,7 @@ store(R) -> lookup(Token) -> case ejabberd_sql:sql_query( - ?MYNAME, + ejabberd_config:get_myname(), ?SQL("select @(jid)s, @(scope)s, @(expire)d" " from oauth_token where token=%(Token)s")) of {selected, [{SJID, Scope, Expire}]} -> @@ -79,6 +78,6 @@ lookup(Token) -> clean(TS) -> ejabberd_sql:sql_query( - ?MYNAME, + ejabberd_config:get_myname(), ?SQL("delete from oauth_token where expire < %(TS)d")). |