Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Don't use the login_required decorator

Roland Geider5f71782cabda
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index 15a5b1e80..2758dd389 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -22,7 +22,10 @@ import logging
from django.conf import settings
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
-from django.http import JsonResponse
+from django.http import (
+ HttpResponseForbidden,
+ JsonResponse,
+)
from django.utils.decorators import method_decorator
from django.views.decorators.cache import cache_page
@@ -82,6 +85,7 @@ from wger.core.models import (
from wger.utils.api_token import create_token
from wger.utils.permissions import WgerPermission
+
logger = logging.getLogger(__name__)
@@ -410,28 +414,41 @@ class RoutineWeightUnitViewSet(viewsets.ReadOnlyModelViewSet):
filterset_fields = ('name',)
-@login_required
-@api_view(['GET'])
+@api_view()
def get_token_for_user(request):
+ if not request.user.is_authenticated:
+ return HttpResponseForbidden()
+
token = AccessToken.for_user(request.user)
return JsonResponse(
data={
'token': str(token),
'type': str(token.token_type),
+ 'user': request.user.username,
'powersync_url': 'http://powersync:8080',
}
)
-@login_required
-@api_view(['GET'])
+@api_view()
def get_powersync_keys(request):
+ if not request.user.is_authenticated:
+ return HttpResponseForbidden()
+
return JsonResponse(
- {
- 'keys': [
- settings.POWERSYNC_JWKS_PUBLIC_KEY,
- ]
- },
+ {'keys': [settings.POWERSYNC_JWKS_PUBLIC_KEY]},
+ status=200,
+ )
+
+
+@api_view()
+def upload_powersync_data(request):
+ if not request.user.is_authenticated:
+ return HttpResponseForbidden()
+
+ logger.debug(request.POST)
+ return JsonResponse(
+ {'ok!'},
status=200,
)
diff --git a/wger/urls.py b/wger/urls.py
index 95ff0604c..3e57dea9f 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -278,7 +278,7 @@ urlpatterns += [
name='min_app_version',
),
path(
- 'api/v2/get-token',
+ 'api/v2/powersync-token',
core_api_views.get_token_for_user,
name='get_token',
),
@@ -287,6 +287,11 @@ urlpatterns += [
core_api_views.get_powersync_keys,
name='powersync-keys',
),
+ path(
+ 'api/v2/upload-powersync-data',
+ core_api_views.upload_powersync_data,
+ name='powersync-keys',
+ ),
# Api documentation
path(
'api/v2/schema',