Skip to content

KC-1372: Return separate name and ID fields in enterprise-info --users --verbose #2258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sk-keeper merged 1 commit into from
Aug 4, 2026
Merged

KC-1372: Return separate name and ID fields in enterprise-info --users --verbose #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions keepercommander/commands/enterprise.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,17 +797,24 @@ def tree_node(node):
elif column == 'transfer_status':
row.append(user_status_dict['acct_transfer_status'])
elif column == 'node':
node_path = self.get_node_path(params, u['node_id'])
if is_verbose:
row.append(str(u['node_id']))
row.append({
'node_id': str(u['node_id']),
'node_name': node_path,
})
else:
row.append(self.get_node_path(params, u['node_id']))
row.append(node_path)
elif column == 'team_count':
row.append(len([1 for t in teams.values() if t['users'] and user_id in t['users']]))
elif column == 'teams':
user_team_list = [t for t in teams.values()
if t['users'] and user_id in t['users']]
if is_verbose:
row.append([t['id'] for t in user_team_list])
row.append([
{'team_uid': t['id'], 'team_name': t['name']}
for t in user_team_list
])
else:
row.append([t['name'] for t in user_team_list])
elif column == 'role_count' or column == 'roles':
Expand All @@ -822,7 +829,13 @@ def tree_node(node):
row.append(len(role_ids))
else:
if is_verbose:
row.append([str(role_id) for role_id in role_ids if role_id in roles])
row.append([
{
'role_id': str(role_id),
'role_name': roles[role_id]['name'],
}
for role_id in role_ids if role_id in roles
])
else:
role_names = [roles[role_id]['name'] for role_id in role_ids if role_id in roles]
row.append(role_names)
Expand Down
17 changes: 13 additions & 4 deletions unit-tests/test_command_enterprise.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def test_enterprise_info_command(self):
cmd.execute(params, verbose=True)

def test_enterprise_info_users_verbose_returns_ids(self):
"""With -v, node/teams/roles columns should be IDs; without -v, names."""
"""With -v, node/teams/roles include separate name and ID fields; without -v, names only."""
params = get_connected_params()
api.query_enterprise(params)
cmd = enterprise.EnterpriseInfoCommand()
Expand All @@ -74,9 +74,18 @@ def test_enterprise_info_users_verbose_returns_ids(self):
params, users=True, format='json', columns=columns, verbose=True, quiet=True)
users = json.loads(report)
user1 = next(u for u in users if u['user_id'] == ent_env.user1_id)
self.assertEqual(user1['node'], str(ent_env.node1_id))
self.assertEqual(user1['teams'], [ent_env.team1_uid])
self.assertEqual(user1['roles'], [str(ent_env.role1_id)])
self.assertEqual(user1['node'], {
'node_id': str(ent_env.node1_id),
'node_name': 'Enterprise 1',
})
self.assertEqual(user1['teams'], [{
'team_uid': ent_env.team1_uid,
'team_name': ent_env.team1_name,
}])
self.assertEqual(user1['roles'], [{
'role_id': str(ent_env.role1_id),
'role_name': ent_env.role1_name,
}])

def test_enterprise_add_user(self):
params = get_connected_params()
Expand Down