Skip to content

Commit 7ba815e

Browse files
committed
Use username in admin auth API
Use username consistently in authorization handlers and responses for clarity. AI-Assisted: Used AI for drafting text; code changes reviewed and validated by me.
1 parent 143da4a commit 7ba815e

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

tahrir/endpoints/admin/authorizations.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,20 @@ def add_authorization():
2121
if not data.get(field):
2222
return abort(400, f"No detail provided for {field!r}")
2323

24+
badge_id = data.get(required_fields[0])
25+
username = data.get(required_fields[1])
26+
2427
# ONE SHOULD NOT FEEL THE NEED OF USING THE EMAIL ADDRESS HERE
2528
# THIS WORKAROUND IS TEMPORARY AND TAHRIR-API WOULD BE CHANGED TO ACCEPT JUST USERNAME
2629
result = g.tahrirdb.add_authorization(
27-
badge_id=data.get(required_fields[0]),
28-
person_email=data.get(required_fields[1]) + "@fedoraproject.org",
30+
badge_id=badge_id,
31+
person_email=username + "@fedoraproject.org",
2932
)
3033

3134
if not result:
3235
return abort(400, "Failed to add authorization")
3336

34-
return jsonify(
35-
{
36-
"message": f"Badge {data.get(required_fields[0])!r} authorized to {data.get(required_fields[1])!r}"
37-
}
38-
), 201
37+
return jsonify({"message": f"Badge {badge_id!r} authorized to {username!r}"}), 201
3938

4039

4140
@bp.route("/api/admin/authorization", methods=["DELETE"])
@@ -54,18 +53,20 @@ def remove_authorization():
5453
if not data.get(field):
5554
return abort(400, f"No detail provided for {field!r}")
5655

56+
badge_id = data.get(required_fields[0])
57+
username = data.get(required_fields[1])
58+
5759
# ONE SHOULD NOT FEEL THE NEED OF USING THE EMAIL ADDRESS HERE
5860
# THIS WORKAROUND IS TEMPORARY AND TAHRIR-API WOULD BE CHANGED TO ACCEPT JUST USERNAME
5961
result = g.tahrirdb.delete_authorization(
60-
badge_id=data.get(required_fields[0]),
61-
person_email=data.get(required_fields[1]) + "@fedoraproject.org",
62+
badge_id=badge_id,
63+
person_email=username + "@fedoraproject.org",
6264
)
6365

6466
if not result:
6567
return abort(404, "Authorization not found or failed to remove")
6668

67-
return jsonify(
68-
{
69-
"message": f"Badge {data.get(required_fields[0])!r} authorization revoked from {data.get(required_fields[1])!r}"
70-
}
71-
), 200
69+
return (
70+
jsonify({"message": f"Badge {badge_id!r} authorization revoked from {username!r}"}),
71+
200,
72+
)

0 commit comments

Comments
 (0)