From ab060198a6e5dba27685842f30ff7ca0d4ed5e07 Mon Sep 17 00:00:00 2001
From: zhouzb <zhouzb@emqx.io>
Date: Wed, 13 Oct 2021 11:35:51 +0800
Subject: [PATCH] fix(authn): fix bad user_id for scram

---
 .../src/enhanced_authn/emqx_enhanced_authn_scram_mnesia.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/emqx_authn/src/enhanced_authn/emqx_enhanced_authn_scram_mnesia.erl b/apps/emqx_authn/src/enhanced_authn/emqx_enhanced_authn_scram_mnesia.erl
index e0f37a50d..965a5eab9 100644
--- a/apps/emqx_authn/src/enhanced_authn/emqx_enhanced_authn_scram_mnesia.erl
+++ b/apps/emqx_authn/src/enhanced_authn/emqx_enhanced_authn_scram_mnesia.erl
@@ -148,7 +148,7 @@ add_user(#{user_id := UserID,
             case mnesia:read(?TAB, {UserGroup, UserID}, write) of
                 [] ->
                     IsSuperuser = maps:get(is_superuser, UserInfo, false),
-                    add_user(UserID, Password, IsSuperuser, State),
+                    add_user(UserGroup, UserID, Password, IsSuperuser, State),
                     {ok, #{user_id => UserID, is_superuser => IsSuperuser}};
                 [_] ->
                     {error, already_exist}
@@ -240,9 +240,9 @@ check_client_final_message(Bin, #{is_superuser := IsSuperuser} = Cache, #{algori
             {error, not_authorized}
     end.
 
-add_user(UserID, Password, IsSuperuser, State) ->
+add_user(UserGroup, UserID, Password, IsSuperuser, State) ->
     {StoredKey, ServerKey, Salt} = esasl_scram:generate_authentication_info(Password, State),
-    UserInfo = #user_info{user_id      = UserID,
+    UserInfo = #user_info{user_id      = {UserGroup, UserID},
                           stored_key   = StoredKey,
                           server_key   = ServerKey,
                           salt         = Salt,