Merge branch 'atlassian-api:master' into bugfix/cloud-pagination

Author: sti0

CONTRIBUTING.rst

@@ -105,6 +105,8 @@ All methods based on docs from: https://developer.atlassian.com/docs/
 * Confluence
     - `Confluence Server`_
     - `Confluence Cloud`_
+* Crowd
+    - `Crowd Server`_
 * Advanced Roadmaps (formerly Portfolio for Jira)
     - `Portfolio for Jira`_
     - `Portfolio for Jira Teams`_
@@ -133,6 +135,7 @@ All methods based on docs from: https://developer.atlassian.com/docs/
 .. _`Jira Cloud`: https://developer.atlassian.com/cloud/jira/platform/rest/v3/
 .. _`Confluence Server`: https://developer.atlassian.com/server/confluence/confluence-server-rest-api/
 .. _`Confluence Cloud`: https://developer.atlassian.com/cloud/confluence/rest/
+.. _`Crowd Server`: https://developer.atlassian.com/server/crowd/crowd-rest-apis/
 .. _`Jira Service Desk Cloud`: https://developer.atlassian.com/cloud/jira/service-desk/rest/
 .. _`Jira Service Desk Server`: https://docs.atlassian.com/jira-servicedesk/REST/server
 .. _`Portfolio for Jira Teams`: https://docs.atlassian.com/portfolio-for-jira-server/REST/2.13.0/teams/

atlassian/VERSION

@@ -1 +1 @@
-3.14.0
+3.14.1

atlassian/bitbucket/__init__.py

@@ -91,16 +91,23 @@ def check_reindexing_status(self):
         url = self.resource_url("status", api_root="rest/indexing", api_version="latest")
         return self.get(url)
 
-    def get_users(self, user_filter=None):
+    def get_users(self, user_filter=None, limit=25, start=0):
         """
         Get list of bitbucket users.
-        Use 'user_filter' for get specific users.
-        :user_filter: str
+        Use 'user_filter' for get specific users or get all users if necessary.
+        :param user_filter: str - username, displayname or email
+        :param limit: int - paginated limit to retrieve
+        :param start: int - paginated point to start retreiving
+        :return: The collection as JSON with all relevant information about the licensed user
         """
         url = self.resource_url("users", api_version="1.0")
         params = {}
         if user_filter:
             params["filter"] = user_filter
+        if limit:
+            params["limit"] = limit
+        if start:
+            params["start"] = start
         return self.get(url, params=params)
 
     def get_users_info(self, user_filter=None, start=0, limit=25):

atlassian/bitbucket/cloud/repositories/pullRequests.py

@@ -72,7 +72,7 @@ def each(self, q=None, sort=None):
         if q is not None:
             params["q"] = q
         for pr in self._get_paged(None, trailing=True, params=params):
-            yield self.__get_object(pr)
+            yield self.__get_object(super(PullRequests, self).get(pr.get("id")))
 
         return
 

atlassian/crowd.py

@@ -1,5 +1,7 @@
 # coding=utf-8
 import logging
+import string
+import secrets
 
 from .rest_client import AtlassianRestAPI
 
@@ -15,18 +17,112 @@ def __init__(self, url, username, password, timeout=60, api_root="rest", api_ver
         super(Crowd, self).__init__(url, username, password, timeout, api_root, api_version)
 
     def _crowd_api_url(self, api, resource):
-        return "{server}/{api_root}/{api}/{version}/{resource}".format(
-            server=self.url,
+        return "/{api_root}/{api}/{version}/{resource}".format(
             api_root=self.api_root,
             api=api,
             version=self.api_version,
             resource=resource,
         )
 
+    def _user_change_status(self, username, active):
+        """
+        Change user status
+
+        :params active bool
+
+        :return:
+        """
+
+        user = self.user(username)
+
+        user_object = {
+            "name": username,
+            "active": active,
+            "display-name": user.get("display-name"),
+            "first-name": user.get("first-name"),
+            "last-name": user.get("last-name"),
+            "email": user.get("email"),
+        }
+
+        params = {"username": username}
+
+        return self.put(self._crowd_api_url("usermanagement", "user"), params=params, data=user_object)
+
     def user(self, username):
         params = {"username": username}
         return self.get(self._crowd_api_url("usermanagement", "user"), params=params)
 
+    def user_activate(self, username):
+        """
+        Activate user
+        """
+
+        return self._user_change_status(username, True)
+
+    def user_create(self, username, active, first_name, last_name, display_name, email, password=None):
+        """
+        Create new user
+
+        :param active: bool, OPTIONAL: password can be auto-generated if not included
+            username (string)
+            active (bool)
+            first-name (string)
+            last-name (string)
+            display-name (string)
+            email (string)
+            password (string, optional)
+
+        :return:
+        """
+
+        if not password:
+            characters = string.ascii_letters + string.punctuation + string.digits
+            password = "".join(secrets.choice(characters) for x in range(30))
+
+        user_object = {
+            "name": username,
+            "password": {"value": password},
+            "active": active,
+            "first-name": first_name,
+            "last-name": last_name,
+            "display-name": display_name,
+            "email": email,
+        }
+
+        return self.post(self._crowd_api_url("usermanagement", "user"), data=user_object)
+
+    def user_deactivate(self, username):
+        """
+        Deactivate user
+
+        :return:
+        """
+
+        return self._user_change_status(username, False)
+
+    def user_delete(self, username):
+        """
+        Delete user
+
+        :return:
+        """
+
+        params = {"username": username}
+
+        return self.delete(self._crowd_api_url("usermanagement", "user"), params=params)
+
+    def group_add_user(self, username, groupname):
+        """
+        Add user to group
+        :return:
+        """
+
+        data = {"name": groupname}
+
+        params = {"username": username}
+
+        return self.post(self._crowd_api_url("usermanagement", "user/group/direct"), params=params, json=data)
+
     def group_nested_members(self, group):
         params = {"groupname": group}
         return self.get(self._crowd_api_url("group", "nested"), params=params)

docs/bitbucket.rst

@@ -167,7 +167,7 @@ Groups and admins
     bitbucket.all_project_administrators()
 
     # Get users. Use 'user_filter' parameter to get specific users.
-    bitbucket.get_users(user_filter="username")
+    bitbucket.get_users(user_filter="username", limit=25, start=0)
 
 Manage code
 -----------

docs/crowd.rst

@@ -0,0 +1,34 @@
+Crowd module
+============
+
+Manage users
+------------
+
+.. code-block:: python
+
+    # Activate user
+    crowd.user_activate(username)
+
+    # Add user
+    crowd.user_create(username, active, first_name, last_name, display_name, email, password)
+
+    # Add user with auto-generated password
+    crowd.user_create(username, active, first_name, last_name, display_name, email)
+
+    # Deactive user
+    crowd.user_deactivate(username)
+
+    # Delete user
+    crowd.user_delete(username)
+
+    # Get user
+    crowd.user(username)
+
+Manage groups
+-------------
+
+.. code-block:: python
+
+    # Add user to group
+    crowd.group_add_user(username, groupname)
+

docs/index.rst

@@ -20,6 +20,7 @@ Add a connection:
 
     from atlassian import Jira
     from atlassian import Confluence
+    from atlassian import Crowd
     from atlassian import Bitbucket
     from atlassian import ServiceDesk
     from atlassian import Xray
@@ -34,6 +35,12 @@ Add a connection:
         username='admin',
         password='admin')
 
+    crowd = Crowd(
+        url='http://localhost:4990',
+        username='app-name',
+        password='app-password'
+    )
+
     bitbucket = Bitbucket(
         url='http://localhost:7990',
         username='admin',
@@ -217,6 +224,7 @@ And to Bitbucket Cloud:
 
    jira
    confluence
+   crowd
    bitbucket
    bamboo
    service_desk