Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions alertaclient/commands/cmd_me.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@ def cli(obj, name, email, password, status, text):

client = obj['client']
try:
r = client.update_me(name=name, email=email, password=password, status=status, attributes=None, text=text)
user = client.update_me(name=name, email=email, password=password, status=status, attributes=None, text=text)
except Exception as e:
click.echo('ERROR: {}'.format(e), err=True)
sys.exit(1)
if r['status'] == 'ok':
click.echo('Updated.')
else:
click.echo(r['message'])
click.echo(user.id)
11 changes: 4 additions & 7 deletions alertaclient/commands/cmd_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def parse_args(self, ctx, args):
@click.option('--status', help='Status eg. active, inactive')
@click.option('--role', 'roles', multiple=True, help='List of roles')
@click.option('--text', help='Description of user')
@click.option('--email-verified/--email-not-verified', default=False, help='Email address verified flag')
@click.option('--email-verified/--email-not-verified', default=None, help='Email address verified flag')
@click.option('--delete', '-D', metavar='UUID', help='Delete user using ID')
@click.pass_obj
def cli(obj, id, name, email, password, status, roles, text, email_verified, delete):
Expand All @@ -35,21 +35,18 @@ def cli(obj, id, name, email, password, status, roles, text, email_verified, del
if delete:
client.delete_user(delete)
elif id:
if not any([name, email, password, status, roles, text, email_verified]):
if not any([name, email, password, status, roles, text, (email_verified is not None)]):
click.echo('Nothing to update.')
sys.exit(1)
try:
r = client.update_user(
user = client.update_user(
id, name=name, email=email, password=password, status=status,
roles=roles, attributes=None, text=text, email_verified=email_verified
)
except Exception as e:
click.echo('ERROR: {}'.format(e), err=True)
sys.exit(1)
if r['status'] == 'ok':
click.echo('Updated.')
else:
click.echo(r['message'])
click.echo(user.id)
else:
if not email:
raise click.UsageError('Need "--email" to create user.')
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py36,py37,py38
envlist = py36,py37,py38,py39
skip_missing_interpreters=true

[testenv]
Expand Down