Merge pull request #1 from Genzer/feature/adapt-with-bitbucket-drop-using-username

Feature/adapt with bitbucket drop using username

Author: Genzer

.env

@@ -3,12 +3,12 @@
 
 # The user used here should be granted with
 # enough permissions. See README.md OAuth
-BITBUCKET_USERNAME=
-BITBUCKET_PASSWORD=
+# BITBUCKET_USERNAME=
+# BITBUCKET_PASSWORD=
 
 # If you don't have a dedicated BitBucket App, simply
 # create an OAuth2 Consumer in your BitBucket Settings.
-BITBUCKET_CLIENT_ID=
-BITBUCKET_CLIENT_SECRET=
+# BITBUCKET_CLIENT_ID=
+# BITBUCKET_CLIENT_SECRET=
 
-BITBUCKET_TEAM=
+# BITBUCKET_TEAM=

README.md

@@ -78,7 +78,7 @@ bitbucklet groups list-user developers
 
 # Add a user into the team
 # Here you can use both username or primary email address.
-bitbucklet users add [email protected]
+bitbucklet users invite [email protected]
 
 ```
 

bitbucklet/groups_cli.py

@@ -9,6 +9,10 @@
 from bitbucklet.token import get_access_token, BearerAuth
 from bitbucklet.urls import groups_url
 
+import logging
+
+logger = logging.getLogger("groups_cli")
+
 @click.group(name='groups', help = 'Managing groups')
 def groups_cli():
     pass
@@ -71,6 +75,9 @@ def groups_del(group_name: str):
 @click.option('--verbose', is_flag=True, default=False, help="Print JSON output")
 @click.argument('group_name')
 def groups_list_user(verbose: bool, group_name: str):
+    from tabulate import tabulate
+    from itertools import count
+
     bitbucket_team_name = os.getenv('BITBUCKET_TEAM')
 
     access_token = get_access_token()
@@ -87,8 +94,11 @@ def groups_list_user(verbose: bool, group_name: str):
         return
 
     members = response.json()
-    [print(member['username']) for member in members]
 
+    table = [[member['display_name'], member['account_id'], member['uuid'], member['resource_uri']] for member in members ]
+    headers = ['display_name', 'account_id', 'uuid', 'resource_uri']
+    print(tabulate(table, headers=headers, showindex=range(1, len(table) + 1), tablefmt='github'))
+    
 @click.command(name='add-user', help = 'Add a user into a group')
 @click.argument('group_name')
 @click.argument('username')

bitbucklet/urls.py

@@ -9,4 +9,7 @@ def groups_url():
     return 'https://api.bitbucket.org/1.0/groups/{team}'
 
 def teams_url():
-    return 'https://api.bitbucket.org/2.0/teams/{team}'
+    return 'https://api.bitbucket.org/2.0/teams/{team}'
+
+def team_invitations_url():
+    return "https://api.bitbucket.org/1.0/users/{team}/invitations"

bitbucklet/users.py

@@ -7,7 +7,7 @@
 from requests import HTTPError
 
 from bitbucklet.token import get_access_token, BearerAuth
-from bitbucklet.urls import teams_url
+from bitbucklet.urls import teams_url, team_invitations_url
 from bitbucklet.groups_cli import __group_add_user
 
 @click.group(name='users', help = 'Managing users')
@@ -17,6 +17,8 @@ def users_cli():
 @click.command(name = 'list', help = 'List all the users (sort of)')
 @click.option('--verbose', is_flag=True, default=False)
 def list_users(verbose: bool):
+    from tabulate import tabulate
+
     bitbucket_team_name = os.getenv('BITBUCKET_TEAM')
 
     access_token = get_access_token()
@@ -31,15 +33,77 @@ def list_users(verbose: bool):
         return
 
     members = response.json()
-    [print(member['username']) for member in members['values']]
+    
+    table = [[member['display_name'], member['account_id'], member['uuid']] for member in members['values'] ]
+    headers = ['display_name', 'account_id', 'uuid']
+    print(tabulate(table, headers=headers, showindex=range(1, len(table) + 1), tablefmt='github'))
 
-@click.command(name = 'add', help = 'Add an user')
-@click.argument('username')
-def add_user(username: str):
-    # Normally, adding a user into any group making it a member of the Team.
-    # By default, BitBucket creates two groups `administrators` and `developers`.
-    # So obviously, adding a new user into `developers` makes sense here.
-    __group_add_user('developers', username)
+@click.command(name = 'invite', help = 'Invite an user by their primary email')
+@click.argument('email')
+@click.argument('group', default='developers')
+def add_user(email: str, group: str):
+    import json
+    # Since June 2019, BitBucket changed their policy which a new user
+    # can only be invited via their email address. Once they accept the
+    # invitation email address, their username will be added into the team
+    # `developers`.
+    
+    bitbucket_team_name = os.getenv('BITBUCKET_TEAM')
+    access_token = get_access_token()
+
+    response = requests.put(
+        f"{team_invitations_url()}"
+            .format(team=bitbucket_team_name),
+        auth = BearerAuth(access_token),
+        headers = {
+            'Content-Type': 'application/json'
+        },
+        data = json.dumps({
+            'email': email,
+            'group_slug': group
+        })
+    )
+
+    print(response.text)
+
+@click.command(name = 'list-pending', help = 'List unaccepted invitations')
+def list_pending_users():
+    from tabulate import tabulate
+
+    bitbucket_team_name = os.getenv('BITBUCKET_TEAM')
+    access_token = get_access_token()
+
+    response = requests.get(
+        f"{team_invitations_url()}"
+            .format(team=bitbucket_team_name),
+        auth = BearerAuth(access_token)
+    )
+
+    invitations = response.json()
+    headers = ['email', 'invited_by', 'utc_sent_on']
+    table = [[i['email'], i['invited_by']['display_name'], i['utc_sent_on']] for i in invitations]
+    print(tabulate(table, headers=headers, showindex=range(1, len(table) + 1), tablefmt='github'))
+
+@click.command(name = 'del-invitation', help = 'Delete an unaccepted invitation')
+@click.argument('email')
+def delete_invitation(email: str):
+    import json
+    bitbucket_team_name = os.getenv('BITBUCKET_TEAM')
+    access_token = get_access_token()
+
+    response = requests.delete(
+        f"{team_invitations_url()}"
+            .format(team=bitbucket_team_name),
+        auth = BearerAuth(access_token),
+        headers = {
+            'Content-Type' : 'application/json'
+        },
+        data = json.dumps({
+            'email' : email
+        })
+    )
+
+    print(response)
 
 @click.command(name = 'del', help = 'Delete an user')
 @click.argument('username')
@@ -50,4 +114,6 @@ def del_user(username: str):
 
 users_cli.add_command(list_users)
 users_cli.add_command(add_user)
+users_cli.add_command(list_pending_users)
+users_cli.add_command(delete_invitation)
 users_cli.add_command(del_user)

requirements.txt

@@ -1,3 +1,4 @@
 requests>=2.21.0
 python-dotenv>=0.10.2
-click==7.0
+click==7.0
+tabulate==0.7.7

setup.py

@@ -5,13 +5,14 @@
     description = "A small CLI to manage BitBucket Cloud",
     author = "Genzer Hawker",
     author_email = "[email protected]",
-    version='0.2.0',
+    version='0.3.0',
     py_modules=['bitbucklet.cli'],
     packages = find_packages(),
     install_requires=[
         'Click',
         'requests',
-        'python-dotenv'
+        'python-dotenv',
+        'tabulate'
     ],
     entry_points='''
         [console_scripts]