Add management command to increase an ODKTokens lifetime #1847
Conversation
DavisRayM
force-pushed
the
elongate-odk-token-command
branch
6 times, most recently
from
d8b677d
to
290d29a
Compare
DavisRayM
changed the title
DavisRayM
force-pushed
the
elongate-odk-token-command
branch
2 times, most recently
from
99e73a7
to
6cf5edc
Compare
DavisRayM
changed the title
DavisRayM
force-pushed
the
elongate-odk-token-command
branch
3 times, most recently
from
1f826dd
to
dcfed84
Compare
onadata/apps/api/models/odk_token.py
Outdated
| instance.expires = instance.created + timedelta( | ||
| days=ODK_TOKEN_LIFETIME) | ||
| instance.expires = instance.expires.astimezone( | ||
| instance.created.tzinfo) |
There was a problem hiding this comment.
Why are we overriding instance.expires in line 101? Also, will instance.expires in line 99 still have the value assigned to it even though it hasn't been saved and it's being used in line 101? Let me know if my questions make sense
There was a problem hiding this comment.
Overriding the value to make sure that the date-time object saved in the field is timezone aware(Usually Django saves it's datetime objects with the UTC timezone when Timezones are enabled. Didn't want to deviate from that)
The instance will still have the expires value assigned to the object in line 99 and the value will be accessible in line 101, I believe. I'll update this though and set the expires field in one line, just in case.
onadata/libs/utils/logger_tools.py
Outdated
| if username: | ||
| if isinstance(form_id, XForm): | ||
| root = form_id.survey.name | ||
| else: | ||
| try: | ||
| form = XForm.objects.filter( | ||
| id_string__iexact=form_id, | ||
| user__username__iexact=username, | ||
| deleted_at__isnull=True).first() | ||
| root = form.survey.name | ||
| except XForm.DoesNotExist: | ||
| root = 'data' | ||
| else: | ||
| root = 'data' |
There was a problem hiding this comment.
Why have we changed the value assigned to root from form_id (which seems to be an xform object) to a string value (data)? Also, i'm not very conversant with this part of the code. I'd like @ukanga's eye on this change as well
There was a problem hiding this comment.
My bad, these are changes meant for another pull request. I didn't notice the commits were rebased into this one. I'll update the PR
DavisRayM
force-pushed
the
elongate-odk-token-command
branch
from
dcfed84
to
348c03c
Compare
The 'expires' field will enable one to increment / decrement the expiry date of an ODKToken easily. Included the '_post_save_set_expiry_date' function to set the 'expires' field value post_save in order to have access to the 'created' field value - Update 'test_fails_authentication_past_odk_token_expiry' test
DavisRayM
force-pushed
the
elongate-odk-token-command
branch
from
348c03c
to
4d3bd89
Compare
Changes / Features implemented
expiresdate-time field for ODKToken classincrease_odk_token_lifetimeSteps taken to verify this change does what is intended
Side effects of implementing this change
ODKTokenscreated before this change will not have theexpiresdate set. Which might cause issues. All ODKTokens should be invalidated/regenerated.Closes #1747