steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Update `createuser` to match behavior of UI

This commit is contained in:
Christopher C. Wells 2023-02-08 18:17:39 -08:00 committed by Christopher Charbonneau Wells
parent 90e16431b8
commit ae06cbd47e
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
babybuddy/management/commands/createuser.py
View File

@ -67,12 +67,10 @@ class Command(BaseCommand):
def handle(self, *args, **options): def handle(self, *args, **options):
username = options.get(self.UserModel.USERNAME_FIELD) username = options.get(self.UserModel.USERNAME_FIELD)
password = options.get("password") password = options.get("password")
is_group_read_only = options.get("read_only") is_read_only = options.get("read_only")
is_staff = options.get("is_staff")
user_data = {} user_data = {}
user_password = options.get("password") user_password = options.get("password")
group = ""
verbose_field_name = self.username_field.verbose_name verbose_field_name = self.username_field.verbose_name
try: try:
@ -84,13 +82,6 @@ class Command(BaseCommand):
user_data[self.UserModel.USERNAME_FIELD] = username user_data[self.UserModel.USERNAME_FIELD] = username
if is_staff and is_group_read_only:
raise CommandError(
"You cannot set both read_only and is_staff flags simultaneously."
)
group = self.get_user_group(is_group_read_only)
# Prompt for a password interactively (if password not set via arg) # Prompt for a password interactively (if password not set via arg)
while password is None: while password is None:
password = getpass.getpass() password = getpass.getpass()
@ -99,18 +90,15 @@ class Command(BaseCommand):
if password.strip() == "": if password.strip() == "":
self.stderr.write("Error: Blank passwords aren't allowed.") self.stderr.write("Error: Blank passwords aren't allowed.")
password = None password = None
# Don't validate blank passwords.
continue continue
if password != password2: if password != password2:
self.stderr.write("Error: Your passwords didn't match.") self.stderr.write("Error: Your passwords didn't match.")
password = None password = None
password2 = None
# Don't validate passwords that don't match.
continue continue
try: try:
validate_password(password2, self.UserModel(**user_data)) validate_password(password, self.UserModel(**user_data))
except exceptions.ValidationError as err: except exceptions.ValidationError as err:
self.stderr.write("\n".join(err.messages)) self.stderr.write("\n".join(err.messages))
response = input( response = input(
@ -118,7 +106,6 @@ class Command(BaseCommand):
) )
if response.lower() != "y": if response.lower() != "y":
password = None password = None
password2 = None
continue continue
user_password = password user_password = password
@ -128,12 +115,15 @@ class Command(BaseCommand):
).create_user(**user_data, password=user_password) ).create_user(**user_data, password=user_password)
user.email = options.get("email") user.email = options.get("email")
user.is_staff = options.get("is_staff") user.is_staff = options.get("is_staff")
user.save()
if user.is_staff: if is_read_only:
user.is_superuser = False
user.save()
group = models.Group.objects.get(name="read_only")
user.groups.add(group)
else:
user.is_superuser = True user.is_superuser = True
user.save() user.save()
else:
user.groups.add(group)
if options.get("verbosity") > 0: if options.get("verbosity") > 0:
self.stdout.write(f"User {username} created successfully.") self.stdout.write(f"User {username} created successfully.")
@ -182,11 +172,3 @@ class Command(BaseCommand):
self.username_field.clean(username, None) self.username_field.clean(username, None)
except exceptions.ValidationError as e: except exceptions.ValidationError as e:
return "; ".join(e.messages) return "; ".join(e.messages)
def get_user_group(self, is_group_read_only):
"""
Returns the group a user belongs to depnding on the '--read-only' flag
"""
if is_group_read_only:
return models.Group.objects.get(name="read_only")
return models.Group.objects.get(name="standard")