Skip to content

Commit f0caa76

Browse files
committed
Change default for role parameter of add user API
1 parent c3933b7 commit f0caa76

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

groups.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ def api_group_user_is_member(ctx: rule.Context, username: str, group_name: str)
11321132
return group_user_exists(ctx, group_name, username, True)
11331133

11341134

1135-
def group_user_add(ctx: rule.Context, username: str, group_name: str, role: str | None = None) -> api.Result:
1135+
def group_user_add(ctx: rule.Context, username: str, group_name: str, role: str = "normal") -> api.Result:
11361136
"""Add a user to a group.
11371137
11381138
:param ctx: Combined type of a ctx and rei struct
@@ -1169,16 +1169,13 @@ def group_user_add(ctx: rule.Context, username: str, group_name: str, role: str
11691169
# Mark user as invited.
11701170
msi.sudo_obj_meta_add(ctx, username, "-u", constants.UUORGMETADATAPREFIX + "sram_invited", group_name, "", "")
11711171

1172-
# If a role was provided, assign role to new user
1173-
if role is not None:
1172+
# If a role other than normal/member was provided, assign role to new user (normal/member is assigned by default)
1173+
if role != "normal" and role != "member":
11741174
# Redifine role
11751175
if role == "viewer":
11761176
role = "reader"
1177-
elif role == "member":
1178-
role = "normal"
11791177

1180-
if role != "normal": # Normal/member is assigned to new user by default
1181-
return group_user_update_role(ctx, username, group_name, role)
1178+
return group_user_update_role(ctx, username, group_name, role)
11821179

11831180
return api.Result.ok()
11841181
else:
@@ -1188,7 +1185,7 @@ def group_user_add(ctx: rule.Context, username: str, group_name: str, role: str
11881185

11891186

11901187
@api.make()
1191-
def api_group_user_add(ctx: rule.Context, username: str, group_name: str, role: str | None = None) -> api.Result:
1188+
def api_group_user_add(ctx: rule.Context, username: str, group_name: str, role: str = "normal") -> api.Result:
11921189
"""Add a user to a group.
11931190
11941191
:param ctx: Combined type of a ctx and rei struct

0 commit comments

Comments
 (0)