From 66f06c3ab7c82a4ab808652640ece7a532a623e8 Mon Sep 17 00:00:00 2001
From: firest <blankalupo@163.com>
Date: Tue, 16 Aug 2022 14:00:20 +0800
Subject: [PATCH] fix(dashboard): change `bootstrap_user` to
 `bootstrap_user_file`

---
 apps/emqx_dashboard/i18n/emqx_dashboard_i18n.conf | 2 +-
 apps/emqx_dashboard/src/emqx_dashboard_admin.erl  | 9 +++++++--
 apps/emqx_dashboard/src/emqx_dashboard_schema.erl | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/emqx_dashboard/i18n/emqx_dashboard_i18n.conf b/apps/emqx_dashboard/i18n/emqx_dashboard_i18n.conf
index e404b54b4..0dbed7c47 100644
--- a/apps/emqx_dashboard/i18n/emqx_dashboard_i18n.conf
+++ b/apps/emqx_dashboard/i18n/emqx_dashboard_i18n.conf
@@ -197,7 +197,7 @@ its own from which a browser should permit loading resources."""
       zh: "多语言支持"
     }
   }
-  bootstrap_user {
+  bootstrap_user_file {
     desc {
       en: "Initialize users file."
       zh: "初始化用户文件"
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
index 7f5c31771..76bcf384e 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
@@ -87,7 +87,7 @@ add_default_user() ->
 
 -spec add_bootstrap_user() -> ok | {error, _}.
 add_bootstrap_user() ->
-    case emqx:get_config([dashboard, bootstrap_user], undefined) of
+    case emqx:get_config([dashboard, bootstrap_user_file], undefined) of
         undefined ->
             ok;
         File ->
@@ -324,7 +324,12 @@ add_bootstrap_user(File) ->
             after
                 file:close(Dev)
             end;
-        Error ->
+        {error, Reason} = Error ->
+            ?SLOG(error, #{
+                msg => "failed to open the dashboard bootstrap users file",
+                file => File,
+                reason => Reason
+            }),
             Error
     end.
 
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
index 4bb9fb6af..17c5a72f4 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
@@ -55,7 +55,8 @@ fields("dashboard") ->
             )},
         {cors, fun cors/1},
         {i18n_lang, fun i18n_lang/1},
-        {bootstrap_user, ?HOCON(binary(), #{desc => ?DESC(bootstrap_user), required => false})}
+        {bootstrap_user_file,
+            ?HOCON(binary(), #{desc => ?DESC(bootstrap_user_file), required => false})}
     ];
 fields("listeners") ->
     [