From b94197a74b2dbdfac4b37d1700d882266713f430 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Tue, 26 Nov 2024 08:37:36 +0100
Subject: [PATCH 01/11] v1 using basic auth

---
 rowers/urls.py               |   2 +
 rowers/views/apiviews.py     |  48 +++++++++++++++
 rowers/views/statements.py   | 109 ++++++++++++++++++++++++++++++++++-
 rowers/views/workoutviews.py |   1 -
 4 files changed, 158 insertions(+), 2 deletions(-)

diff --git a/rowers/urls.py b/rowers/urls.py
index 18b28d66..8f82d46e 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -254,6 +254,8 @@ urlpatterns = [
             name='strokedatajson_v3'),
     re_path(r'^api/TCX/workouts/$', views.strokedata_tcx,
             name='strokedata_tcx'),
+    re_path(r'^api/rowingdata/workouts/$', views.strokedata_rowingdata,
+            name='strokedata_rowingdata'),
     re_path(r'^api/courses/$', views.course_list, name='course_list'),
     re_path(r'^api/courses/(?P<id>\d+)/$', views.get_crewnerd_kml, name='get_crewnerd_kml'),
     re_path(r'^api/courses/kml/liked/$', views.get_crewnerd_liked, name='get_crewnerd_liked'),
diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py
index 8c214655..a3b0114d 100644
--- a/rowers/views/apiviews.py
+++ b/rowers/views/apiviews.py
@@ -21,6 +21,8 @@ import rowingdata.tcxtools as tcxtools
 from rowingdata import TCXParser, rowingdata
 import arrow
 
+import base64
+
 class XMLParser(BaseParser):
     media_type = "application/xml"
 
@@ -422,6 +424,52 @@ def get_crewnerd_liked(request):
 
 # Stroke data views
 
+@csrf_exempt
+@logged_in_or_basicauth()
+def strokedata_rowingdata(request):
+    """
+    Upload a .csv file (rowingdata standard) through API, using Basic Auth
+    """
+    r = getrower(request.user)
+    if r.rowerplan == 'freecoach':
+        return HttpResponseNotAllowed("This endpoint is for users, not for free coach accounts")
+
+    if request.method == 'POST':
+        form = DocumentsForm(request.POST, request.FILES)
+        if not form.is_valid():
+            return HttpResponseBadRequest(json.dumps(form.errors))
+
+        f = form.cleaned_data['file']
+        if f is None:
+            return HttpResponseBadRequest("Missing file")
+
+        filename, completefilename = handle_uploaded_file(f)
+
+        uploadoptions = {
+            'secret': settings.UPLOAD_SERVICE_SECRET,
+            'user': r.user.id,
+            'file': completefilename,
+            'workouttype': form.cleaned_data['workouttype'],
+            'boattype': form.cleaned_data['boattype'],
+            'title': form.cleaned_data['title'],
+            'rpe': form.cleaned_data['rpe'],
+            'notes': form.cleaned_data['notes']
+        }
+
+        url = settings.UPLOAD_SERVICE_URL
+
+        _ = myqueue(queuehigh,
+                    handle_request_post,
+                    url,
+                    uploadoptions)
+
+        return JsonResponse(
+            {
+                "status": "success",
+            }
+        )
+
+
 @csrf_exempt
 #@login_required()
 @api_view(["POST"])
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index d134013d..4807ebb5 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -93,7 +93,8 @@ from django.http import (
     HttpResponse, HttpResponseRedirect,
     JsonResponse,
     HttpResponseForbidden, HttpResponseNotAllowed,
-    HttpResponseNotFound, Http404
+    HttpResponseNotFound, Http404,
+    HttpResponseBadRequest,
 )
 from django.contrib.auth import authenticate, login, logout
 from rowers.forms import (
@@ -302,6 +303,112 @@ from rowers.weather import get_wind_data, get_airport_code, get_metar_data
 
 from oauth2_provider.models import Application, Grant, AccessToken
 
+import base64
+from django.http import HttpResponse
+from django.contrib.auth import authenticate, login
+
+#############################################################################
+#
+def view_or_basicauth(view, request, test_func, realm = "", *args, **kwargs):
+    """
+    This is a helper function used by both 'logged_in_or_basicauth' and
+    'has_perm_or_basicauth' that does the nitty of determining if they
+    are already logged in or if they have provided proper http-authorization
+    and returning the view if all goes well, otherwise responding with a 401.
+    """
+    if test_func(request.user):
+        # Already logged in, just return the view.
+        #
+        return view(request, *args, **kwargs)
+
+    # They are not logged in. See if they provided login credentials
+    #
+    if 'HTTP_AUTHORIZATION' in request.META:
+        auth = request.META['HTTP_AUTHORIZATION'].split()
+        if len(auth) == 2:
+            # NOTE: We are only support basic authentication for now.
+            #
+            if auth[0].lower() == "basic":
+                uname, passwd = base64.b64decode(auth[1]).decode("utf-8").split(':')
+                user = authenticate(username=uname, password=passwd)
+                if user is not None:
+                    if user.is_active:
+                        login(request, user)
+                        request.user = user
+                        return view(request, *args, **kwargs)
+
+    # Either they did not provide an authorization header or
+    # something in the authorization attempt failed. Send a 401
+    # back to them to ask them to authenticate.
+    #
+    response = HttpResponse()
+    response.status_code = 401
+    response['WWW-Authenticate'] = 'Basic realm="%s"' % realm
+    return response
+    
+#############################################################################
+#
+def logged_in_or_basicauth(realm = ""):
+    """
+    A simple decorator that requires a user to be logged in. If they are not
+    logged in the request is examined for a 'authorization' header.
+
+    If the header is present it is tested for basic authentication and
+    the user is logged in with the provided credentials.
+
+    If the header is not present a http 401 is sent back to the
+    requestor to provide credentials.
+
+    The purpose of this is that in several django projects I have needed
+    several specific views that need to support basic authentication, yet the
+    web site as a whole used django's provided authentication.
+
+    The uses for this are for urls that are access programmatically such as
+    by rss feed readers, yet the view requires a user to be logged in. Many rss
+    readers support supplying the authentication credentials via http basic
+    auth (and they do NOT support a redirect to a form where they post a
+    username/password.)
+
+    Use is simple:
+
+    @logged_in_or_basicauth
+    def your_view:
+        ...
+
+    You can provide the name of the realm to ask for authentication within.
+    """
+    def view_decorator(func):
+        def wrapper(request, *args, **kwargs):
+            return view_or_basicauth(func, request,
+                                     lambda u: u.is_authenticated,
+                                     realm, *args, **kwargs)
+        return wrapper
+    return view_decorator
+
+#############################################################################
+#
+def has_perm_or_basicauth(perm, realm = ""):
+    """
+    This is similar to the above decorator 'logged_in_or_basicauth'
+    except that it requires the logged in user to have a specific
+    permission.
+
+    Use:
+
+    @logged_in_or_basicauth('asforums.view_forumcollection')
+    def your_view:
+        ...
+
+    """
+    def view_decorator(func):
+        def wrapper(request, *args, **kwargs):
+            return view_or_basicauth(func, request,
+                                     lambda u: u.has_perm(perm),
+                                     realm, *args, **kwargs)
+        return wrapper
+    return view_decorator
+
+
 import django_rq
 queue = django_rq.get_queue('default')
 queuelow = django_rq.get_queue('low')
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index eb0aed30..a250e4aa 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -4931,7 +4931,6 @@ def workout_upload_api(request):
         post_data = {k: q.getlist(k) if len(
             q.getlist(k)) > 1 else v for k, v in q.items()}
 
-
     # only allow local host
     hostt = request.get_host().split(':')
     if hostt[0] not in ['localhost', '127.0.0.1', 'dev.rowsandall.com', 'rowsandall.com']:

From 68a3ad8bcd4a6e9834988c9358e3a7a61d0ab85d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Tue, 26 Nov 2024 12:37:15 +0100
Subject: [PATCH 02/11] tested

---
 rowers/tests/test_api.py              |  38 +++++++++++++++-
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 rowers/views/apiviews.py              |  63 ++++++++++++++------------
 3 files changed, 70 insertions(+), 31 deletions(-)

diff --git a/rowers/tests/test_api.py b/rowers/tests/test_api.py
index 1187265e..6f32ba8d 100644
--- a/rowers/tests/test_api.py
+++ b/rowers/tests/test_api.py
@@ -44,7 +44,6 @@ class OwnApi(TestCase):
         self.password = faker.word()
         self.u.set_password(self.password)
         self.u.save()
-
         self.factory = APIRequestFactory()
 
 
@@ -210,6 +209,43 @@ class OwnApi(TestCase):
             response = strokedata_tcx(request)
             self.assertEqual(response.status_code,200)
 
+    def test_strokedataform_rowingdata(self):
+
+        url = reverse('strokedata_rowingdata')
+
+        filename = 'rowers/tests/testdata/testdata.csv'
+        f = open(filename, 'rb')
+
+        # Use Basic Auth header (alternative if using a custom view)
+        credentials = f"{self.u.username}:{self.password}"
+        base64_credentials = base64.b64encode(credentials.encode()).decode()
+
+        # Use Basic Auth header
+        headers = {
+            "HTTP_AUTHORIZATION": f"Basic {base64_credentials}"
+        }
+
+        form_data = {
+            "workouttype": "rower",
+            "boattype": "1x",
+            "notes": "A test file upload",
+        }
+
+        # Send POST request
+        response = self.client.post(
+            url,
+            {"file": f, **form_data},
+            format="multipart",  # Ensure multipart/form-data is used
+            **headers,  # Optional if login doesn't suffice
+        )
+
+        f.close()
+
+        # Assertions
+        self.assertEqual(response.status_code, 201)
+
+
+            
     def test_strokedataform_empty(self):
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index ee6427eb36c48bb9e301489a13aa72041967ea78..7e8d8029b8bd1ae44cf0945d96f8ac5057503a16 100644
GIT binary patch
delta 3914
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
Y7mw1@_#<8V@Xr4LOMZU;1jK*=01Nr~qW}N^

delta 3914
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
Yym*+N#*1|6!#n>2Irt<<1jK*=00ng4r~m)}

diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py
index a3b0114d..9008a763 100644
--- a/rowers/views/apiviews.py
+++ b/rowers/views/apiviews.py
@@ -434,40 +434,43 @@ def strokedata_rowingdata(request):
     if r.rowerplan == 'freecoach':
         return HttpResponseNotAllowed("This endpoint is for users, not for free coach accounts")
 
-    if request.method == 'POST':
-        form = DocumentsForm(request.POST, request.FILES)
-        if not form.is_valid():
-            return HttpResponseBadRequest(json.dumps(form.errors))
+    if request.method != 'POST':
+        return HttpResponseNotAllowed("Method not supported")  # pragma: no cover
+    
+    form = DocumentsForm(request.POST, request.FILES)
+    if not form.is_valid():
+        return HttpResponseBadRequest(json.dumps(form.errors))
 
-        f = form.cleaned_data['file']
-        if f is None:
-            return HttpResponseBadRequest("Missing file")
+    f = form.cleaned_data['file']
+    if f is None:
+        return HttpResponseBadRequest("Missing file")
 
-        filename, completefilename = handle_uploaded_file(f)
+    filename, completefilename = handle_uploaded_file(f)
+    
+    uploadoptions = {
+        'secret': settings.UPLOAD_SERVICE_SECRET,
+        'user': r.user.id,
+        'file': completefilename,
+        'workouttype': form.cleaned_data['workouttype'],
+        'boattype': form.cleaned_data['boattype'],
+        'title': form.cleaned_data['title'],
+        'rpe': form.cleaned_data['rpe'],
+        'notes': form.cleaned_data['notes']
+    }
 
-        uploadoptions = {
-            'secret': settings.UPLOAD_SERVICE_SECRET,
-            'user': r.user.id,
-            'file': completefilename,
-            'workouttype': form.cleaned_data['workouttype'],
-            'boattype': form.cleaned_data['boattype'],
-            'title': form.cleaned_data['title'],
-            'rpe': form.cleaned_data['rpe'],
-            'notes': form.cleaned_data['notes']
+    url = settings.UPLOAD_SERVICE_URL
+    
+    _ = myqueue(queuehigh,
+                handle_request_post,
+                url,
+                uploadoptions)
+    response = JsonResponse(
+        {
+            "status": "success",
         }
-
-        url = settings.UPLOAD_SERVICE_URL
-
-        _ = myqueue(queuehigh,
-                    handle_request_post,
-                    url,
-                    uploadoptions)
-
-        return JsonResponse(
-            {
-                "status": "success",
-            }
-        )
+    )
+    response.status_code = 201
+    return response
 
 
 @csrf_exempt

From 5968d2a0e2be7cd4156b4e7d0ee20b4fc94a681b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Tue, 26 Nov 2024 14:49:26 +0100
Subject: [PATCH 03/11] adding APIKey method

---
 rowers/authentication.py         | 15 +++++++++
 rowers/models.py                 | 13 +++++++-
 rowers/templates/rower_form.html |  8 +++++
 rowers/tests/test_api.py         | 35 ++++++++++++++++++++-
 rowers/urls.py                   |  3 ++
 rowers/views/apiviews.py         | 52 ++++++++++++++++++++++++++++++++
 rowers/views/statements.py       | 32 +++++++++++++++++++-
 rowers/views/userviews.py        | 18 +++++++++++
 rowsandall_app/settings.py       |  1 +
 9 files changed, 174 insertions(+), 3 deletions(-)
 create mode 100644 rowers/authentication.py

diff --git a/rowers/authentication.py b/rowers/authentication.py
new file mode 100644
index 00000000..e5cf818e
--- /dev/null
+++ b/rowers/authentication.py
@@ -0,0 +1,15 @@
+from rest_framework.authentication import BaseAuthentication
+from rest_framework.exceptions import AuthenticationFailed
+from rowers.models import APIKey
+
+class APIKeyAuthentication(BaseAuthentication):
+    def authenticate(self, request):
+        api_key = request.META.get('HTTP_AUTHORIZATION')
+        if not api_key:
+            return None
+        try:
+            api_key = APIKey.objects.get(key=api_key, is_active=True)
+        except APIKey.DoesNotExist:
+            raise AuthenticationFailed('Invalid API key')
+
+        return (api_key.user, None)
diff --git a/rowers/models.py b/rowers/models.py
index 5ddc51dc..310b93a4 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -27,7 +27,7 @@ from django.contrib.admin.widgets import AdminDateWidget, AdminTimeWidget, Admin
 import os
 import json
 import ssl
-    
+import secrets    
 
 import re
 import pytz
@@ -923,7 +923,18 @@ class CoachingGroup(models.Model):
         return Rower.objects.filter(mycoachgroup=self)
 
 # Extension of User with rowing specific data
+class APIKey(models.Model):
+    key = models.CharField(max_length=50, unique=True, default=secrets.token_urlsafe)
+    user = models.ForeignKey('auth.User', on_delete=models.CASCADE)
+    created_at = models.DateTimeField(auto_now_add=True)
+    is_active = models.BooleanField(default=True)
 
+    def __str__(self):
+        return f"{self.user.username}:{self.key}"
+
+    def regenerate_key(self):
+        self.key = secrets.token_urlsafe()
+        self.save()
 
 class Rower(models.Model):
     adaptivetypes = mytypes.adaptivetypes
diff --git a/rowers/templates/rower_form.html b/rowers/templates/rower_form.html
index 68096f27..4912dd0e 100644
--- a/rowers/templates/rower_form.html
+++ b/rowers/templates/rower_form.html
@@ -116,6 +116,14 @@
     </table>
     {% endif %}
   </li>
+  <li class="grid_2">
+    <h2>API Key</h2>
+    <p>{{ apikey }}</p>
+    <p>
+      <a href="/rowers/me/regenerateapikey/">Regenerate</a>
+    </p>
+    This API key can be used to access the Rowsandall API. It is used by some third party applications to access your data. Keep it secret.
+  </li>
 </ul>
 {% endif %}
 
diff --git a/rowers/tests/test_api.py b/rowers/tests/test_api.py
index 6f32ba8d..74dff25d 100644
--- a/rowers/tests/test_api.py
+++ b/rowers/tests/test_api.py
@@ -26,6 +26,7 @@ import json
 
 from rowers.ownapistuff import *
 from rowers.views.apiviews import *
+from rowers.models import APIKey
 
 class OwnApi(TestCase):
     def setUp(self):
@@ -45,7 +46,7 @@ class OwnApi(TestCase):
         self.u.set_password(self.password)
         self.u.save()
         self.factory = APIRequestFactory()
-
+        self.apikey = APIKey.objects.create(user=self.u)
 
     def test_strokedataform(self):
         login = self.c.login(username=self.u.username, password=self.password)
@@ -245,6 +246,38 @@ class OwnApi(TestCase):
         self.assertEqual(response.status_code, 201)
 
 
+    def test_strokedataform_rowingdata_apikey(self):
+
+        url = reverse('strokedata_rowingdata_apikey')
+
+        filename = 'rowers/tests/testdata/testdata.csv'
+        f = open(filename, 'rb')
+
+        # Use API Key header
+        headers = {
+            "HTTP_AUTHORIZATION": self.apikey.key,
+        }
+
+        form_data = {
+            "workouttype": "rower",
+            "boattype": "1x",
+            "notes": "A test file upload",
+        }
+
+        # Send POST request
+        response = self.client.post(
+            url,
+            {"file": f, **form_data},
+            format="multipart",  # Ensure multipart/form-data is used
+            **headers,  # Optional if login doesn't suffice
+        )
+
+        f.close()
+
+        # Assertions
+        self.assertEqual(response.status_code, 201)
+
+
             
     def test_strokedataform_empty(self):
         login = self.c.login(username=self.u.username, password=self.password)
diff --git a/rowers/urls.py b/rowers/urls.py
index 8f82d46e..1e4210dc 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -256,6 +256,8 @@ urlpatterns = [
             name='strokedata_tcx'),
     re_path(r'^api/rowingdata/workouts/$', views.strokedata_rowingdata,
             name='strokedata_rowingdata'),
+    re_path(r'^api/rowingdata/$', views.strokedata_rowingdata_apikey,
+            name='strokedata_rowingdata_apikey'),
     re_path(r'^api/courses/$', views.course_list, name='course_list'),
     re_path(r'^api/courses/(?P<id>\d+)/$', views.get_crewnerd_kml, name='get_crewnerd_kml'),
     re_path(r'^api/courses/kml/liked/$', views.get_crewnerd_liked, name='get_crewnerd_liked'),
@@ -735,6 +737,7 @@ urlpatterns = [
     re_path(r'^me/request/$', views.manager_requests_view,
             name='manager_requests_view'),
     re_path(r'^me/edit/$', views.rower_edit_view, name='rower_edit_view'),
+    re_path(r'^me/regenerateapikey/$', views.rower_regenerate_apikey, name='rower_regenerate_apikey'),
     re_path(r'^me/edit/user/(?P<userid>\d+)/$',
             views.rower_edit_view, name='rower_edit_view'),
     re_path(r'^me/preferences/$', views.rower_prefs_view,
diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py
index 9008a763..828216e8 100644
--- a/rowers/views/apiviews.py
+++ b/rowers/views/apiviews.py
@@ -473,6 +473,58 @@ def strokedata_rowingdata(request):
     return response
 
 
+@csrf_exempt
+@api_view(["POST"])
+@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True)
+@permission_classes([IsAuthenticated])
+def strokedata_rowingdata_apikey(request):
+    """
+    Upload a .csv file (rowingdata standard) through API, using
+    """
+
+    r = getrower(request.user)
+    if r.rowerplan == 'freecoach':
+        return HttpResponseNotAllowed("This endpoint is for users, not for free coach accounts")
+
+    if request.method != 'POST':
+        return HttpResponseNotAllowed("Method not supported")
+
+    form = DocumentsForm(request.POST, request.FILES)
+    if not form.is_valid():
+        return HttpResponseBadRequest(json.dumps(form.errors))
+
+    f = form.cleaned_data['file']
+    if f is None:
+        return HttpResponseBadRequest("Missing file")
+
+    filename, completefilename = handle_uploaded_file(f)
+
+    uploadoptions = {
+        'secret': settings.UPLOAD_SERVICE_SECRET,
+        'user': r.user.id,
+        'file': completefilename,
+        'workouttype': form.cleaned_data['workouttype'],
+        'boattype': form.cleaned_data['boattype'],
+        'title': form.cleaned_data['title'],
+        'rpe': form.cleaned_data['rpe'],
+        'notes': form.cleaned_data['notes']
+    }
+
+    url = settings.UPLOAD_SERVICE_URL
+    
+    _ = myqueue(queuehigh,
+                handle_request_post,
+                url,
+                uploadoptions)
+    response = JsonResponse(
+        {
+            "status": "success",
+        }
+    )
+    response.status_code = 201
+    return response
+        
+
 @csrf_exempt
 #@login_required()
 @api_view(["POST"])
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index 4807ebb5..01b768c5 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -164,7 +164,7 @@ from rowers.models import (
     StandardCollection, CourseStandard,
     VirtualRaceFollower, TombStone, InstantPlan,
     PlannedSessionStep,InStrokeAnalysis, ForceCurveAnalysis, SyncRecord,
-    UserMessage,
+    UserMessage,APIKey,
 )
 from rowers.models import ( RowerPowerForm, RowerHRZonesForm, SimpleRowerPowerForm,
                             RowerForm, RowerCPForm, GraphImage, AdvancedWorkoutForm,
@@ -307,6 +307,27 @@ import base64
 from django.http import HttpResponse
 from django.contrib.auth import authenticate, login
 
+def view_or_apikey(view, request, test_func, realm = "", *args, **kwargs):
+    if test_func(request.user):
+        return view(request, *args, **kwargs)
+
+    if 'Authorization' in request.META:
+        api_key = request.META.get('Authorization')
+        if api_key:
+            try:
+                api_key = APIKey.objects.get(key=api_key, is_active=True)
+            except APIKey.DoesNotExist:
+                raise AuthenticationFailed('Invalid API key')
+
+            login(request, api_key.user, backend='django.contrib.auth.backends.ModelBackend')
+            request.user = api_key.user
+            return view(request, *args, **kwargs)
+
+    response = HttpResponse()
+    response.status_code = 401
+    response['WWW-Authenticate'] = 'Basic realm="%s"' % realm
+    return response
+
 #############################################################################
 #
 def view_or_basicauth(view, request, test_func, realm = "", *args, **kwargs):
@@ -348,6 +369,15 @@ def view_or_basicauth(view, request, test_func, realm = "", *args, **kwargs):
     
 #############################################################################
 #
+def logged_in_or_apikey(realm = ""):
+    def view_decorator(func):
+        def wrapper(request, *args, **kwargs):
+            return view_or_apikey(func, request,
+                                     lambda u: u.is_authenticated,
+                                     realm, *args, **kwargs)
+        return wrapper
+    return view_decorator
+
 def logged_in_or_basicauth(realm = ""):
     """
     A simple decorator that requires a user to be logged in. If they are not
diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index 0c1eed43..250a5432 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -632,6 +632,12 @@ def rower_edit_view(request, rowerid=0, userid=0, message=""):
         userform = UserForm(instance=r.user)
 
     grants = AccessToken.objects.filter(user=request.user)
+    try:
+        apikey = APIKey.objects.get(user=request.user)
+    except APIKey.DoesNotExist:
+        apikey = APIKey.objects.create(user=request.user)
+
+        
     return render(request, 'rower_form.html',
                   {
                       'teams': get_my_teams(request.user),
@@ -640,8 +646,20 @@ def rower_edit_view(request, rowerid=0, userid=0, message=""):
                       'userform': userform,
                       'accountform': accountform,
                       'rower': r,
+                      'apikey': apikey.key,
                   })
 
+@login_required()
+def rower_regenerate_apikey(request):
+    try:
+        apikey = APIKey.objects.get(user=request.user)
+    except APIKey.DoesNotExist:
+        apikey = APIKey.objects.create(user=request.user)
+
+    apikey.regenerate_key()
+
+    return HttpResponseRedirect(reverse('rower_edit_view'))
+
 #simple initial settings page
 @login_required()
 @permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True)
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index 8c1d4255..8d862009 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -485,6 +485,7 @@ REST_FRAMEWORK = {
         #        'rest_framework.authentication.SessionAuthentication',
         #        'rest_framework.authentication.TokenAuthentication',
         'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
+        'rowers.authentication.APIKeyAuthentication',
     ),
     'PAGE_SIZE': 20,
     'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',

From 752ac42052714490406eeb47980dd16cbaf8a3f0 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Tue, 26 Nov 2024 15:10:12 +0100
Subject: [PATCH 04/11] tested

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 7e8d8029b8bd1ae44cf0945d96f8ac5057503a16..6c09960b02d3e46883136da96f2b090e7ece176c 100644
GIT binary patch
literal 4000
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
GfB^s{Z9fG7

literal 4000
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
GfB^u>$1;Tg


From 2266c486ed55c278fffc9a36a9173a79f149b667 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Tue, 26 Nov 2024 15:32:28 +0100
Subject: [PATCH 05/11] tested again

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 rowers/views/apiviews.py              |   3 +++
 rowsandall_app/settings.py            |   2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 6c09960b02d3e46883136da96f2b090e7ece176c..5e6c45aaa93d91ddde8df3ae319fcb985e3a6c8d 100644
GIT binary patch
literal 4000
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
GfB^uf1{g~K

literal 4000
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
GfB^s{Z9fG7

diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py
index 828216e8..910f962c 100644
--- a/rowers/views/apiviews.py
+++ b/rowers/views/apiviews.py
@@ -426,6 +426,9 @@ def get_crewnerd_liked(request):
 
 @csrf_exempt
 @logged_in_or_basicauth()
+#@api_view(["POST"])
+#@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True)
+#@permission_classes([IsAuthenticated])
 def strokedata_rowingdata(request):
     """
     Upload a .csv file (rowingdata standard) through API, using Basic Auth
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index 8d862009..5bf05b8b 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -481,7 +481,7 @@ REST_FRAMEWORK = {
         #        'rest_framework.permissions.DjangoModelPermissions'
     ],
     'DEFAULT_AUTHENTICATION_CLASSES': (
-        'rest_framework.authentication.BasicAuthentication',
+        #'rest_framework.authentication.BasicAuthentication',
         #        'rest_framework.authentication.SessionAuthentication',
         #        'rest_framework.authentication.TokenAuthentication',
         'oauth2_provider.contrib.rest_framework.OAuth2Authentication',

From 562ce917972772f50e272156a31c559de833ab1e Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Thu, 28 Nov 2024 16:06:51 +0100
Subject: [PATCH 06/11] adding api key to export settings page

---
 rowers/templates/rower_exportsettings.html | 130 +++++++++++++--------
 rowers/views/userviews.py                  |  12 +-
 2 files changed, 93 insertions(+), 49 deletions(-)

diff --git a/rowers/templates/rower_exportsettings.html b/rowers/templates/rower_exportsettings.html
index a62ad6a2..4990ce37 100644
--- a/rowers/templates/rower_exportsettings.html
+++ b/rowers/templates/rower_exportsettings.html
@@ -7,37 +7,38 @@
 {% block main %}
 <h1>Import and Export Settings for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
-<p>You are currently connected to:
-  {% if rower.c2token is not None and rower.c2token != '' %}
-  Concept2 Logbook,
-  {% endif %}
-  {% if rower.nktoken is not None and rower.nktoken != '' %}
-  NK Logbook,
-  {% endif %}
-  {% if rower.sporttrackstoken  is not None and rower.sporttrackstoken != '' %}
-  SportTracks,
-  {% endif %}
-  {% if rower.tptoken  is not None and rower.tptoken  != '' %}
-  TrainingPeaks,
-  {% endif %}
-  {% if rower.polartoken  is not None and rower.polartoken  != '' %}
-  Polar,
-  {% endif %}
-  {% if rower.garmintoken  is not None and rower.garmintoken  != '' %}
-  Garmin Connect,
-  {% endif %}
-  {% if rower.stravatoken is not None and rower.stravatoken != '' %}
-  Strava,
-  {% endif %}
-  {% if rower.rp3token is not None and rower.rp3token != '' %}
-  RP3
-  {% endif %}
-  {% if rower.rojabo_token is not None and rower.rojabo_token != '' %}
-  Rojabo
-  {% endif %}
-
-</p>
-
+<ul class="main-content">
+  <li class="grid_2">
+    <p>You are currently connected to:
+      {% if rower.c2token is not None and rower.c2token != '' %}
+      Concept2 Logbook,
+      {% endif %}
+      {% if rower.nktoken is not None and rower.nktoken != '' %}
+      NK Logbook,
+      {% endif %}
+      {% if rower.sporttrackstoken  is not None and rower.sporttrackstoken != '' %}
+      SportTracks,
+      {% endif %}
+      {% if rower.tptoken  is not None and rower.tptoken  != '' %}
+      TrainingPeaks,
+      {% endif %}
+      {% if rower.polartoken  is not None and rower.polartoken  != '' %}
+      Polar,
+      {% endif %}
+      {% if rower.garmintoken  is not None and rower.garmintoken  != '' %}
+      Garmin Connect,
+      {% endif %}
+      {% if rower.stravatoken is not None and rower.stravatoken != '' %}
+      Strava,
+      {% endif %}
+      {% if rower.rp3token is not None and rower.rp3token != '' %}
+      RP3
+      {% endif %}
+      {% if rower.rojabo_token is not None and rower.rojabo_token != '' %}
+      Rojabo
+      {% endif %}
+    </p>
+  
 {% if form.errors %}
 <p style="color: red;">
   Please correct the error{{ form.errors|pluralize }} below.
@@ -71,24 +72,57 @@
   a workout on Strava. If you want Deletions to propagate to Rowsandall, tick the Strava Auto Delete
   check box.
 </p>
-<p>Click on one of the icons below to connect to the service of your
-  choice or to renew the authorization.</p>
-<p><a href="/rowers/me/stravaauthorize/"><img src="/static/img/ConnectWithStrava.png" alt="connect with strava" width="120"></a></p>
-<p><a href="/rowers/me/c2authorize/"><img src="/static/img/blueC2logo.png" alt="connect with Concept2" width="120"></a></p>
-<p><a href="/rowers/me/nkauthorize/"><img src="/static/img/NKLiNKLogbook.png" alt="connect with NK Logbook" width="120"></a></p>
-<p><a href="/rowers/me/sporttracksauthorize/"><img src="/static/img/sporttracks-button.png" alt="connect with SportTracks" width="120"></a></p>
-<p><a href="/rowers/me/polarauthorize/"><img src="/static/img/Polar_connectwith_btn_white.png"
+  </li>
+  <li class="grid_2">
+    {% if grants %}
+    <h2>Applications</h2>
+    <table width="100%">
+      <thead>
+        <tr>
+          <th>Application</th>
+          <th>Scope</th>
+          <th>Revoke</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for grant in grants %}
+        <tr>
+          <td>{{ grant.application }}</td>
+          <td>{{ grant.scope }}</td>
+          <td>
+            <a href="/rowers/me/revokeapp/{{ grant.application.id }}/">Revoke</a>
+          </td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+    {% endif %}
+    <h2>API Key</h2>
+    <p>{{ apikey }}</p>
+    <p>
+      <a href="/rowers/me/regenerateapikey/">Regenerate</a>
+    </p>
+    This API key can be used to access the Rowsandall API. It is used by some third party applications to access your data. Keep it secret.
+  </li>
+
+</ul>
+    <p>Click on one of the icons below to connect to the service of your
+      choice or to renew the authorization.</p>
+    <p><a href="/rowers/me/stravaauthorize/"><img src="/static/img/ConnectWithStrava.png" alt="connect with strava" width="120"></a></p>
+    <p><a href="/rowers/me/c2authorize/"><img src="/static/img/blueC2logo.png" alt="connect with Concept2" width="120"></a></p>
+    <p><a href="/rowers/me/nkauthorize/"><img src="/static/img/NKLiNKLogbook.png" alt="connect with NK Logbook" width="120"></a></p>
+    <p><a href="/rowers/me/sporttracksauthorize/"><img src="/static/img/sporttracks-button.png" alt="connect with SportTracks" width="120"></a></p>
+    <p><a href="/rowers/me/polarauthorize/"><img src="/static/img/Polar_connectwith_btn_white.png"
                                                  alt="connect with Polar" width="130"></a></p>
-<p><a href="/rowers/me/tpauthorize/"><img src="/static/img/TP_logo_horz_2_color.png"
-                    alt="connect with Polar" width="130"></a></p>
-
-<p><a href="/rowers/me/garminauthorize"><img src="/static/img/garmin_badge_130.png"
-  alt="connect with Garmin" width="130"></a></p>
-<p><a href="/rowers/me/rp3authorize"><img src="/static/img/logo-rp3-full-black.png"
-  alt="connect with RP3" width="130"></a></p>
-  <p><a href="/rowers/me/rojaboauthorize"><img src="/static/img/rojabo.png"
-    alt="connect with Rojabo" width="130"></a></p>
-
+    <p><a href="/rowers/me/tpauthorize/"><img src="/static/img/TP_logo_horz_2_color.png"
+					      alt="connect with Polar" width="130"></a></p>
+    
+    <p><a href="/rowers/me/garminauthorize"><img src="/static/img/garmin_badge_130.png"
+						 alt="connect with Garmin" width="130"></a></p>
+    <p><a href="/rowers/me/rp3authorize"><img src="/static/img/logo-rp3-full-black.png"
+					      alt="connect with RP3" width="130"></a></p>
+    <p><a href="/rowers/me/rojaboauthorize"><img src="/static/img/rojabo.png"
+						 alt="connect with Rojabo" width="130"></a></p>
 
 {% endblock %}
 
diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index 250a5432..e92af908 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -520,10 +520,19 @@ def rower_exportsettings_view(request, userid=0):
         }
     ]
 
+    grants = AccessToken.objects.filter(user=request.user)
+    try:
+        apikey = APIKey.objects.get(user=request.user)
+    except APIKey.DoesNotExist:
+        apikey = APIKey.objects.create(user=request.user)
+
+
     return render(request, 'rower_exportsettings.html',
                   {'form': form,
                    'rower': r,
                    'breadcrumbs': breadcrumbs,
+                   'grants': grants,
+                   'apikey': apikey.key,
                    })
 
 
@@ -651,6 +660,7 @@ def rower_edit_view(request, rowerid=0, userid=0, message=""):
 
 @login_required()
 def rower_regenerate_apikey(request):
+    referer = request.META['HTTP_REFERER']
     try:
         apikey = APIKey.objects.get(user=request.user)
     except APIKey.DoesNotExist:
@@ -658,7 +668,7 @@ def rower_regenerate_apikey(request):
 
     apikey.regenerate_key()
 
-    return HttpResponseRedirect(reverse('rower_edit_view'))
+    return HttpResponseRedirect(referer)
 
 #simple initial settings page
 @login_required()

From 10faa49bba3a39b5f5c6d92b3005cfcee257fc2a Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 2 Dec 2024 21:32:42 +0100
Subject: [PATCH 07/11] fix

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 rowers/views/userviews.py             |   5 ++++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 5e6c45aaa93d91ddde8df3ae319fcb985e3a6c8d..418d1f2f479abd2efa7e6b85cbe4c6a30680a14f 100644
GIT binary patch
literal 4000
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
GfB^vY20o_%

literal 4000
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
GfB^uf1{g~K

diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index e92af908..629be7a2 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -660,7 +660,10 @@ def rower_edit_view(request, rowerid=0, userid=0, message=""):
 
 @login_required()
 def rower_regenerate_apikey(request):
-    referer = request.META['HTTP_REFERER']
+    try:
+        referer = request.META['HTTP_REFERER']
+    except KeyError:
+        referer = '/rowers/me/edit/'
     try:
         apikey = APIKey.objects.get(user=request.user)
     except APIKey.DoesNotExist:

From a3c0484093568ec5ac043ea7dec7236e33a1a3c7 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Tue, 3 Dec 2024 08:08:21 +0100
Subject: [PATCH 08/11] tested

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 418d1f2f479abd2efa7e6b85cbe4c6a30680a14f..b03bc36c249a6a3506d8e80f5b11ca3c61fa57bf 100644
GIT binary patch
literal 4000
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
GfB^uBfft4V

literal 4000
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
GfB^vY20o_%


From 2887a7e2a2a053d4fdbf86d9674c12b389441f2c Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Thu, 5 Dec 2024 19:23:00 +0100
Subject: [PATCH 09/11] fixing error

---
 rowers/views/analysisviews.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 1938df26..c6401e09 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -2282,11 +2282,11 @@ def history_view_data(request, userid=0):
 
         try:
             ddict['hrmean'] = int(wavg(ddf, 'hr', 'deltat'))
-        except (KeyError, ValueError, AttributeError):  # pragma: no cover
+        except (KeyError, ValueError, AttributeError, ColumnNotFoundError):  # pragma: no cover
             ddict['hrmean'] = 0
         try:
             ddict['hrmax'] = int(ddf['hr'].max())
-        except (KeyError, ValueError, AttributeError):  # pragma: no cover
+        except (KeyError, ValueError, AttributeError, ColumnNotFoundError):  # pragma: no cover
             ddict['hrmax'] = 0
 
         ddict['powermean'] = int(wavg(ddf, 'power', 'deltat'))

From d9dcef0f1769bfd385d7d2498b759c807fda965e Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Fri, 6 Dec 2024 10:14:33 +0100
Subject: [PATCH 10/11] tested

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index b03bc36c249a6a3506d8e80f5b11ca3c61fa57bf..99c4fa64276bfe207d3dd1f36952d023f717bfab 100644
GIT binary patch
literal 4000
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
GfB^u@D?8l)

literal 4000
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
GfB^uBfft4V


From ca0b5a72c3a4ec1ddefa8c7225d5fa6fce439b8d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Fri, 6 Dec 2024 10:30:56 +0100
Subject: [PATCH 11/11] tested

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 99c4fa64276bfe207d3dd1f36952d023f717bfab..6d41b590b1029532ecb55c438e24177823164bb9 100644
GIT binary patch
literal 4000
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
GfB^syEkzsv

literal 4000
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
GfB^u@D?8l)