From 22dd6e1a864ef1748e3319a8723ed53a3be91d4a Mon Sep 17 00:00:00 2001
From: DDDHuang <904897578@qq.com>
Date: Fri, 13 Aug 2021 14:19:31 +0800
Subject: [PATCH] fix: rename tab & params

---
 apps/emqx_dashboard/etc/emqx_dashboard.conf   |  2 +-
 apps/emqx_dashboard/src/emqx_dashboard.erl    |  2 +-
 .../src/emqx_dashboard_admin.erl              | 20 +++++++++----------
 .../emqx_dashboard/src/emqx_dashboard_api.erl |  4 ++--
 .../src/emqx_dashboard_schema.erl             |  2 +-
 .../emqx_dashboard/src/emqx_dashboard_sup.erl |  2 +-
 ...board_jwt.erl => emqx_dashboard_token.erl} |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)
 rename apps/emqx_dashboard/src/{emqx_dashboard_jwt.erl => emqx_dashboard_token.erl} (98%)

diff --git a/apps/emqx_dashboard/etc/emqx_dashboard.conf b/apps/emqx_dashboard/etc/emqx_dashboard.conf
index 2bc84569c..629facf7e 100644
--- a/apps/emqx_dashboard/etc/emqx_dashboard.conf
+++ b/apps/emqx_dashboard/etc/emqx_dashboard.conf
@@ -8,7 +8,7 @@ emqx_dashboard:{
     ## notice: sample_interval should be divisible by 60.
     sample_interval: 10s
     ## api jwt timeout. default is 30 minute
-    jwt_exptime: 30m
+    token_expired_time: 60m
     listeners: [
         {
             num_acceptors: 4
diff --git a/apps/emqx_dashboard/src/emqx_dashboard.erl b/apps/emqx_dashboard/src/emqx_dashboard.erl
index 27fe4e77d..fb4a88066 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard.erl
@@ -105,7 +105,7 @@ listener_name(Proto) ->
 authorize_appid(Req) ->
     case cowboy_req:parse_header(<<"authorization">>, Req) of
         {bearer, Token} ->
-            case emqx_dashboard_admin:jwt_verify(Token) of
+            case emqx_dashboard_admin:verify_token(Token) of
                 ok ->
                     ok;
                 {error, token_timeout} ->
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
index 6334bbba6..b32d3d346 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
@@ -40,9 +40,9 @@
         , check/2
         ]).
 
--export([ jwt_sign/2
-        , jwt_verify/1
-        , jwt_destroy_by_username/1
+-export([ sign_token/2
+        , verify_token/1
+        , destroy_token_by_username/1
         ]).
 
 -export([add_default_user/0]).
@@ -166,20 +166,20 @@ check(Username, Password) ->
     end.
 
 %%--------------------------------------------------------------------
-%% jwt
-jwt_sign(Username, Password) ->
+%% token
+sign_token(Username, Password) ->
     case check(Username, Password) of
         ok ->
-            emqx_dashboard_jwt:sign(Username, Password);
+            emqx_dashboard_token:sign(Username, Password);
         Error ->
             Error
     end.
 
-jwt_verify(Token) ->
-    emqx_dashboard_jwt:verify(Token).
+verify_token(Token) ->
+    emqx_dashboard_token:verify(Token).
 
-jwt_destroy_by_username(Username) ->
-    emqx_dashboard_jwt:destroy_by_username(Username).
+destroy_token_by_username(Username) ->
+    emqx_dashboard_token:destroy_by_username(Username).
 
 %%--------------------------------------------------------------------
 %% Internal functions
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_api.erl b/apps/emqx_dashboard/src/emqx_dashboard_api.erl
index 48045b160..422d246f4 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_api.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_api.erl
@@ -220,7 +220,7 @@ login(post, Request) ->
     Params = emqx_json:decode(Body, [return_maps]),
     Username = maps:get(<<"username">>, Params),
     Password = maps:get(<<"password">>, Params),
-    case emqx_dashboard_admin:jwt_sign(Username, Password) of
+    case emqx_dashboard_admin:sign_token(Username, Password) of
         {ok, Token} ->
             Version = iolist_to_binary(proplists:get_value(version, emqx_sys:info())),
             {200, #{token => Token, version => Version, license => #{edition => ?RELEASE}}};
@@ -232,7 +232,7 @@ logout(_, Request) ->
     {ok, Body, _} = cowboy_req:read_body(Request),
     Params = emqx_json:decode(Body, [return_maps]),
     Username = maps:get(<<"username">>, Params),
-    emqx_dashboard_admin:jwt_destroy_by_username(Username),
+    emqx_dashboard_admin:destroy_token_by_username(Username),
     {200}.
 
 users(get, _Request) ->
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
index a42428e50..6cca17390 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
@@ -28,7 +28,7 @@ fields("emqx_dashboard") ->
     , {default_username, fun default_username/1}
     , {default_password, fun default_password/1}
     , {sample_interval, emqx_schema:t(emqx_schema:duration_s(), undefined, "10s")}
-    , {jwt_exptime, emqx_schema:t(emqx_schema:duration(), undefined, "30m")}
+    , {token_expired_time, emqx_schema:t(emqx_schema:duration(), undefined, "30m")}
     ];
 
 fields("http") ->
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_sup.erl b/apps/emqx_dashboard/src/emqx_dashboard_sup.erl
index f3ecd6128..90e84fcef 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_sup.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_sup.erl
@@ -29,4 +29,4 @@ start_link() ->
 
 init([]) ->
     {ok, {{one_for_all, 10, 100},
-        [?CHILD(emqx_dashboard_jwt), ?CHILD(emqx_dashboard_collection)]}}.
+        [?CHILD(emqx_dashboard_token), ?CHILD(emqx_dashboard_collection)]}}.
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_jwt.erl b/apps/emqx_dashboard/src/emqx_dashboard_token.erl
similarity index 98%
rename from apps/emqx_dashboard/src/emqx_dashboard_jwt.erl
rename to apps/emqx_dashboard/src/emqx_dashboard_token.erl
index 291affd66..fdba7fb7e 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_jwt.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_token.erl
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(emqx_dashboard_jwt).
+-module(emqx_dashboard_token).
 
 -include("emqx_dashboard.hrl").
 
@@ -148,7 +148,7 @@ jwk(Username, Password, Salt) ->
     }.
 
 jwt_expiration_time() ->
-    ExpTime = emqx_config:get([emqx_dashboard, jwt_exptime], ?EXPTIME),
+    ExpTime = emqx_config:get([emqx_dashboard, token_expired_time], ?EXPTIME),
     erlang:system_time(millisecond) + ExpTime.
 
 salt() ->