From 12300402603bcf882177070be93733dac82cdae9 Mon Sep 17 00:00:00 2001 From: Paurikova2 Date: Wed, 7 Aug 2024 15:58:13 +0200 Subject: [PATCH 1/2] removed IP metadatakey from request --- .../clarin-license-agreement-page.component.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts b/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts index 877073afcff..d5e01a8cb7f 100644 --- a/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts +++ b/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts @@ -165,15 +165,17 @@ export class ClarinLicenseAgreementPageComponent implements OnInit { CLARIN_USER_METADATA_MANAGE; url += this.isDownloadingZIP() ? '/zip?itemUUID=' + this.item$.value.uuid : '?bitstreamUUID=' + this.getBitstreamUUID(); - const postRequest = new PostRequest(requestId, url, this.userMetadata$.value?.page, requestOptions); - + if (this.userMetadata$.value?.page) { + // Filter the page array to exclude items with metadataKey "IP" + this.userMetadata$.value.page = this.userMetadata$.value.page.filter(item => item.metadataKey !== "IP"); + } // Add IP address into request. Every restricted download must have stored IP address in the `user_metadata` table. this.userMetadata$.value?.page.push(Object.assign(new ClarinUserMetadata(), { type: ClarinUserMetadata.type, metadataKey: 'IP', metadataValue: this.ipAddress$.value })); - + const postRequest = new PostRequest(requestId, url, this.userMetadata$.value?.page, requestOptions); // Send POST request this.requestService.send(postRequest); // Get response From 87c42a3ad6eaa6ecaa02184a8804c207ceaaaddc Mon Sep 17 00:00:00 2001 From: Paurikova2 Date: Mon, 12 Aug 2024 09:11:00 +0200 Subject: [PATCH 2/2] singlequote checkstyle --- .../clarin-license-agreement-page.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts b/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts index d5e01a8cb7f..a8e6183cd8f 100644 --- a/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts +++ b/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts @@ -167,7 +167,8 @@ export class ClarinLicenseAgreementPageComponent implements OnInit { this.getBitstreamUUID(); if (this.userMetadata$.value?.page) { // Filter the page array to exclude items with metadataKey "IP" - this.userMetadata$.value.page = this.userMetadata$.value.page.filter(item => item.metadataKey !== "IP"); + this.userMetadata$.value.page = + this.userMetadata$.value.page.filter(item => item.metadataKey !== 'IP'); } // Add IP address into request. Every restricted download must have stored IP address in the `user_metadata` table. this.userMetadata$.value?.page.push(Object.assign(new ClarinUserMetadata(), {