Skip to content

Commit fd3921c

Browse files
anikachurilovakpsherva
authored andcommitted
http headers: use and adjust vnd.inveniordm.v1+json http accept header
* closes zenodo/rdm-project#598
1 parent 7c405fe commit fd3921c

File tree

4 files changed

+45
-4
lines changed

4 files changed

+45
-4
lines changed

invenio_rdm_records/assets/semantic-ui/js/invenio_rdm_records/src/deposit/api/DepositApiClient.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ export class DepositFileApiClient {
286286
withCredentials: true,
287287
xsrfCookieName: "csrftoken",
288288
xsrfHeaderName: "X-CSRFToken",
289-
headers: this.apiHeaders.json,
289+
headers: this.apiHeaders["vnd+json"],
290290
};
291291
this.axiosWithConfig = axios.create(apiConfig);
292292
}

invenio_rdm_records/assets/semantic-ui/js/invenio_rdm_records/src/deposit/fields/AffiliationsField/AffiliationsField.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class AffiliationsField extends Component {
3535
fieldPath={fieldPath}
3636
suggestionAPIUrl="/api/affiliations"
3737
suggestionAPIHeaders={{
38-
Accept: "application/json",
38+
Accept: "application/vnd.inveniordm.v1+json",
3939
}}
4040
initialSuggestions={getIn(values, fieldPath, [])}
4141
serializeSuggestions={this.serializeAffiliations}

invenio_rdm_records/oaiserver/resources/config.py

+7
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,10 @@ class OAIPMHServerResourceConfig(ResourceConfig, ConfiguratorMixin):
6868
request_search_args = OAIPMHServerSearchRequestArgsSchema
6969

7070
error_handlers = oaipmh_error_handlers
71+
72+
response_handlers = {
73+
"application/vnd.inveniordm.v1+json": ResourceConfig.response_handlers[
74+
"application/json"
75+
],
76+
**ResourceConfig.response_handlers,
77+
}

invenio_rdm_records/resources/config.py

+36-2
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,13 @@ class RDMDraftFilesResourceConfig(FileResourceConfig, ConfiguratorMixin):
288288
blueprint_name = "draft_files"
289289
url_prefix = "/records/<pid_value>/draft"
290290

291+
response_handlers = {
292+
"application/vnd.inveniordm.v1+json": FileResourceConfig.response_handlers[
293+
"application/json"
294+
],
295+
**FileResourceConfig.response_handlers,
296+
}
297+
291298

292299
class RDMRecordMediaFilesResourceConfig(FileResourceConfig, ConfiguratorMixin):
293300
"""Bibliographic record files resource config."""
@@ -319,6 +326,13 @@ class RDMRecordMediaFilesResourceConfig(FileResourceConfig, ConfiguratorMixin):
319326
),
320327
}
321328

329+
response_handlers = {
330+
"application/vnd.inveniordm.v1+json": FileResourceConfig.response_handlers[
331+
"application/json"
332+
],
333+
**FileResourceConfig.response_handlers,
334+
}
335+
322336

323337
#
324338
# Draft files
@@ -338,6 +352,13 @@ class RDMDraftMediaFilesResourceConfig(FileResourceConfig, ConfiguratorMixin):
338352
"list-archive": "/media-files-archive",
339353
}
340354

355+
response_handlers = {
356+
"application/vnd.inveniordm.v1+json": FileResourceConfig.response_handlers[
357+
"application/json"
358+
],
359+
**FileResourceConfig.response_handlers,
360+
}
361+
341362

342363
#
343364
# Parent Record Links
@@ -403,7 +424,10 @@ class RDMParentRecordLinksResourceConfig(RecordResourceConfig, ConfiguratorMixin
403424
}
404425

405426
response_handlers = {
406-
"application/json": ResponseHandler(JSONSerializer(), headers=etag_headers)
427+
"application/vnd.inveniordm.v1+json": RecordResourceConfig.response_handlers[
428+
"application/json"
429+
],
430+
**RecordResourceConfig.response_handlers,
407431
}
408432

409433
error_handlers = record_links_error_handlers
@@ -433,7 +457,10 @@ class RDMParentGrantsResourceConfig(RecordResourceConfig, ConfiguratorMixin):
433457
request_extra_args = {"expand": ma.fields.Bool()}
434458

435459
response_handlers = {
436-
"application/json": ResponseHandler(JSONSerializer(), headers=etag_headers)
460+
"application/vnd.inveniordm.v1+json": RecordResourceConfig.response_handlers[
461+
"application/json"
462+
],
463+
**RecordResourceConfig.response_handlers,
437464
}
438465

439466
error_handlers = grants_error_handlers
@@ -551,3 +578,10 @@ class RDMRecordRequestsResourceConfig(ResourceConfig, ConfiguratorMixin):
551578
request_extra_args = {
552579
"expand": ma.fields.Boolean(),
553580
}
581+
582+
response_handlers = {
583+
"application/vnd.inveniordm.v1+json": ResourceConfig.response_handlers[
584+
"application/json"
585+
],
586+
**ResourceConfig.response_handlers,
587+
}

0 commit comments

Comments
 (0)