Skip to content

Commit

Permalink
global: fix Flask v3 deprecations
Browse files Browse the repository at this point in the history
- Uses the new `TRUSTED_HOSTS` config.
- Replaces JWT imports from itsdangerous to invenio_base.
  • Loading branch information
slint committed Jan 23, 2025
1 parent 8eaa749 commit eae99cc
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
26 changes: 12 additions & 14 deletions invenio.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,20 @@ from zenodo_rdm.github.schemas import CitationMetadataSchema
from zenodo_rdm.legacy.resources import record_serializers
from zenodo_rdm.metrics.config import METRICS_CACHE_UPDATE_INTERVAL
from zenodo_rdm.moderation.errors import UserBlockedException
from zenodo_rdm.moderation.handlers import CommunityModerationHandler, RecordModerationHandler
from zenodo_rdm.moderation.handlers import (
CommunityModerationHandler,
RecordModerationHandler,
)
from zenodo_rdm.openaire.records.components import OpenAIREComponent
from zenodo_rdm.permissions import (
ZenodoCommunityPermissionPolicy,
ZenodoRDMRecordPermissionPolicy,
)
from zenodo_rdm.queryparser import word_communities, word_doi
from zenodo_rdm.subcommunities import (
ZenodoSubCommunityInvitationRequest,
ZenodoSubCommunityRequest,
ZenodoSubcommunityRequestSchema,
ZenodoSubCommunityInvitationRequest
)
from zenodo_rdm.tokens import RATSubjectSchema
from zenodo_rdm.views import frontpage_view_function
Expand All @@ -103,7 +106,7 @@ SECRET_KEY = "CHANGE_ME"
# provided, the allowed hosts variable is set to localhost. In production it
# should be set to the correct host and it is strongly recommended to only
# route correct hosts to the application.
APP_ALLOWED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1"]
TRUSTED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1"]

APP_RDM_ROUTES["index"] = ("/", frontpage_view_function)

Expand Down Expand Up @@ -1086,13 +1089,13 @@ JOBS_ADMINISTRATION_ENABLED = True
from invenio_app_rdm.config import APP_RDM_RECORD_EXPORTERS as default_exporters

APP_RDM_RECORD_EXPORTERS = {
**default_exporters,
**default_exporters,
"bibtex": {
"name": _("BibTeX"),
"serializer": ("zenodo_rdm.serializers:ZenodoBibtexSerializer"),
"params": {},
"content-type": "application/x-bibtex",
"filename": "{id}.bib"
"filename": "{id}.bib",
},
"codemeta": {
"name": _("Codemeta"),
Expand All @@ -1103,28 +1106,23 @@ APP_RDM_RECORD_EXPORTERS = {
},
"datacite-json": {
"name": _("DataCite JSON"),
"serializer": (
"zenodo_rdm.serializers:ZenodoDataciteJSONSerializer"
),
"serializer": ("zenodo_rdm.serializers:ZenodoDataciteJSONSerializer"),
"params": {"options": {"indent": 2, "sort_keys": True}},
"content-type": "application/vnd.datacite.datacite+json",
"filename": "{id}.json",
},
"datacite-xml": {
"name": _("DataCite XML"),
"serializer": (
"zenodo_rdm.serializers:ZenodoDataciteXMLSerializer"
),
"serializer": ("zenodo_rdm.serializers:ZenodoDataciteXMLSerializer"),
"params": {},
"content-type": "application/vnd.datacite.datacite+xml",
"filename": "{id}.xml",
},
"cff": {
"cff": {
"name": _("Citation File Format"),
"serializer": "zenodo_rdm.serializers:ZenodoCFFSerializer",
"params": {},
"content-type": "application/x-yaml",
"filename": "{id}.yaml",
},

}
}
8 changes: 6 additions & 2 deletions site/zenodo_rdm/legacy/tokens.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@
from functools import partial

from flask import current_app, flash, request, session
from invenio_base.jws import (
BadData,
JSONWebSignatureSerializer,
SignatureExpired,
TimedJSONWebSignatureSerializer,
)
from invenio_i18n import _
from itsdangerous import BadData, SignatureExpired
from itsdangerous.jws import JSONWebSignatureSerializer, TimedJSONWebSignatureSerializer

_Need = namedtuple("Need", ["method", "value"])
LegacySecretLinkNeed = partial(_Need, "legacy_secret_link")
Expand Down

0 comments on commit eae99cc

Please sign in to comment.