From cef7654362fcbd86dae3583c00776983728aa897 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 26 Dec 2024 13:42:38 +0100 Subject: [PATCH] return token --- rowers/braintreestuff.py | 2 +- rowers/idoklad.py | 2 +- rowers/models.py | 22 +++++++++++----------- rowers/views/statements.py | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rowers/braintreestuff.py b/rowers/braintreestuff.py index 4092b241..64ba63b9 100644 --- a/rowers/braintreestuff.py +++ b/rowers/braintreestuff.py @@ -1,4 +1,4 @@ -from rowers.models import Rower, PaidPlan, CoachingGroup #, iDokladToken +from rowers.models import Rower, PaidPlan, CoachingGroup, iDokladToken from rowers.utils import ProcessorCustomerError from rowsandall_app.settings import ( BRAINTREE_MERCHANT_ID, BRAINTREE_PUBLIC_KEY, BRAINTREE_PRIVATE_KEY, diff --git a/rowers/idoklad.py b/rowers/idoklad.py index 099b3c66..4c301573 100644 --- a/rowers/idoklad.py +++ b/rowers/idoklad.py @@ -21,7 +21,7 @@ from rowers.utils import myqueue import django_rq queuehigh = django_rq.get_queue('high') -#from rowers.models import iDokladToken +from rowers.models import iDokladToken #idoklad_countries = json.loads(open('rowers/idoklad_countries.json').read())["Data"]["Items"] with open('rowers/idoklad_countries.yaml') as f: diff --git a/rowers/models.py b/rowers/models.py index 0e0740b3..b5bbff8f 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -5587,15 +5587,15 @@ class ForceCurveAnalysis(models.Model): return s -#class iDokladToken(models.Model): -# access_token = models.CharField(max_length=512) -# refresh_token = models.CharField(max_length=512) -# id_token = models.CharField(max_length=512) -# token_type = models.CharField(max_length=512) -# created_at = models.DateTimeField(auto_now_add=True) -# updated_at = models.DateTimeField(auto_now=True) -# expires_in = models.IntegerField() # Store token expiry duration in seconds - -# def __str__(self): -# return f"iDoklad Token updated at {self.updated_at}, expires at {self.updated_at+datetime.timedelta(seconds=self.expires_in)}" +class iDokladToken(models.Model): + access_token = models.CharField(max_length=512) + refresh_token = models.CharField(max_length=512) + id_token = models.CharField(max_length=512) + token_type = models.CharField(max_length=512) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + expires_in = models.IntegerField() # Store token expiry duration in seconds + + def __str__(self): + return f"iDoklad Token updated at {self.updated_at}, expires at {self.updated_at+datetime.timedelta(seconds=self.expires_in)}" diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 01066050..e0b574a1 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -181,7 +181,7 @@ from rowers.models import ( RowerPowerForm, RowerHRZonesForm, SimpleRowerPowerFo IndoorVirtualRaceForm, PlannedSessionCommentForm, Alert, Condition, StaticChartRowerForm, FollowerForm, VirtualRaceAthleteForm, InstantPlanForm, DataRowerForm, - StepEditorForm, #iDokladToken, + StepEditorForm, iDokladToken, RowerExportFormStrava, RowerExportFormPolar, RowerExportFormSportTracks, RowerExportFormTrainingPeaks, RowerExportFormConcept2, RowerExportFormGarmin,