|
1 | 1 | from typing import Any, Optional |
2 | 2 |
|
3 | | -import flask_restful |
| 3 | +import flask_restx |
4 | 4 | from flask_login import current_user |
5 | | -from flask_restful import Resource, fields, marshal_with |
| 5 | +from flask_restx import Resource, fields, marshal_with |
6 | 6 | from sqlalchemy import select |
7 | 7 | from sqlalchemy.orm import Session |
8 | 8 | from werkzeug.exceptions import Forbidden |
@@ -40,7 +40,7 @@ def _get_resource(resource_id, tenant_id, resource_model): |
40 | 40 | ).scalar_one_or_none() |
41 | 41 |
|
42 | 42 | if resource is None: |
43 | | - flask_restful.abort(404, message=f"{resource_model.__name__} not found.") |
| 43 | + flask_restx.abort(404, message=f"{resource_model.__name__} not found.") |
44 | 44 |
|
45 | 45 | return resource |
46 | 46 |
|
@@ -81,7 +81,7 @@ def post(self, resource_id): |
81 | 81 | ) |
82 | 82 |
|
83 | 83 | if current_key_count >= self.max_keys: |
84 | | - flask_restful.abort( |
| 84 | + flask_restx.abort( |
85 | 85 | 400, |
86 | 86 | message=f"Cannot create more than {self.max_keys} API keys for this resource type.", |
87 | 87 | code="max_keys_exceeded", |
@@ -126,7 +126,7 @@ def delete(self, resource_id, api_key_id): |
126 | 126 | ) |
127 | 127 |
|
128 | 128 | if key is None: |
129 | | - flask_restful.abort(404, message="API key not found") |
| 129 | + flask_restx.abort(404, message="API key not found") |
130 | 130 |
|
131 | 131 | db.session.query(ApiToken).where(ApiToken.id == api_key_id).delete() |
132 | 132 | db.session.commit() |
|
0 commit comments