From 8ce31d3d80bf623cbbdb783a77035754164317b2 Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Thu, 25 Jan 2024 19:16:09 +0530 Subject: [PATCH] fix: get host method in API --- .../v1/routes/CreateDocumentWithTemplate.js | 12 +++--------- .../cloud/customRoute/v1/routes/createDocument.js | 12 +++--------- .../cloud/customRoute/v1/routes/createTemplate.js | 12 +++--------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js index 6efa6f84d..0f5857aa1 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js @@ -3,15 +3,9 @@ export default async function createDocumentWithTemplate(request, response) { const signers = request.body.signers; const folderId = request.body.folderId; const templateId = request.params.template_id; - const url = request?.get('host'); - let protocol = 'https://' + url; - if (request.hostname === 'localhost') { - // console.log('Running in development environment'); - protocol = 'http://' + url; - } else { - // console.log('Running in production environment'); - protocol = 'https://' + url; - } + const url = new URL(process.env.SERVER_URL); + let protocol = url.origin; + try { const reqToken = request.headers['x-api-token']; if (!reqToken) { diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js index e4c7a4a7f..8b93a72d2 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js @@ -10,17 +10,11 @@ export default async function createDocument(request, response) { const signers = request.body.signers; const folderId = request.body.folderId; const base64File = request.body.file; - const url = request?.get('host'); const fileData = request.files?.[0] ? request.files[0].buffer : null; // console.log('fileData ', fileData); - let protocol = 'https://' + url; - if (request.hostname === 'localhost') { - // console.log('Running in development environment'); - protocol = 'http://' + url; - } else { - // console.log('Running in production environment'); - protocol = 'https://' + url; - } + const url = new URL(process.env.SERVER_URL); + let protocol = url.origin; + try { const reqToken = request.headers['x-api-token']; if (!reqToken) { diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js index 4879d7988..36014c48f 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js @@ -5,17 +5,11 @@ export default async function createTemplate(request, response) { const description = request.body?.description; const signers = request.body?.signers; const folderId = request.body?.folderId; - const url = request?.get('host'); const base64File = request.body.file; const fileData = request.files?.[0] ? request.files[0].buffer : null; - let protocol = 'https://' + url; - if (request.hostname === 'localhost') { - // console.log('Running in development environment'); - protocol = 'http://' + url; - } else { - // console.log('Running in production environment'); - protocol = 'https://' + url; - } + const url = new URL(process.env.SERVER_URL); + let protocol = url.origin; + try { const reqToken = request.headers['x-api-token']; if (!reqToken) {