fix: more bug fixes

Author: grokas-splunk

README.md

@@ -1089,7 +1089,7 @@ Read only: **True**
 
 PARAMETER | REQUIRED | DESCRIPTION | TYPE | CONTAINS
 --------- | -------- | ----------- | ---- | --------
-**user_id** | required | User ID/Principal name | string | `msgoffice365 user id` `msgoffice365 user principal name` `email` |
+**email_address** | required | User's email address (mailbox) | string | `msgoffice365 user id` `msgoffice365 user principal name` `email` |
 **folder_id** | optional | Parent mail folder id or well-known name | string | `msgoffice365 folder id` |
 
 #### Action Output
@@ -1098,7 +1098,7 @@ DATA PATH | TYPE | CONTAINS | EXAMPLE VALUES
 --------- | ---- | -------- | --------------
 action_result.status | string | | success failure |
 action_result.message | string | | |
-action_result.parameter.user_id | string | `msgoffice365 user id` `msgoffice365 user principal name` `email` | |
+action_result.parameter.email_address | string | `msgoffice365 user id` `msgoffice365 user principal name` `email` | |
 action_result.parameter.folder_id | string | `msgoffice365 folder id` | |
 action_result.data.\*.id | string | | |
 action_result.data.\*.displayName | string | | |

src/actions/list_folders.py

@@ -8,8 +8,8 @@
 
 
 class ListFoldersParams(Params):
-    user_id: str = Param(
-        description="User ID/Principal name",
+    email_address: str = Param(
+        description="User's email address (mailbox)",
         required=True,
         primary=True,
         cef_types=["msgoffice365 user id", "msgoffice365 user principal name", "email"],
@@ -40,10 +40,10 @@ def list_folders(
 
     if params.folder_id:
         endpoint = (
-            f"/users/{params.user_id}/mailFolders/{params.folder_id}/childFolders"
+            f"/users/{params.email_address}/mailFolders/{params.folder_id}/childFolders"
         )
     else:
-        endpoint = f"/users/{params.user_id}/mailFolders"
+        endpoint = f"/users/{params.email_address}/mailFolders"
 
     folders = []
     while True:

src/actions/list_groups.py

@@ -64,5 +64,7 @@ def list_groups(
         resp = helper.make_rest_call_helper(endpoint, nextLink=next_link)
         api_params = None
 
-    soar.set_message(f"Successfully retrieved {len(groups)} groups")
+    soar.set_message(
+        f"Successfully retrieved {len(groups)} {'group' if len(groups) == 1 else 'groups'}"
+    )
     return [GroupOutput(**g) for g in groups]

src/actions/list_users.py

@@ -63,5 +63,7 @@ def list_users(
         resp = helper.make_rest_call_helper(endpoint, nextLink=next_link)
         api_params = None
 
-    soar.set_message(f"Successfully retrieved {len(users)} users")
+    soar.set_message(
+        f"Successfully retrieved {len(users)} {'user' if len(users) == 1 else 'users'}"
+    )
     return [UserOutput(**u) for u in users]