Merge branch 'release/v23.6.8'

rowers/templates/loadnextweek.html

@@ -8,6 +8,7 @@
 
 <h1>Load next week</h1>
 
+<p>
 <form enctype="multipart/form-data" method="post">
   <table>
   {{ form.as_table }}
@@ -15,6 +16,9 @@
   {% csrf_token %}
   <input type="submit" value="Submit">
 </form>
+</p>
+<p>
+  <a href="http://localhost:8898/{{ rower.training_plan_code }}">Link to plan</a>
 
 {% endblock %}
 

rowers/views/userviews.py

@@ -2,37 +2,39 @@ from rowers.views.statements import *
 from rowers.rower_rules import user_is_not_basic, user_is_coachee
 from rowers.tokens import create_token
 from rowers.forms import DeepWaterLoginForm
+from django.contrib.auth import get_user
 import jwt
 
 def deepwatertoken_login(request):
-    if request.method == 'POST':
+    # Check if user is already authenticated
+    if request.user.is_authenticated:
+        user = request.user
+    elif request.method == 'POST':
         username = request.POST.get('username', '')
         password = request.POST.get('password', '')
         user = authenticate(request, username=username, password=password)
-        if user is not None:
-            login(request, user)
+    else:
+        redirect_url = request.GET.get('redirect', settings.DEEP_WATER_URL)
+        return render(request, "deepwaterlogin.html")
+
+    if user is None:
+        messages.error(request, 'Invalid credentials')
+        return render(request, 'deepwaterlogin.html')
+
+    # Generate token (same as before)
     payload = {
         'user_id': user.id,
         'username': user.username,
         'email': user.email,
-                'exp': timezone.now() + datetime.timedelta(days=1),  # Token valid for 1 day
+        'exp': timezone.now() + datetime.timedelta(days=1),
         'iat': timezone.now(),
     }
-
     token = jwt.encode(payload, settings.DEEP_WATER_SECRET_KEY, algorithm='HS256')
 
-            # Debug: Print the token
-            print(f"Generated token: {token}")
-            print(f"Token length: {len(token)}")
-            print(f"Token parts: {token.split('.')}")
-            
+    # Redirect with token
     redirect_url = request.GET.get('redirect', settings.DEEP_WATER_URL)
     return HttpResponseRedirect(f"{redirect_url}?token={token}")
-        else:
-            messages.error(request, 'Invalid credentials')
-            return render(request, 'deepwaterlogin.html')
-    redirect_url = request.GET.get('redirect', settings.DEEP_WATER_URL)
-    return render(request, "deepwaterlogin.html")
+
 
 @login_required()
 def get_deepwater_token(request):
@@ -461,7 +463,6 @@ def rower_favoritecharts_view(request, userid=0):
 
 
 @login_required()
-@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True)
 def rower_exportsettings_view(request, userid=0):
     attrtokens = {
         'polar_auto_import': 'polartoken',
@@ -510,7 +511,6 @@ def rower_exportsettings_view(request, userid=0):
         if form.is_valid():
             cd = form.cleaned_data
             for attr, value in cd.items():
-                doset = True
                 try:
                     tokenname = attrtokens[attr]
                     if (getattr(r, tokenname) == '' or getattr(r, tokenname) is None) and value:
@@ -518,27 +518,11 @@ def rower_exportsettings_view(request, userid=0):
                             request, 'Set '+attr+' but it will not be effective until you create a connection.'
                         )
                 except KeyError:
-                    doset = True
-                if not user_is_not_basic(r.user):  # pragma: no cover
-                    if not user_is_coachee(r.user):
-                        doset = False
-                if not doset: # pragma: no cover
-                    before = getattr(r, attr)
-                    if before == value:
-                        doset = True
-                if doset:
+                    pass
                 setattr(r, attr, value)
-                else: # pragma: no cover
-                    if user_is_not_basic(r.user):
-                        messages.error(
-                            request, 'Could not set '+attr+'. You need to create the connection first.')
-
 
             r.save()
-            if doset:
             messages.info(request, 'Settings saved')
-            else: # pragma: no cover
-                messages.error(request, 'Settings not saved: Need a Pro account')
     else:
         form = RowerExportForm(instance=r)