Skip to content

Commit

Permalink
feat: use request.auth instead of querying again
Browse files Browse the repository at this point in the history
  • Loading branch information
helllllllder committed Jul 18, 2023
1 parent 3ba9fa2 commit 3bdf195
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
10 changes: 2 additions & 8 deletions chats/apps/api/v1/external/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@


class IsAdminPermission(permissions.BasePermission):
def get_auth_permission(self, request):
auth_header = request.META.get("HTTP_AUTHORIZATION")
auth_token = auth_header.split()[1]
permission = ProjectPermission.objects.get(pk=auth_token, role=1)
return permission

def has_permission(self, request, view): # pragma: no cover
if view.action in ["list", "create"]:
try:
permission = self.get_auth_permission(request)
permission = request.auth
project = permission.project

validation = ValidatePermissionRequest(
Expand All @@ -32,7 +26,7 @@ def has_object_permission(self, request, view, obj):
Return `True` if permission is granted, `False` otherwise.
"""
try:
permission = self.get_auth_permission(request)
permission = request.auth
project = obj.project
except ProjectPermission.DoesNotExist:
return False
Expand Down
5 changes: 1 addition & 4 deletions chats/apps/api/v1/external/rooms/viewsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,6 @@ def partial_update(self, request, pk=None):

class CustomFieldsUserExternalViewSet(viewsets.ViewSet):
serializer_class = RoomFlowSerializer
permission_classes = [
IsAdminPermission,
]
authentication_classes = [ProjectAdminAuthentication]

def partial_update(self, request, pk=None):
Expand All @@ -200,7 +197,7 @@ def partial_update(self, request, pk=None):
return Response(
{"Detail": "No contact id on the request"}, status.HTTP_400_BAD_REQUEST
)
request_permission = self.request.auth
request_permission = request.auth
project = request_permission.project

response = FlowRESTClient().create_contact(
Expand Down

0 comments on commit 3bdf195

Please sign in to comment.