core, ios: unhiding user profiles always requires password (#2101)

src/Simplex/Chat.hs

@@ -350,28 +350,20 @@ processChatCommand = \case
             salt <- drgRandomBytes 16
             let hash = B64UrlByteString $ C.sha512Hash $ encodeUtf8 viewPwd <> salt
             pure $ Just UserPwdHash {hash, salt = B64UrlByteString salt}
-  APIUnhideUser userId' viewPwd_ -> withUser $ \user -> do
+  APIUnhideUser userId' viewPwd@(UserPwd pwd) -> withUser $ \user -> do
     user' <- privateGetUser userId'
     case viewPwdHash user' of
       Nothing -> throwChatError $ CEUserNotHidden userId'
       _ -> do
-        validateUserPassword user user' viewPwd_
+        when (T.null pwd) $ throwChatError $ CEEmptyUserPassword userId'
+        validateUserPassword user user' $ Just viewPwd
         setUserPrivacy user user' {viewPwdHash = Nothing, showNtfs = True}
-  APIMuteUser userId' viewPwd_ -> withUser $ \user -> do
-    user' <- privateGetUser userId'
-    validateUserPassword user user' viewPwd_
-    setUserPrivacy user user' {showNtfs = False}
-  APIUnmuteUser userId' viewPwd_ -> withUser $ \user -> do
-    user' <- privateGetUser userId'
-    case viewPwdHash user' of
-      Just _ -> throwChatError $ CECantUnmuteHiddenUser userId'
-      _ -> do
-        validateUserPassword user user' viewPwd_
-        setUserPrivacy user user' {showNtfs = True}
+  APIMuteUser userId' -> setUserNotifications userId' False
+  APIUnmuteUser userId' -> setUserNotifications userId' True
   HideUser viewPwd -> withUser $ \User {userId} -> processChatCommand $ APIHideUser userId viewPwd
-  UnhideUser -> withUser $ \User {userId} -> processChatCommand $ APIUnhideUser userId Nothing
-  MuteUser -> withUser $ \User {userId} -> processChatCommand $ APIMuteUser userId Nothing
-  UnmuteUser -> withUser $ \User {userId} -> processChatCommand $ APIUnmuteUser userId Nothing
+  UnhideUser viewPwd -> withUser $ \User {userId} -> processChatCommand $ APIUnhideUser userId viewPwd
+  MuteUser -> withUser $ \User {userId} -> processChatCommand $ APIMuteUser userId
+  UnmuteUser -> withUser $ \User {userId} -> processChatCommand $ APIUnmuteUser userId
   APIDeleteUser userId' delSMPQueues viewPwd_ -> withUser $ \user -> do
     user' <- privateGetUser userId'
     validateUserPassword user user' viewPwd_
@@ -1706,6 +1698,12 @@ processChatCommand = \case
     validPassword :: Text -> UserPwdHash -> Bool
     validPassword pwd UserPwdHash {hash = B64UrlByteString hash, salt = B64UrlByteString salt} =
       hash == C.sha512Hash (encodeUtf8 pwd <> salt)
+    setUserNotifications :: UserId -> Bool -> m ChatResponse
+    setUserNotifications userId' showNtfs = withUser $ \user -> do
+      user' <- privateGetUser userId'
+      case viewPwdHash user' of
+        Just _ -> throwChatError $ CEHiddenUserAlwaysMuted userId'
+        _ -> setUserPrivacy user user' {showNtfs}
     setUserPrivacy :: User -> User -> m ChatResponse
     setUserPrivacy user@User {userId} user'@User {userId = userId'}
       | userId == userId' = do
@@ -4323,11 +4321,11 @@ chatCommandP =
       "/_user " *> (APISetActiveUser <$> A.decimal <*> optional (A.space *> jsonP)),
       ("/user " <|> "/u ") *> (SetActiveUser <$> displayName <*> optional (A.space *> pwdP)),
       "/_hide user " *> (APIHideUser <$> A.decimal <* A.space <*> jsonP),
-      "/_unhide user " *> (APIUnhideUser <$> A.decimal <*> optional (A.space *> jsonP)),
-      "/_mute user " *> (APIMuteUser <$> A.decimal <*> optional (A.space *> jsonP)),
-      "/_unmute user " *> (APIUnmuteUser <$> A.decimal <*> optional (A.space *> jsonP)),
+      "/_unhide user " *> (APIUnhideUser <$> A.decimal <* A.space <*> jsonP),
+      "/_mute user " *> (APIMuteUser <$> A.decimal),
+      "/_unmute user " *> (APIUnmuteUser <$> A.decimal),
       "/hide user " *> (HideUser <$> pwdP),
-      "/unhide user" $> UnhideUser,
+      "/unhide user " *> (UnhideUser <$> pwdP),
       "/mute user" $> MuteUser,
       "/unmute user" $> UnmuteUser,
       "/_delete user " *> (APIDeleteUser <$> A.decimal <* " del_smp=" <*> onOffP <*> optional (A.space *> jsonP)),

src/Simplex/Chat/Controller.hs

@@ -190,11 +190,11 @@ data ChatCommand
   | APISetActiveUser UserId (Maybe UserPwd)
   | SetActiveUser UserName (Maybe UserPwd)
   | APIHideUser UserId UserPwd
-  | APIUnhideUser UserId (Maybe UserPwd)
-  | APIMuteUser UserId (Maybe UserPwd)
-  | APIUnmuteUser UserId (Maybe UserPwd)
+  | APIUnhideUser UserId UserPwd
+  | APIMuteUser UserId
+  | APIUnmuteUser UserId
   | HideUser UserPwd
-  | UnhideUser
+  | UnhideUser UserPwd
   | MuteUser
   | UnmuteUser
   | APIDeleteUser UserId Bool (Maybe UserPwd)
@@ -741,7 +741,7 @@ data ChatErrorType
   | CECantDeleteActiveUser {userId :: UserId}
   | CECantDeleteLastUser {userId :: UserId}
   | CECantHideLastUser {userId :: UserId}
-  | CECantUnmuteHiddenUser {userId :: UserId}
+  | CEHiddenUserAlwaysMuted {userId :: UserId}
   | CEEmptyUserPassword {userId :: UserId}
   | CEUserAlreadyHidden {userId :: UserId}
   | CEUserNotHidden {userId :: UserId}

src/Simplex/Chat/View.hs

@@ -1242,8 +1242,8 @@ viewChatError logLevel = \case
     CECantDeleteActiveUser _ -> ["cannot delete active user"]
     CECantDeleteLastUser _ -> ["cannot delete last user"]
     CECantHideLastUser _ -> ["cannot hide the only not hidden user"]
-    CECantUnmuteHiddenUser _ -> ["cannot unmute hidden user"]
-    CEEmptyUserPassword _ -> ["cannot set empty password"]
+    CEHiddenUserAlwaysMuted _ -> ["hidden user always muted when inactive"]
+    CEEmptyUserPassword _ -> ["user password is required"]
     CEUserAlreadyHidden _ -> ["user is already hidden"]
     CEUserNotHidden _ -> ["user is not hidden"]
     CEChatNotStarted -> ["error: chat not started"]