Skip to content

Commit bcfaaed

Browse files
committed
fix auth
1 parent c474744 commit bcfaaed

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

backend/apps/core/views.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ def user_info(request):
5050
"""Get current user info from Clerk"""
5151
user_id = request.user.get('id')
5252
return Response({
53-
request.userr_id,
54-
"email": request.user.get('email_addresses', [{}])[0].get('request.users'),
53+
"id": user_id,
54+
"email": request.user.get('email_addresses', [{}])[0].get('email_address'),
5555
"first_name": request.user.get('first_name'),
56-
"last_namerequest.userser.get('last_name'),
57-
"username":request.userr.get('username'),
58-
"image_url":request.userr.get('image_url'),
59-
"created_atrequest.userser.get('created_at'),
60-
"updated_arequest.useruser.get('updated_at'),
61-
}, status=statrequest.userOK)
56+
"last_name": request.user.get('last_name'),
57+
"username": request.user.get('username'),
58+
"image_url": request.user.get('image_url'),
59+
"created_at": request.user.get('created_at'),
60+
"updated_at": request.user.get('updated_at'),
61+
}, status=status.HTTP_200_OK)
6262

6363

6464
@api_view(["GET"])
@@ -68,13 +68,15 @@ def protected_view(request):
6868
user_id = request.user.get('id')
6969
return Response(
7070
{
71-
"message": "request.userhe protected area!",
71+
"message": "Welcome to the protected area!",
7272
"user": {
7373
"id": user_id,
7474
"email": request.user.get('email_addresses', [{}])[0].get('email_address'),
75-
request.username": request.user.get('first_name'),
76-
"last_name": request.user.get(request.user,
77-
"username": request.user.get('urequest.user "image_url": request.user.get('irequest.user },
75+
"first_name": request.user.get('first_name'),
76+
"last_name": request.user.get('last_name'),
77+
"username": request.user.get('username'),
78+
"image_url": request.user.get('image_url'),
79+
},
7880
},
79-
status=statusrequest.user,
81+
status=status.HTTP_200_OK,
8082
)

backend/apps/events/views.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,13 @@ def review_submission(request, submission_id):
657657
def get_user_submissions(request):
658658
"""Get submissions for the authenticated user"""
659659
try:
660-
submissions = EventSubmission.objects.filter(submitted_by=request.user.get('id')).order_by("-submitted_at")
660+
user_id = request.auth_payload.get('sub') or request.auth_payload.get('id')
661+
user_id_source = 'auth_payload'
662+
if not user_id:
663+
logger.warning("events.get_user_submissions: no user_id resolved; returning 401-like response context")
664+
submissions = EventSubmission.objects.filter(submitted_by=user_id).order_by("-submitted_at")
665+
666+
count = submissions.count()
661667

662668
data = [
663669
{

0 commit comments

Comments
 (0)