Skip to content

Commit 322d16e

Browse files
YugoHinogonchik
authored andcommitted
[Jira] Fix the parameter of remove_user_from_group from username to account id (#1018)
* Fix the parameter from username to account id * fix remove_user_from_group for both DC and Cloud * fix optional parameter syntax * add docs * fix optional parameter syntax add docs * fix format by black
1 parent 1e684a3 commit 322d16e

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

atlassian/jira.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -772,18 +772,27 @@ def add_user_to_group(self, username, group_name):
772772
data = {"name": username}
773773
return self.post(url, params=params, data=data)
774774

775-
def remove_user_from_group(self, username, group_name):
775+
def remove_user_from_group(self, username=None, group_name=None, account_id=None):
776776
"""
777777
Remove given user from a group
778778
779+
For Jira DC/Server platform
779780
:param username: str
780781
:param group_name: str
781782
:return:
783+
784+
For Jira Cloud platform
785+
:param account_id: str (username is no longer available for Jira Cloud platform)
786+
:param group_name: str
787+
:return:
782788
"""
783789
log.warning("Removing user from a group...")
784790
url = self.resource_url("group/user")
785-
params = {"groupname": group_name, "username": username}
786-
791+
url_domain = self.url
792+
if "atlassian.net" in url_domain:
793+
params = {"groupname": group_name, "accountId": account_id}
794+
else:
795+
params = {"groupname": group_name, "username": username}
787796
return self.delete(url, params=params)
788797

789798
def get_users_with_browse_permission_to_a_project(

docs/jira.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Manage groups
7272
jira.add_user_to_group(username, group_name)
7373
7474
# Remove given user from a group
75-
jira.remove_user_from_group(username, group_name)
75+
jira.remove_user_from_group(username=None, group_name=None, account_id=None)
7676
7777
Manage projects
7878
---------------

0 commit comments

Comments
 (0)