diff --git a/apps/OpenSign/src/primitives/ValidateRoute.js b/apps/OpenSign/src/primitives/ValidateRoute.js index 2beb48d8b..e7339f532 100644 --- a/apps/OpenSign/src/primitives/ValidateRoute.js +++ b/apps/OpenSign/src/primitives/ValidateRoute.js @@ -20,15 +20,21 @@ const ValidateRoute = () => { })(); }, []); const handlelogout = async () => { - try { - // if (Parse?.User?.current()) { - // Parse?.User?.logOut(); - // } - localStorage.removeItem("accesstoken"); - } catch (err) { - console.log("err ", err); - localStorage.removeItem("accesstoken"); - } + let appdata = localStorage.getItem("userSettings"); + let applogo = localStorage.getItem("appLogo"); + let defaultmenuid = localStorage.getItem("defaultmenuid"); + let PageLanding = localStorage.getItem("PageLanding"); + let baseUrl = localStorage.getItem("baseUrl"); + let appid = localStorage.getItem("parseAppId"); + + localStorage.clear(); + + localStorage.setItem("appLogo", applogo); + localStorage.setItem("defaultmenuid", defaultmenuid); + localStorage.setItem("PageLanding", PageLanding); + localStorage.setItem("userSettings", appdata); + localStorage.setItem("baseUrl", baseUrl); + localStorage.setItem("parseAppId", appid); }; return
{}
; }; diff --git a/apps/OpenSignServer/Utils.js b/apps/OpenSignServer/Utils.js index dcfa1b707..99a92dab2 100644 --- a/apps/OpenSignServer/Utils.js +++ b/apps/OpenSignServer/Utils.js @@ -4,8 +4,9 @@ dotenv.config(); const appId = process.env.APP_ID; const serverUrl = process.env.SERVER_URL; +export const cloudServerUrl = 'http://localhost:8080/app'; export function customAPIurl() { - const url = new URL(process.env.SERVER_URL); + const url = new URL(cloudServerUrl); return url.pathname === '/api/app' ? url.origin + '/api' : url.origin; } diff --git a/apps/OpenSignServer/cloud/customRoute/autoReminder.js b/apps/OpenSignServer/cloud/customRoute/autoReminder.js index 35cd75e04..05fc0cd25 100644 --- a/apps/OpenSignServer/cloud/customRoute/autoReminder.js +++ b/apps/OpenSignServer/cloud/customRoute/autoReminder.js @@ -1,4 +1,5 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; // `replaceMailVaribles` is used to replace variables from mail with there actual values function replaceMailVaribles(subject, body, variables) { @@ -26,7 +27,7 @@ function replaceMailVaribles(subject, body, variables) { async function sendMail(doc, signer) { const subject = `{{sender_name}} has requested you to sign "{{document_title}}"`; const body = `

Hi {{receiver_name}},


We hope this email finds you well. {{sender_name}} has requested you to review and sign "{{document_title}}".

Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.


{{signing_url}}


If you have any questions or need further clarification regarding the document or the signing process, please contact the sender.


Thanks

Team OpenSign™


`; - const url = `${process.env.SERVER_URL}/functions/sendmailv3`; + const url = `${cloudServerUrl}/functions/sendmailv3`; const headers = { 'Content-Type': 'application/json', 'X-Parse-Application-Id': process.env.APP_ID, diff --git a/apps/OpenSignServer/cloud/customRoute/googleauth.js b/apps/OpenSignServer/cloud/customRoute/googleauth.js index 08b453bd8..595bf8436 100644 --- a/apps/OpenSignServer/cloud/customRoute/googleauth.js +++ b/apps/OpenSignServer/cloud/customRoute/googleauth.js @@ -1,6 +1,7 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; const appId = process.env.APP_ID; -const serverUrl = process.env.SERVER_URL; +const serverUrl = cloudServerUrl; //process.env.SERVER_URL; export default async function gooogleauth(request, response) { const code = request.body.code; const baseUrl = new URL(process.env.SERVER_URL); diff --git a/apps/OpenSignServer/cloud/customRoute/uploadFile.js b/apps/OpenSignServer/cloud/customRoute/uploadFile.js index dd1e681a2..70dd1ed29 100644 --- a/apps/OpenSignServer/cloud/customRoute/uploadFile.js +++ b/apps/OpenSignServer/cloud/customRoute/uploadFile.js @@ -3,7 +3,7 @@ import multer from 'multer'; import multerS3 from 'multer-s3'; import aws from 'aws-sdk'; import dotenv from 'dotenv'; -import { useLocal } from '../../Utils.js'; +import { cloudServerUrl, useLocal } from '../../Utils.js'; dotenv.config(); function sanitizeFileName(fileName) { @@ -49,7 +49,7 @@ async function uploadFile(req, res) { const DO_SECRET_ACCESS_KEY = process.env.DO_SECRET_ACCESS_KEY; const DO_SPACE = process.env.DO_SPACE; - const parseBaseUrl = process.env.SERVER_URL; + const parseBaseUrl = cloudServerUrl; //process.env.SERVER_URL; const parseAppId = process.env.APP_ID; let fileStorage; if (useLocal === 'true') { diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js index 758ff7971..513213aa4 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import { customAPIurl, replaceMailVaribles } from '../../../../Utils.js'; +import { cloudServerUrl, customAPIurl, replaceMailVaribles } from '../../../../Utils.js'; // `sendDoctoWebhook` is used to send res data of document on webhook async function sendDoctoWebhook(doc, WebhookUrl, userId) { @@ -220,7 +220,7 @@ export default async function createDocumentWithTemplate(request, response) { for (let i = 0; i < contactMail.length; i++) { try { const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png'; - let url = `${process.env.SERVER_URL}/functions/sendmailv3/`; + let url = `${cloudServerUrl}/functions/sendmailv3/`; const headers = { 'Content-Type': 'application/json', 'X-Parse-Application-Id': process.env.APP_ID, diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js index f00161a2b..82f792059 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js @@ -6,6 +6,7 @@ import { saveFileUsage, formatWidgetOptions, sanitizeFileName, + cloudServerUrl, } from '../../../../Utils.js'; // `sendDoctoWebhook` is used to send res data of document on webhook @@ -281,7 +282,7 @@ export default async function createDocumentwithCoordinate(request, response) { for (let i = 0; i < contactMail.length; i++) { try { const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png'; - let url = `${process.env.SERVER_URL}/functions/sendmailv3/`; + let url = `${cloudServerUrl}/functions/sendmailv3/`; const headers = { 'Content-Type': 'application/json', 'X-Parse-Application-Id': process.env.APP_ID, diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/getDocumentList.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/getDocumentList.js index 1deae9605..6dcc119a2 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/getDocumentList.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/getDocumentList.js @@ -1,12 +1,13 @@ import axios from 'axios'; import reportJson from '../../../parsefunction/reportsJson.js'; import dotenv from 'dotenv'; +import { cloudServerUrl } from '../../../../Utils.js'; dotenv.config(); export default async function getDocumentList(request, response) { const reqToken = request.headers['x-api-token']; const appId = process.env.APP_ID; - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; if (!reqToken) { return response.status(400).json({ error: 'Please Provide API Token' }); } diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplateList.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplateList.js index fb1e1ae74..047db883d 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplateList.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplateList.js @@ -1,10 +1,11 @@ import axios from 'axios'; import dotenv from 'dotenv'; +import { cloudServerUrl } from '../../../../Utils.js'; dotenv.config(); export default async function getTemplatetList(request, response) { const reqToken = request.headers['x-api-token']; const appId = process.env.APP_ID; - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; if (!reqToken) { return response.status(400).json({ error: 'Please Provide API Token' }); } diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js index c1df00e8c..c525bb0eb 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import { replaceMailVaribles } from '../../../../Utils.js'; +import { cloudServerUrl, replaceMailVaribles } from '../../../../Utils.js'; export default async function resendMail(request, response) { try { @@ -44,7 +44,7 @@ export default async function resendMail(request, response) { if (contact) { try { const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png'; - let url = `${process.env.SERVER_URL}/functions/sendmailv3/`; + let url = `${cloudServerUrl}/functions/sendmailv3/`; const headers = { 'Content-Type': 'application/json', 'X-Parse-Application-Id': process.env.APP_ID, diff --git a/apps/OpenSignServer/cloud/parsefunction/AddAdmin.js b/apps/OpenSignServer/cloud/parsefunction/AddAdmin.js index 4231b5600..740a0cc07 100644 --- a/apps/OpenSignServer/cloud/parsefunction/AddAdmin.js +++ b/apps/OpenSignServer/cloud/parsefunction/AddAdmin.js @@ -1,5 +1,6 @@ import axios from 'axios'; -const serverUrl = process.env.SERVER_URL; +import { cloudServerUrl } from '../../Utils.js'; +const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const APPID = process.env.APP_ID; const masterKEY = process.env.MASTER_KEY; async function addTeamAndOrg(extUser) { diff --git a/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js b/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js index 5e5d04a53..2eeb63d54 100644 --- a/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js +++ b/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js @@ -1,8 +1,9 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; async function AuthLoginAsMail(request) { try { //function for login user using user objectId without touching user's password - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const APPID = process.env.APP_ID; const masterKEY = process.env.MASTER_KEY; diff --git a/apps/OpenSignServer/cloud/parsefunction/FacebookSign.js b/apps/OpenSignServer/cloud/parsefunction/FacebookSign.js index 8b7df821e..fbe520806 100644 --- a/apps/OpenSignServer/cloud/parsefunction/FacebookSign.js +++ b/apps/OpenSignServer/cloud/parsefunction/FacebookSign.js @@ -1,6 +1,7 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; -const serverUrl = process.env.SERVER_URL; +const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const APPID = process.env.APP_ID; const masterKEY = process.env.MASTER_KEY; diff --git a/apps/OpenSignServer/cloud/parsefunction/GetTemplate.js b/apps/OpenSignServer/cloud/parsefunction/GetTemplate.js index f10a91e4b..cbc739726 100644 --- a/apps/OpenSignServer/cloud/parsefunction/GetTemplate.js +++ b/apps/OpenSignServer/cloud/parsefunction/GetTemplate.js @@ -1,7 +1,8 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; export default async function GetTemplate(request) { - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const templateId = request.params.templateId; const ispublic = request.params.ispublic; diff --git a/apps/OpenSignServer/cloud/parsefunction/GoogleSign.js b/apps/OpenSignServer/cloud/parsefunction/GoogleSign.js index 57a961ce8..6be77239e 100644 --- a/apps/OpenSignServer/cloud/parsefunction/GoogleSign.js +++ b/apps/OpenSignServer/cloud/parsefunction/GoogleSign.js @@ -1,6 +1,7 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; -const serverUrl = process.env.SERVER_URL; +const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const APPID = process.env.APP_ID; const masterKEY = process.env.MASTER_KEY; diff --git a/apps/OpenSignServer/cloud/parsefunction/callWebhook.js b/apps/OpenSignServer/cloud/parsefunction/callWebhook.js index eab11e022..4074dd623 100644 --- a/apps/OpenSignServer/cloud/parsefunction/callWebhook.js +++ b/apps/OpenSignServer/cloud/parsefunction/callWebhook.js @@ -1,10 +1,11 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; export default async function callWebhook(request) { const event = request.params.event; const body = request.params.body; const docId = body.objectId; const contactId = request.params.contactId; - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const appId = process.env.APP_ID; const userRes = await axios.get(serverUrl + '/users/me', { headers: { diff --git a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js index d04ece47b..3cb789e19 100644 --- a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js +++ b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js @@ -1,6 +1,7 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; -const serverUrl = process.env.SERVER_URL; +const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const appId = process.env.APP_ID; async function sendMail(document, sessionToken) { diff --git a/apps/OpenSignServer/cloud/parsefunction/generateApiToken.js b/apps/OpenSignServer/cloud/parsefunction/generateApiToken.js index 8f39ccfdb..a7ac42524 100644 --- a/apps/OpenSignServer/cloud/parsefunction/generateApiToken.js +++ b/apps/OpenSignServer/cloud/parsefunction/generateApiToken.js @@ -1,7 +1,8 @@ import { generateApiKey } from 'generate-api-key'; import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; export default async function generateApiToken(request) { - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; try { const userRes = await axios.get(serverUrl + '/users/me', { headers: { diff --git a/apps/OpenSignServer/cloud/parsefunction/getDocument.js b/apps/OpenSignServer/cloud/parsefunction/getDocument.js index 4556d1271..c7b2d07d2 100644 --- a/apps/OpenSignServer/cloud/parsefunction/getDocument.js +++ b/apps/OpenSignServer/cloud/parsefunction/getDocument.js @@ -1,7 +1,8 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; export default async function getDocument(request) { - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const docId = request.params.docId; try { diff --git a/apps/OpenSignServer/cloud/parsefunction/getDrive.js b/apps/OpenSignServer/cloud/parsefunction/getDrive.js index 524b2f2b2..79bb5036d 100644 --- a/apps/OpenSignServer/cloud/parsefunction/getDrive.js +++ b/apps/OpenSignServer/cloud/parsefunction/getDrive.js @@ -1,6 +1,7 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; export default async function getDrive(request) { - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const appId = process.env.APP_ID; const limit = request.params.limit; const skip = request.params.skip; diff --git a/apps/OpenSignServer/cloud/parsefunction/getInvoices.js b/apps/OpenSignServer/cloud/parsefunction/getInvoices.js index e5c63c8e4..283abe66d 100644 --- a/apps/OpenSignServer/cloud/parsefunction/getInvoices.js +++ b/apps/OpenSignServer/cloud/parsefunction/getInvoices.js @@ -1,5 +1,6 @@ import axios from 'axios'; -const serverUrl = process.env.SERVER_URL; +import { cloudServerUrl } from '../../Utils.js'; +const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const appId = process.env.APP_ID; export default async function getInvoices(request) { const limit = request.params.limit || 100; diff --git a/apps/OpenSignServer/cloud/parsefunction/getPayments.js b/apps/OpenSignServer/cloud/parsefunction/getPayments.js index 1cad03dd1..2c52178b4 100644 --- a/apps/OpenSignServer/cloud/parsefunction/getPayments.js +++ b/apps/OpenSignServer/cloud/parsefunction/getPayments.js @@ -1,5 +1,6 @@ import axios from 'axios'; -const serverUrl = process.env.SERVER_URL; +import { cloudServerUrl } from '../../Utils.js'; +const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const appId = process.env.APP_ID; export default async function getPayments(request) { const limit = request.params.limit || 100; diff --git a/apps/OpenSignServer/cloud/parsefunction/getReport.js b/apps/OpenSignServer/cloud/parsefunction/getReport.js index 8f7aec1e4..12b352644 100644 --- a/apps/OpenSignServer/cloud/parsefunction/getReport.js +++ b/apps/OpenSignServer/cloud/parsefunction/getReport.js @@ -1,3 +1,4 @@ +import { cloudServerUrl } from '../../Utils.js'; import reportJson from './reportsJson.js'; import axios from 'axios'; @@ -6,7 +7,7 @@ export default async function getReport(request) { const limit = request.params.limit; const skip = request.params.skip; - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const appId = process.env.APP_ID; const masterKey = process.env.MASTER_KEY; try { diff --git a/apps/OpenSignServer/cloud/parsefunction/getSubscriptions.js b/apps/OpenSignServer/cloud/parsefunction/getSubscriptions.js index dd3d06f75..81124fa15 100644 --- a/apps/OpenSignServer/cloud/parsefunction/getSubscriptions.js +++ b/apps/OpenSignServer/cloud/parsefunction/getSubscriptions.js @@ -1,5 +1,6 @@ import axios from 'axios'; -const serverUrl = process.env.SERVER_URL; +import { cloudServerUrl } from '../../Utils.js'; +const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const appId = process.env.APP_ID; export default async function getSubscription(request) { const extUserId = request.params.extUserId || ''; diff --git a/apps/OpenSignServer/cloud/parsefunction/getapitoken.js b/apps/OpenSignServer/cloud/parsefunction/getapitoken.js index 192a1d0fd..ac78e8ab0 100644 --- a/apps/OpenSignServer/cloud/parsefunction/getapitoken.js +++ b/apps/OpenSignServer/cloud/parsefunction/getapitoken.js @@ -1,6 +1,7 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; export default async function getapitoken(request) { - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; try { const userRes = await axios.get(serverUrl + '/users/me', { headers: { diff --git a/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js b/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js index fc04b5efc..68ed4d06d 100644 --- a/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js +++ b/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js @@ -4,9 +4,9 @@ import { SignPdf } from '@signpdf/signpdf'; import { P12Signer } from '@signpdf/signer-p12'; import { pdflibAddPlaceholder } from '@signpdf/placeholder-pdf-lib'; import { PDFDocument } from 'pdf-lib'; -import { replaceMailVaribles, saveFileUsage } from '../../../Utils.js'; +import { cloudServerUrl, replaceMailVaribles, saveFileUsage } from '../../../Utils.js'; import GenerateCertificate from './GenerateCertificate.js'; -const serverUrl = process.env.SERVER_URL; +const serverUrl = cloudServerUrl; // process.env.SERVER_URL; const APPID = process.env.APP_ID; const masterKEY = process.env.MASTER_KEY; const eSignName = 'opensign'; diff --git a/apps/OpenSignServer/cloud/parsefunction/saveSubscription.js b/apps/OpenSignServer/cloud/parsefunction/saveSubscription.js index 2771e81c4..b2a9b439a 100644 --- a/apps/OpenSignServer/cloud/parsefunction/saveSubscription.js +++ b/apps/OpenSignServer/cloud/parsefunction/saveSubscription.js @@ -1,6 +1,7 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; export default async function saveSubscription(request) { - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const appId = process.env.APP_ID; const subscription = request.params.subscription; const SubscriptionId = subscription.data.subscription.subscription_id; diff --git a/apps/OpenSignServer/cloud/parsefunction/saveWebhook.js b/apps/OpenSignServer/cloud/parsefunction/saveWebhook.js index 1beff7c4b..30c99e3b0 100644 --- a/apps/OpenSignServer/cloud/parsefunction/saveWebhook.js +++ b/apps/OpenSignServer/cloud/parsefunction/saveWebhook.js @@ -1,6 +1,7 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; export default async function savewebhook(request) { - const serverUrl = process.env.SERVER_URL; + const serverUrl = cloudServerUrl; //process.env.SERVER_URL; try { const userRes = await axios.get(serverUrl + '/users/me', { headers: { diff --git a/apps/OpenSignServer/cloud/parsefunction/sendMailGmailProvider.js b/apps/OpenSignServer/cloud/parsefunction/sendMailGmailProvider.js index 35dc0fc0b..28babd02c 100644 --- a/apps/OpenSignServer/cloud/parsefunction/sendMailGmailProvider.js +++ b/apps/OpenSignServer/cloud/parsefunction/sendMailGmailProvider.js @@ -2,6 +2,7 @@ import axios from 'axios'; import { google } from 'googleapis'; import fs from 'node:fs'; import https from 'https'; +import http from 'http'; const clientId = process.env.GOOGLE_CLIENT_ID; const clientSecret = process.env.GOOGLE_CLIENT_SECRET; // Function to create a Gmail client @@ -34,10 +35,17 @@ const makeEmail = async (to, from, subject, html, url, pdfName) => { let Pdf = fs.createWriteStream('test.pdf'); const writeToLocalDisk = () => { return new Promise((resolve, reject) => { - https.get(url, async function (response) { - response.pipe(Pdf); - response.on('end', () => resolve('success')); - }); + if (useLocal !== 'true') { + https.get(url, async function (response) { + response.pipe(Pdf); + response.on('end', () => resolve('success')); + }); + } else { + http.get(url, async function (response) { + response.pipe(Pdf); + response.on('end', () => resolve('success')); + }); + } }); }; // `writeToLocalDisk` is used to create pdf file from doc url @@ -130,7 +138,7 @@ export default async function sendMailGmailProvider(_extRes, template) { raw: email, }, }); - // console.log('response ', response); + // console.log('response ', response); return { code: 200, message: 'Email sent successfully' }; } catch (error) { diff --git a/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js b/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js index e76f3533d..dca27ea65 100644 --- a/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js +++ b/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js @@ -1,8 +1,9 @@ import fs from 'node:fs'; import https from 'https'; +import http from 'http'; import formData from 'form-data'; import Mailgun from 'mailgun.js'; -import { smtpenable, smtpsecure, updateMailCount } from '../../Utils.js'; +import { smtpenable, smtpsecure, updateMailCount, useLocal } from '../../Utils.js'; import sendMailGmailProvider from './sendMailGmailProvider.js'; import { createTransport } from 'nodemailer'; async function sendMailProvider(req) { @@ -32,10 +33,17 @@ async function sendMailProvider(req) { let Pdf = fs.createWriteStream('test.pdf'); const writeToLocalDisk = () => { return new Promise((resolve, reject) => { - https.get(req.params.url, async function (response) { - response.pipe(Pdf); - response.on('end', () => resolve('success')); - }); + if (useLocal !== 'true') { + https.get(req.params.url, async function (response) { + response.pipe(Pdf); + response.on('end', () => resolve('success')); + }); + } else { + http.get(req.params.url, async function (response) { + response.pipe(Pdf); + response.on('end', () => resolve('success')); + }); + } }); }; // `writeToLocalDisk` is used to create pdf file from doc url diff --git a/apps/OpenSignServer/cloud/parsefunction/ssoSignin.js b/apps/OpenSignServer/cloud/parsefunction/ssoSignin.js index 61ec53173..acbed765e 100644 --- a/apps/OpenSignServer/cloud/parsefunction/ssoSignin.js +++ b/apps/OpenSignServer/cloud/parsefunction/ssoSignin.js @@ -1,6 +1,7 @@ import axios from 'axios'; +import { cloudServerUrl } from '../../Utils.js'; -const serverUrl = process.env.SERVER_URL; +const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const APPID = process.env.APP_ID; const masterKEY = process.env.MASTER_KEY; const clientUrl = process.env.PUBLIC_URL; diff --git a/apps/OpenSignServer/cloud/parsefunction/usersignup.js b/apps/OpenSignServer/cloud/parsefunction/usersignup.js index 4140f1c64..35057ba83 100644 --- a/apps/OpenSignServer/cloud/parsefunction/usersignup.js +++ b/apps/OpenSignServer/cloud/parsefunction/usersignup.js @@ -1,5 +1,6 @@ import axios from 'axios'; -const serverUrl = process.env.SERVER_URL; +import { cloudServerUrl } from '../../Utils.js'; +const serverUrl = cloudServerUrl; //process.env.SERVER_URL; const APPID = process.env.APP_ID; const masterKEY = process.env.MASTER_KEY;