yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7773 from DDDHuang/app-exp 

feat: app api support show expired
This commit is contained in:
DDDHuang 2022-04-27 17:01:22 +08:00 committed by GitHub
parent 291b6a2530 0d335456a9
commit c4416fb2ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_management/src/emqx_mgmt_api_app.erl
View File

@ -141,7 +141,8 @@ fields(app) ->
binary(), binary(),
#{example => <<"Note">>, required => false} #{example => <<"Note">>, required => false}
)}, )},
{enable, hoconsc:mk(boolean(), #{desc => "Enable/Disable", required => false})} {enable, hoconsc:mk(boolean(), #{desc => "Enable/Disable", required => false})},
{expired, hoconsc:mk(boolean(), #{desc => "Expired", required => false})}
]; ];
fields(name) -> fields(name) ->
[ [

25
apps/emqx_management/src/emqx_mgmt_auth.erl
View File

@ -129,17 +129,20 @@ ensure_not_undefined(undefined, Old) -> Old;
ensure_not_undefined(New, _Old) -> New. ensure_not_undefined(New, _Old) -> New.
to_map(Apps) when is_list(Apps) -> to_map(Apps) when is_list(Apps) ->
Fields = record_info(fields, ?APP), [to_map(App) || App <- Apps];
lists:map( to_map(#?APP{name = N, api_key = K, enable = E, expired_at = ET, created_at = CT, desc = D}) ->
fun(Trace0 = #?APP{}) -> #{
[_ | Values] = tuple_to_list(Trace0), name => N,
maps:remove(api_secret_hash, maps:from_list(lists:zip(Fields, Values))) api_key => K,
end, enable => E,
Apps expired_at => ET,
); created_at => CT,
to_map(App0) -> desc => D,
[App] = to_map([App0]), expired => is_expired(ET)
App. }.
is_expired(undefined) -> false;
is_expired(ExpiredTime) -> ExpiredTime < erlang:system_time(second).
create_app(Name, Enable, ExpiredAt, Desc) -> create_app(Name, Enable, ExpiredAt, Desc) ->
ApiSecret = generate_api_secret(), ApiSecret = generate_api_secret(),