Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Create guest users on dashboard or demo entries

Roland Geider5cf8b40f2194
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index d28d4d212..2f48ebc84 100644
--- a/wger/core/tests/test_temporary_users.py
+++ b/wger/core/tests/test_temporary_users.py
@@ -115,27 +115,26 @@ class DemoUserTestCase(WorkoutManagerTestCase):
self.client.get(reverse('nutrition:ingredient:list'))
self.assertEqual(self.count_temp_users(), 1)
- # These pages will create one
- self.client.get(reverse('core:dashboard'))
- self.assertEqual(self.count_temp_users(), 2)
-
- # The new user is automatically logged in, so no new user is created
- # after the first visit
- self.client.get(reverse('core:dashboard'))
- self.assertEqual(self.count_temp_users(), 2)
-
- # Try some other pages
self.user_logout()
self.client.get(reverse('manager:workout:overview'))
- self.assertEqual(self.count_temp_users(), 3)
+ self.assertEqual(self.count_temp_users(), 1)
self.user_logout()
self.client.get(reverse('weight:overview'))
- self.assertEqual(self.count_temp_users(), 4)
+ self.assertEqual(self.count_temp_users(), 1)
self.user_logout()
self.client.get(reverse('nutrition:plan:overview'))
- self.assertEqual(self.count_temp_users(), 5)
+ self.assertEqual(self.count_temp_users(), 1)
+
+ # This page will create one
+ self.client.get(reverse('core:dashboard'))
+ self.assertEqual(self.count_temp_users(), 2)
+
+ # The new user is automatically logged in, so no new user is created
+ # after the first visit
+ self.client.get(reverse('core:dashboard'))
+ self.assertEqual(self.count_temp_users(), 2)
def test_demo_user_notice(self):
'''
diff --git a/wger/core/views/misc.py b/wger/core/views/misc.py
index 5f7e1255a..ed128647d 100644
--- a/wger/core/views/misc.py
+++ b/wger/core/views/misc.py
@@ -175,7 +175,7 @@ class FeedbackClass(FormView):
Load the correct feedback form depending on the user
(either with reCaptcha field or not)
'''
- if self.request.user.userprofile.is_temporary:
+ if self.request.user.is_anonymous() or self.request.user.userprofile.is_temporary:
return FeedbackAnonymousForm
else:
return FeedbackRegisteredForm
diff --git a/wger/manager/pdf.py b/wger/manager/pdf.py
index c750970d7..38a70fa5c 100644
--- a/wger/manager/pdf.py
+++ b/wger/manager/pdf.py
@@ -106,7 +106,6 @@ def workout_log(request, id, uidb64=None, token=None):
return response
-@login_required
def workout_view(request, id, uidb64=None, token=None):
'''
Generates a PDF with the contents of the workout, without table for logs
diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.py
index fef5314d3..f2cba609f 100644
--- a/wger/manager/tests/test_day.py
+++ b/wger/manager/tests/test_day.py
@@ -113,7 +113,7 @@ class RenderWorkoutDayTestCase(WorkoutManagerTestCase):
response = self.client.get(reverse('manager:day:view', kwargs={'id': 5}))
if fail:
- self.assertEqual(response.status_code, 404)
+ self.assertIn(response.status_code, (302, 404))
self.assertTemplateUsed('login.html')
else:
diff --git a/wger/manager/tests/test_ical.py b/wger/manager/tests/test_ical.py
index 724262f17..deb964323 100644
--- a/wger/manager/tests/test_ical.py
+++ b/wger/manager/tests/test_ical.py
@@ -78,7 +78,7 @@ class WorkoutICalExportTestCase(WorkoutManagerTestCase):
response = self.client.get(reverse('manager:workout:ical', kwargs={'pk': 3}))
if fail:
- self.assertIn(response.status_code, (404, 302))
+ self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'text/calendar')
@@ -149,7 +149,7 @@ class ScheduleICalExportTestCase(WorkoutManagerTestCase):
response = self.client.get(reverse('manager:schedule:ical', kwargs={'pk': 2}))
if fail:
- self.assertIn(response.status_code, (404, 302))
+ self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'text/calendar')
diff --git a/wger/manager/tests/test_pdf.py b/wger/manager/tests/test_pdf.py
index b2b9e97e2..a367da18e 100644
--- a/wger/manager/tests/test_pdf.py
+++ b/wger/manager/tests/test_pdf.py
@@ -52,7 +52,7 @@ class WorkoutPdfLogExportTestCase(WorkoutManagerTestCase):
response = self.client.get(reverse('manager:workout:pdf-log', kwargs={'id': 3}))
if fail:
- self.assertIn(response.status_code, (404, 302))
+ self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
@@ -124,7 +124,7 @@ class WorkoutPdfTableExportTestCase(WorkoutManagerTestCase):
response = self.client.get(reverse('manager:workout:pdf-table', kwargs={'id': 3}))
if fail:
- self.assertIn(response.status_code, (404, 302))
+ self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
diff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.py
index 7278ddc42..3d21d252b 100644
--- a/wger/manager/tests/test_schedule.py
+++ b/wger/manager/tests/test_schedule.py
@@ -447,6 +447,14 @@ class SchedulePdfLogExportTestCase(WorkoutManagerTestCase):
self.assertGreater(int(response['Content-Length']), 31000)
self.assertLess(int(response['Content-Length']), 35000)
+ # Wrong or expired token
+ uid = 'MQ'
+ token = '3xv-57ef74923091fe7f186e'
+ response = self.client.get(reverse('manager:schedule:pdf', kwargs={'pk': 1,
+ 'uidb64': uid,
+ 'token': token}))
+ self.assertEqual(response.status_code, 403)
+
def export_pdf(self, fail=False):
'''
Helper function to test exporting a workout as a pdf
@@ -455,7 +463,7 @@ class SchedulePdfLogExportTestCase(WorkoutManagerTestCase):
response = self.client.get(reverse('manager:schedule:pdf', kwargs={'pk': 1}))
if fail:
- self.assertIn(response.status_code, (404, 302))
+ self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
diff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.py
index d5b987d54..24313b7ac 100644
--- a/wger/manager/tests/test_timer.py
+++ b/wger/manager/tests/test_timer.py
@@ -41,7 +41,7 @@ class WorkoutTimerTestCase(WorkoutManagerTestCase):
response = self.client.get(reverse('manager:workout:timer', kwargs={'day_pk': 2}))
if fail:
- self.assertEqual(response.status_code, 404)
+ self.assertIn(response.status_code, (302, 404))
else:
self.assertEqual(response.status_code, 200)
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index bb132115d..2a187e106 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -281,8 +281,8 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):
'''
self.user_login('admin')
self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
- self.assertFalse(cache.get(get_template_cache_name('workout-log-full', True, 1, 2012, 10)))
- self.assertFalse(cache.get(get_template_cache_name('workout-log-mobile', True, 1, 2012, 10)))
+ for cache_key in ('workout-log-full', 'workout-log-mobile'):
+ self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'
@@ -296,10 +296,9 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):
'''
self.user_logout()
self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
- self.assertFalse(cache.get(get_template_cache_name('workout-log-full', True, 1, 2012, 10)))
- self.assertFalse(cache.get(get_template_cache_name('workout-log-full', False, 1, 2012, 10)))
- self.assertFalse(cache.get(get_template_cache_name('workout-log-mobile', True, 1, 2012, 10)))
- self.assertFalse(cache.get(get_template_cache_name('workout-log-mobile', False, 1, 2012, 10)))
+ for cache_key in ('workout-log-full', 'workout-log-mobile'):
+ self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
+ self.assertFalse(cache.get(get_template_cache_name(cache_key, False, 1, 2012, 10)))
self.client.get(reverse('manager:workout:calendar', kwargs={'user_pk': 1,
'year': 2012,
'month': 10}))
diff --git a/wger/manager/views/ical.py b/wger/manager/views/ical.py
index a5b52dc8b..fb3169b7e 100644
--- a/wger/manager/views/ical.py
+++ b/wger/manager/views/ical.py
@@ -125,7 +125,7 @@ def export(request, pk, uidb64=None, token=None):
calendar = get_calendar()
# Create the events and add them to the calendar
- get_events_workout(calendar, workout, request.user.userprofile.workout_duration)
+ get_events_workout(calendar, workout, workout.user.userprofile.workout_duration)
# Send the file to the user
response = HttpResponse(content_type='text/calendar')
@@ -136,7 +136,6 @@ def export(request, pk, uidb64=None, token=None):
return response
-@login_required
def export_schedule(request, pk, uidb64=None, token=None):
'''
Export the current schedule as an iCal file
@@ -149,6 +148,8 @@ def export_schedule(request, pk, uidb64=None, token=None):
else:
return HttpResponseForbidden()
else:
+ if request.user.is_anonymous():
+ return HttpResponseForbidden()
schedule = get_object_or_404(Schedule, pk=pk, user=request.user)
# Create the calendar
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index 8052ffe4c..9dec8a39d 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -88,7 +88,6 @@ def view(request, pk):
return render(request, 'schedule/view.html', template_data)
-@login_required
def export_pdf(request, pk, uidb64=None, token=None):
'''
Show the workout schedule
diff --git a/wger/nutrition/tests/test_bmi.py b/wger/nutrition/tests/test_bmi.py
index 3d8cddf55..46392d847 100644
--- a/wger/nutrition/tests/test_bmi.py
+++ b/wger/nutrition/tests/test_bmi.py
@@ -35,6 +35,10 @@ class BmiTestCase(WorkoutManagerTestCase):
Access the BMI page
'''
+ response = self.client.get(reverse('nutrition:bmi:view'))
+ self.assertEqual(response.status_code, 302)
+
+ self.user_login('test')
response = self.client.get(reverse('nutrition:bmi:view'))
self.assertEqual(response.status_code, 200)
diff --git a/wger/nutrition/tests/test_calories_calculator.py b/wger/nutrition/tests/test_calories_calculator.py
index c3b1bbd92..305f8a41e 100644
--- a/wger/nutrition/tests/test_calories_calculator.py
+++ b/wger/nutrition/tests/test_calories_calculator.py
@@ -34,6 +34,10 @@ class CaloriesCalculatorTestCase(WorkoutManagerTestCase):
Access the page
'''
+ response = self.client.get(reverse('nutrition:calories:view'))
+ self.assertEqual(response.status_code, 302)
+
+ self.user_login('test')
response = self.client.get(reverse('nutrition:calories:view'))
self.assertEqual(response.status_code, 200)
diff --git a/wger/nutrition/views/bmi.py b/wger/nutrition/views/bmi.py
index 64953a15d..ac00a6ba6 100644
--- a/wger/nutrition/views/bmi.py
+++ b/wger/nutrition/views/bmi.py
@@ -18,6 +18,7 @@
import logging
import json
+from django.contrib.auth.decorators import login_required
from django.http import HttpResponse
from django.shortcuts import render
@@ -32,6 +33,7 @@ BMI views
'''
+@login_required
def view(request):
'''
The BMI calculator detail page
@@ -44,6 +46,7 @@ def view(request):
return render(request, 'bmi/form.html', context)
+@login_required
def calculate(request):
'''
Calculates the BMI
diff --git a/wger/nutrition/views/calculator.py b/wger/nutrition/views/calculator.py
index 7179caf32..ad78e29d8 100644
--- a/wger/nutrition/views/calculator.py
+++ b/wger/nutrition/views/calculator.py
@@ -18,6 +18,7 @@
import logging
import json
+from django.contrib.auth.decorators import login_required
from django.http import HttpResponse
from django.shortcuts import render
@@ -33,6 +34,7 @@ Protein calculator views
'''
+@login_required
def view(request):
'''
The basal metabolic rate detail page
@@ -51,6 +53,7 @@ def view(request):
return render(request, 'rate/form.html', context)
+@login_required
def calculate_bmr(request):
'''
Calculates the basal metabolic rate.
@@ -77,6 +80,7 @@ def calculate_bmr(request):
return HttpResponse(data, 'application/json')
+@login_required
def calculate_activities(request):
'''
Calculates the calories needed by additional physical activities
diff --git a/wger/utils/middleware.py b/wger/utils/middleware.py
index 5bd54e477..eb5b9bf0d 100644
--- a/wger/utils/middleware.py
+++ b/wger/utils/middleware.py
@@ -31,14 +31,7 @@ from wger.core.demo import create_temporary_user
logger = logging.getLogger('wger.custom')
-SPECIAL_PATHS = ('dashboard',
- 'workout',
- 'weight',
- 'nutrition/overview',
- 'calculator',
- 'preferences', # from /user/preferences
- 'feedback',
- 'about',)
+SPECIAL_PATHS = ('dashboard',)
def check_current_request(request):
diff --git a/wger/utils/tests/test_middleware.py b/wger/utils/tests/test_middleware.py
index ea764032e..2407cc8fa 100644
--- a/wger/utils/tests/test_middleware.py
+++ b/wger/utils/tests/test_middleware.py
@@ -31,16 +31,16 @@ class RobotsExclusionMiddlewareTestCase(WorkoutManagerTestCase):
self.assertTrue(response.get('X-Robots-Tag'))
response = self.client.get(reverse('manager:workout:overview'))
- self.assertTrue(response.get('X-Robots-Tag'))
+ self.assertFalse(response.get('X-Robots-Tag'))
response = self.client.get(reverse('manager:schedule:overview'))
- self.assertTrue(response.get('X-Robots-Tag'))
+ self.assertFalse(response.get('X-Robots-Tag'))
response = self.client.get(reverse('core:feedback'))
- self.assertTrue(response.get('X-Robots-Tag'))
+ self.assertFalse(response.get('X-Robots-Tag'))
response = self.client.get(reverse('core:about'))
- self.assertTrue(response.get('X-Robots-Tag'))
+ self.assertFalse(response.get('X-Robots-Tag'))
response = self.client.get(reverse('core:contact'))
self.assertFalse(response.get('X-Robots-Tag'))
@@ -66,7 +66,7 @@ class RobotsExclusionMiddlewareTestCase(WorkoutManagerTestCase):
self.assertFalse(response.get('X-Robots-Tag'))
response = self.client.get(reverse('nutrition:plan:overview'))
- self.assertTrue(response.get('X-Robots-Tag'))
+ self.assertFalse(response.get('X-Robots-Tag'))
def test_middleware_exercises(self):
'''