From 2b1249ba9ce104f56463cff8c306e0905a75d064 Mon Sep 17 00:00:00 2001
From: zhanghongtong <rory-z@outlook.com>
Date: Fri, 16 Jul 2021 16:22:54 +0800
Subject: [PATCH] fix(auth mnesia): fix add password error by api

Signed-off-by: zhanghongtong <rory-z@outlook.com>
---
 .../src/emqx_auth_mnesia.app.src                 |  2 +-
 .../src/emqx_auth_mnesia.appup.src               | 16 ++++++++++++++++
 .../src/emqx_auth_mnesia_api.erl                 |  8 ++++----
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 apps/emqx_auth_mnesia/src/emqx_auth_mnesia.appup.src

diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
index f51395f2c..8ff574ab5 100644
--- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
+++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
@@ -1,6 +1,6 @@
 {application, emqx_auth_mnesia,
  [{description, "EMQ X Authentication with Mnesia"},
-  {vsn, "4.3.0"}, % strict semver, bump manually
+  {vsn, "4.3.1"}, % strict semver, bump manually
   {modules, []},
   {registered, []},
   {applications, [kernel,stdlib,mnesia]},
diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.appup.src b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.appup.src
new file mode 100644
index 000000000..4fd4d4162
--- /dev/null
+++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.appup.src
@@ -0,0 +1,16 @@
+%% -*-: erlang -*-
+
+{VSN,
+  [
+    {"4.3.0", [
+      {load_module,emqx_auth_mnesia_api, brutal_purge,soft_purge,[]}
+    ]},
+    {<<".*">>, []}
+  ],
+  [
+    {"4.3.0", [
+      {load_module,emqx_auth_mnesia_api, brutal_purge,soft_purge,[]}
+    ]},
+    {<<".*">>, []}
+  ]
+}.
diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl
index 07ff3bdf5..bd9ef8c3c 100644
--- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl
+++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl
@@ -141,7 +141,7 @@ do_add_clientid([], ReList) ->
 
 do_add_clientid(Params) ->
     Clientid = urldecode(get_value(<<"clientid">>, Params)),
-    Password = urldecode(get_value(<<"password">>, Params)),
+    Password = get_value(<<"password">>, Params),
     Login = {clientid, Clientid},
     case validate([login, password], [Login, Password]) of
         ok ->
@@ -152,7 +152,7 @@ do_add_clientid(Params) ->
 update_clientid(#{clientid := Clientid}, Params) ->
     Password = get_value(<<"password">>, Params),
     case validate([password], [Password]) of
-        ok -> return(emqx_auth_mnesia_cli:update_user({clientid, urldecode(Clientid)}, urldecode(Password)));
+        ok -> return(emqx_auth_mnesia_cli:update_user({clientid, urldecode(Clientid)}, Password));
         Err -> return(Err)
     end.
 
@@ -190,7 +190,7 @@ do_add_username([], ReList) ->
 
 do_add_username(Params) ->
     Username = urldecode(get_value(<<"username">>, Params)),
-    Password = urldecode(get_value(<<"password">>, Params)),
+    Password = get_value(<<"password">>, Params),
     Login = {username, Username},
     case validate([login, password], [Login, Password]) of
         ok ->
@@ -201,7 +201,7 @@ do_add_username(Params) ->
 update_username(#{username := Username}, Params) ->
     Password = get_value(<<"password">>, Params),
     case validate([password], [Password]) of
-        ok -> return(emqx_auth_mnesia_cli:update_user({username, urldecode(Username)}, urldecode(Password)));
+        ok -> return(emqx_auth_mnesia_cli:update_user({username, urldecode(Username)}, Password));
         Err -> return(Err)
     end.