Companion send updateUser command to set userName

Signed-off-by: Hunsup Jung <[email protected]>

Author: HunsupJung

drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua

@@ -647,7 +647,7 @@ end
 ----------------
 -- User Table --
 ----------------
-local function add_user_to_table(device, userIdx, usrType)
+local function add_user_to_table(device, userIdx, userName, userType)
   -- Get latest user table
   local user_table = utils.deep_copy(device:get_latest_state(
     "main",
@@ -657,11 +657,11 @@ local function add_user_to_table(device, userIdx, usrType)
   ))
 
   -- Add new entry to table
-  table.insert(user_table, {userIndex = userIdx, userType = usrType})
+  table.insert(user_table, {userIndex = userIdx, userName = userName, userType = userType})
   device:emit_event(capabilities.lockUsers.users(user_table, {visibility = {displayed = false}}))
 end
 
-local function update_user_in_table(device, userIdx, usrType)
+local function update_user_in_table(device, userIdx, userName, userType)
   -- Get latest user table
   local user_table = utils.deep_copy(device:get_latest_state(
     "main",
@@ -681,7 +681,8 @@ local function update_user_in_table(device, userIdx, usrType)
 
   -- Update user entry
   if i ~= 0 then
-    user_table[i].userType = usrType
+    user_table[i].userType = userType
+    user_table[i].userName = userName
     device:emit_event(capabilities.lockUsers.users(user_table, {visibility = {displayed = false}}))
   end
 end
@@ -1188,7 +1189,7 @@ local function handle_update_user(driver, device, command)
   local cmdName = "updateUser"
   local userIdx = command.args.userIndex
   local userName = command.args.userName
-  local userType = command.args.lockUserType
+  local userType = command.args.userType
   local userTypeMatter = DoorLock.types.UserTypeEnum.UNRESTRICTED_USER
   if userType == "guest" then
     userTypeMatter = DoorLock.types.UserTypeEnum.SCHEDULE_RESTRICTED_USER
@@ -1215,6 +1216,7 @@ local function handle_update_user(driver, device, command)
   -- Save values to field
   device:set_field(lock_utils.COMMAND_NAME, cmdName, {persist = true})
   device:set_field(lock_utils.USER_INDEX, userIdx, {persist = true})
+  device:set_field(lock_utils.USER_NAME, userName, {persist = true})
   device:set_field(lock_utils.USER_TYPE, userType, {persist = true})
 
   -- Send command
@@ -1325,6 +1327,7 @@ local function set_user_response_handler(driver, device, ib, response)
   -- Get result
   local cmdName = device:get_field(lock_utils.COMMAND_NAME)
   local userIdx = device:get_field(lock_utils.USER_INDEX)
+  local userName = device:get_field(lock_utils.USER_NAME)
   local userType = device:get_field(lock_utils.USER_TYPE)
   local status = "success"
   if ib.status == DoorLock.types.DlStatus.FAILURE then
@@ -1338,9 +1341,9 @@ local function set_user_response_handler(driver, device, ib, response)
   -- Update User in table
   if status == "success" then
     if cmdName == "addUser" then
-      add_user_to_table(device, userIdx, userType)
+      add_user_to_table(device, userIdx, userName, userType)
     elseif cmdName == "updateUser" then
-      update_user_in_table(device, userIdx, userType)
+      update_user_in_table(device, userIdx, userName, userType)
     end
   else
     device.log.warn(string.format("Failed to set user: %s", status))
@@ -1614,7 +1617,7 @@ local function set_pin_response_handler(driver, device, ib, response)
 
     -- If user is added also, update User table
     if userIdx == nil then
-      add_user_to_table(device, elements.user_index.value, userType)
+      add_user_to_table(device, elements.user_index.value, nil, userType)
     end
 
     -- Update Credential table
@@ -1762,7 +1765,7 @@ local function set_issuer_key_response_handler(driver, device, ib, response)
     -- If user is added also, update User table
     if userIdx == nil then
       userIdx = elements.user_index.value
-      add_user_to_table(device, userIdx, "adminMember")
+      add_user_to_table(device, userIdx, nil, "adminMember")
     end
 
     -- Update Aliro table
@@ -1885,7 +1888,7 @@ local function set_endpoint_key_response_handler(driver, device, ib, response)
     -- If user is added also, update User table
     if userIdx == nil then
       userIdx = elements.user_index.value
-      add_user_to_table(device, userIdx, "adminMember")
+      add_user_to_table(device, userIdx, nil, "adminMember")
     end
 
     -- Update Aliro table
@@ -2103,8 +2106,10 @@ local function delete_pin_response_handler(driver, device, ib, response)
   local userIdx = 0
   if status == "success" then
     userIdx = delete_credential_from_table(device, credIdx)
-    if userIdx == 0 then
-      userIdx = nil
+    if userIdx ~= 0 and has_credentials(device, userIdx) == false then
+      delete_user_from_table(device, userIdx)
+      delete_week_schedule_from_table_as_user(device, userIdx)
+      delete_year_schedule_from_table_as_user(device, userIdx)
     end
   else
     device.log.warn(string.format("Failed to clear credential: %s", status))
@@ -2147,12 +2152,11 @@ local function clear_issuer_key_response_handler(driver, device, ib, response)
   -- if status is success, delete entry from table
   if status == "success" then
     delete_aliro_from_table(device, userIdx, "issuerKey", nil)
-  end
-
-  if has_credentials(device, userIdx) == false then
-    delete_user_from_table(device, userIdx)
-    delete_week_schedule_from_table_as_user(device, userIdx)
-    delete_year_schedule_from_table_as_user(device, userIdx)
+    if has_credentials(device, userIdx) == false then
+      delete_user_from_table(device, userIdx)
+      delete_week_schedule_from_table_as_user(device, userIdx)
+      delete_year_schedule_from_table_as_user(device, userIdx)
+    end
   end
 
   -- Update commandResult
@@ -2191,6 +2195,11 @@ local function clear_endpoint_key_response_handler(driver, device, ib, response)
   -- if status is success, delete entry from table
   if status == "success" then
     delete_aliro_from_table(device, userIdx, keyType, deviceKeyId)
+    if has_credentials(device, userIdx) == false then
+      delete_user_from_table(device, userIdx)
+      delete_week_schedule_from_table_as_user(device, userIdx)
+      delete_year_schedule_from_table_as_user(device, userIdx)
+    end
   end
 
   -- Update commandResult