MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switched to is_authenticated (no parenthesis)

This commit is contained in:
Eliot Berriot 2017-12-15 23:42:20 +01:00
parent e9c3eb59a3
commit 0559b1b1ab
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/common/permissions.py
View File

@ -7,5 +7,5 @@ class ConditionalAuthentication(BasePermission):
def has_permission(self, request, view): def has_permission(self, request, view):
if settings.API_AUTHENTICATION_REQUIRED: if settings.API_AUTHENTICATION_REQUIRED:
return request.user and request.user.is_authenticated() return request.user and request.user.is_authenticated
return True return True

4
api/funkwhale_api/history/views.py
View File

@ -22,14 +22,14 @@ class ListeningViewSet(mixins.CreateModelMixin,
def get_queryset(self): def get_queryset(self):
queryset = super().get_queryset() queryset = super().get_queryset()
if self.request.user.is_authenticated(): if self.request.user.is_authenticated:
return queryset.filter(user=self.request.user) return queryset.filter(user=self.request.user)
else: else:
return queryset.filter(session_key=self.request.session.session_key) return queryset.filter(session_key=self.request.session.session_key)
def get_serializer_context(self): def get_serializer_context(self):
context = super().get_serializer_context() context = super().get_serializer_context()
if self.request.user.is_authenticated(): if self.request.user.is_authenticated:
context['user'] = self.request.user context['user'] = self.request.user
else: else:
context['session_key'] = self.request.session.session_key context['session_key'] = self.request.session.session_key

2
api/funkwhale_api/music/views.py
View File

@ -102,7 +102,7 @@ class TrackViewSet(TagViewSetMixin, SearchMixin, viewsets.ReadOnlyModelViewSet):
queryset = super().get_queryset() queryset = super().get_queryset()
filter_favorites = self.request.GET.get('favorites', None) filter_favorites = self.request.GET.get('favorites', None)
user = self.request.user user = self.request.user
if user.is_authenticated() and filter_favorites == 'true': if user.is_authenticated and filter_favorites == 'true':
queryset = queryset.filter(track_favorites__user=user) queryset = queryset.filter(track_favorites__user=user)
return queryset return queryset

6
api/funkwhale_api/radios/views.py
View File

@ -19,14 +19,14 @@ class RadioSessionViewSet(mixins.CreateModelMixin,
def get_queryset(self): def get_queryset(self):
queryset = super().get_queryset() queryset = super().get_queryset()
if self.request.user.is_authenticated(): if self.request.user.is_authenticated:
return queryset.filter(user=self.request.user) return queryset.filter(user=self.request.user)
else: else:
return queryset.filter(session_key=self.request.session.session_key) return queryset.filter(session_key=self.request.session.session_key)
def get_serializer_context(self): def get_serializer_context(self):
context = super().get_serializer_context() context = super().get_serializer_context()
if self.request.user.is_authenticated(): if self.request.user.is_authenticated:
context['user'] = self.request.user context['user'] = self.request.user
else: else:
context['session_key'] = self.request.session.session_key context['session_key'] = self.request.session.session_key
@ -44,7 +44,7 @@ class RadioSessionTrackViewSet(mixins.CreateModelMixin,
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
session = serializer.validated_data['session'] session = serializer.validated_data['session']
try: try:
if request.user.is_authenticated(): if request.user.is_authenticated:
assert request.user == session.user assert request.user == session.user
else: else:
assert request.session.session_key == session.session_key assert request.session.session_key == session.session_key