Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Make default OAuth token TTL values more user friendly

This commit is contained in:
Mickael Remond 2016-07-23 18:57:57 +02:00
parent 68555ff466
commit bfa61eaa46
No known key found for this signature in database
GPG Key ID: E6F6045D79965AA3
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ejabberd_oauth.erl
View File

@ -71,7 +71,7 @@
expire :: integer() expire :: integer()
}). }).
-define(EXPIRE, 3600). -define(EXPIRE, 31536000).
start() -> start() ->
init_db(mnesia, ?MYNAME), init_db(mnesia, ?MYNAME),
@ -389,12 +389,10 @@ process(_Handlers,
?LABEL(<<"ttl">>, [?CT(<<"Token TTL">>), ?CT(<<": ">>)]), ?LABEL(<<"ttl">>, [?CT(<<"Token TTL">>), ?CT(<<": ">>)]),
?XAE(<<"select">>, [{<<"name">>, <<"ttl">>}], ?XAE(<<"select">>, [{<<"name">>, <<"ttl">>}],
[ [
?XAC(<<"option">>, [{<<"selected">>, <<"selected">>},
{<<"value">>, jlib:integer_to_binary(expire())}],<<"Default (", (integer_to_binary(expire()))/binary, " seconds)">>),
?XAC(<<"option">>, [{<<"value">>, <<"3600">>}],<<"1 Hour">>), ?XAC(<<"option">>, [{<<"value">>, <<"3600">>}],<<"1 Hour">>),
?XAC(<<"option">>, [{<<"value">>, <<"86400">>}],<<"1 Day">>), ?XAC(<<"option">>, [{<<"value">>, <<"86400">>}],<<"1 Day">>),
?XAC(<<"option">>, [{<<"value">>, <<"2592000">>}],<<"1 Month">>), ?XAC(<<"option">>, [{<<"value">>, <<"2592000">>}],<<"1 Month">>),
?XAC(<<"option">>, [{<<"value">>, <<"31536000">>}],<<"1 Year">>), ?XAC(<<"option">>, [{<<"selected">>, <<"selected">>},{<<"value">>, <<"31536000">>}],<<"1 Year">>),
?XAC(<<"option">>, [{<<"value">>, <<"315360000">>}],<<"10 Years">>)]), ?XAC(<<"option">>, [{<<"value">>, <<"315360000">>}],<<"10 Years">>)]),
?BR, ?BR,
?INPUTT(<<"submit">>, <<"">>, <<"Accept">>) ?INPUTT(<<"submit">>, <<"">>, <<"Accept">>)
@ -500,7 +498,7 @@ process(_Handlers,
process(_Handlers, process(_Handlers,
#request{method = 'POST', q = Q, lang = _Lang, #request{method = 'POST', q = Q, lang = _Lang,
path = [_, <<"token">>]}) -> path = [_, <<"token">>]}) ->
case proplists:get_value(<<"grant_type">>, Q, <<"">>) of case proplists:get_value(<<"grant_type">>, Q, <<"">>) of
<<"password">> -> <<"password">> ->
SScope = proplists:get_value(<<"scope">>, Q, <<"">>), SScope = proplists:get_value(<<"scope">>, Q, <<"">>),
StringJID = proplists:get_value(<<"username">>, Q, <<"">>), StringJID = proplists:get_value(<<"username">>, Q, <<"">>),
@ -549,11 +547,11 @@ process(_Handlers, _Request) ->
ejabberd_web:error(not_found). ejabberd_web:error(not_found).
%% Headers as per RFC 6749 %% Headers as per RFC 6749
json_response(Code, Body) -> json_response(Code, Body) ->
{Code, [{<<"Content-Type">>, <<"application/json;charset=UTF-8">>}, {Code, [{<<"Content-Type">>, <<"application/json;charset=UTF-8">>},
{<<"Cache-Control">>, <<"no-store">>}, {<<"Cache-Control">>, <<"no-store">>},
{<<"Pragma">>, <<"no-cache">>}], {<<"Pragma">>, <<"no-cache">>}],
jiffy:encode(Body)}. jiffy:encode(Body)}.
@ -670,7 +668,7 @@ css() ->
text-decoration: underline; text-decoration: underline;
} }
.container > .section { .container > .section {
background: #424A55; background: #424A55;
} }