From d5a3e09a98150220bd90d8bbbb2f381af6bd86bf Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 5 Jul 2020 23:14:57 +0200 Subject: [PATCH] core: add token Intents --- passbook/core/migrations/0005_token_intent.py | 24 +++++++++++++++ passbook/core/models.py | 29 +++++++++++++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 passbook/core/migrations/0005_token_intent.py diff --git a/passbook/core/migrations/0005_token_intent.py b/passbook/core/migrations/0005_token_intent.py new file mode 100644 index 000000000..975bae05d --- /dev/null +++ b/passbook/core/migrations/0005_token_intent.py @@ -0,0 +1,24 @@ +# Generated by Django 3.0.7 on 2020-07-05 21:11 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("passbook_core", "0004_auto_20200703_2213"), + ] + + operations = [ + migrations.AddField( + model_name="token", + name="intent", + field=models.TextField( + choices=[ + ("verification", "Intent Verification"), + ("api", "Intent Api"), + ], + default="verification", + ), + ), + ] diff --git a/passbook/core/models.py b/passbook/core/models.py index e660ab53a..ffe0386c4 100644 --- a/passbook/core/models.py +++ b/passbook/core/models.py @@ -6,6 +6,7 @@ from uuid import uuid4 from django.contrib.auth.models import AbstractUser from django.contrib.postgres.fields import JSONField from django.db import models +from django.db.models import Q, QuerySet from django.http import HttpRequest from django.utils.timezone import now from django.utils.translation import gettext_lazy as _ @@ -195,15 +196,39 @@ class UserSourceConnection(CreatedUpdatedModel): unique_together = (("user", "source"),) +class TokenIntents(models.TextChoices): + """Intents a Token can be created for.""" + + # Single user token + INTENT_VERIFICATION = "verification" + + # Allow access to API + INTENT_API = "api" + + class Token(models.Model): - """One-time link for password resets/sign-up-confirmations""" + """Token used to authenticate the User for API Access or confirm another Stage like Email.""" token_uuid = models.UUIDField(primary_key=True, editable=False, default=uuid4) + intent = models.TextField( + choices=TokenIntents.choices, default=TokenIntents.INTENT_VERIFICATION + ) expires = models.DateTimeField(default=default_token_duration) user = models.ForeignKey("User", on_delete=models.CASCADE, related_name="+") expiring = models.BooleanField(default=True) description = models.TextField(default="", blank=True) + @staticmethod + def filter_not_expired(**kwargs) -> QuerySet: + """Filer for tokens which are not expired yet or are not expiring, + and match filters in `kwargs`""" + query = Q(**kwargs) + query_not_expired_yet = Q(expires__lt=now(), expiring=True) + query_not_expiring = Q(expiring=False) + return Token.objects.filter( + query & (query_not_expired_yet | query_not_expiring) + ) + @property def is_expired(self) -> bool: """Check if token is expired yet.""" @@ -211,7 +236,7 @@ class Token(models.Model): def __str__(self): return ( - f"Token f{self.token_uuid.hex} {self.description} (expires={self.expires})" + f"Token {self.token_uuid.hex} {self.description} (expires={self.expires})" ) class Meta: