From 80888f06757bce954ccec7c99f5a69db5e688221 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sat, 22 Jun 2024 12:55:14 +0100 Subject: [PATCH] Fix tokens being deleted when package set to None --- app/blueprints/api/tokens.py | 5 +---- app/models/packages.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/blueprints/api/tokens.py b/app/blueprints/api/tokens.py index ee23a19f..ec0f6389 100644 --- a/app/blueprints/api/tokens.py +++ b/app/blueprints/api/tokens.py @@ -59,10 +59,7 @@ def list_tokens(username): @bp.route("/users//tokens//edit/", methods=["GET", "POST"]) @login_required def create_edit_token(username, id=None): - user = User.query.filter_by(username=username).first() - if user is None: - abort(404) - + user = User.query.filter_by(username=username).one_or_404() if not user.check_perm(current_user, Permission.CREATE_TOKEN): abort(403) diff --git a/app/models/packages.py b/app/models/packages.py index e12d1d99..018646eb 100644 --- a/app/models/packages.py +++ b/app/models/packages.py @@ -502,7 +502,7 @@ class Package(db.Model): back_populates="package", cascade="all, delete, delete-orphan") tokens = db.relationship("APIToken", foreign_keys="APIToken.package_id", back_populates="package", - cascade="all, delete, delete-orphan") + cascade="all, delete") update_config = db.relationship("PackageUpdateConfig", uselist=False, back_populates="package", cascade="all, delete, delete-orphan")