🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
Merge pull request #917 from nxglabs/handle_appid
prafull-opensignlabs7930a8f439e8
diff --git a/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx b/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsxindex 89240dbe7..88e69f852 100644--- a/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx+++ b/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx@@ -694,17 +694,20 @@ function WidgetsValueModal(props) {}}if (isTab === "type") {+ //trim user name or typed name value to show in initial signatureconst trimmedName = typedSignature? typedSignature?.trim(): currentUserName?.trim();+ //get full name of user+ const fullUserName = typedSignature || currentUserNameconst firstCharacter = trimmedName?.charAt(0);const userName =currWidgetsDetails?.type === "initials"? firstCharacter- : typedSignature;+ : fullUserName;const signatureValue = currWidgetsDetails?.typeSignature;setTypedSignature(signatureValue || userName || "");- convertToImg(fontSelect, userName);+ convertToImg(fontSelect, signatureValue || userName || "");}// eslint-disable-next-line react-hooks/exhaustive-deps}, [isTab]);diff --git a/apps/OpenSignServer/Utils.js b/apps/OpenSignServer/Utils.jsindex b774f0656..0d2cd5102 100644--- a/apps/OpenSignServer/Utils.js+++ b/apps/OpenSignServer/Utils.js@@ -7,6 +7,7 @@ import axios from 'axios';dotenv.config();export const cloudServerUrl = 'http://localhost:8080/app';+export const serverAppId = process.env.APP_ID || 'opensign';export const appName = 'OpenSignâ„¢';export const MAX_NAME_LENGTH = 250;diff --git a/apps/OpenSignServer/cloud/customRoute/docxtopdf.js b/apps/OpenSignServer/cloud/customRoute/docxtopdf.jsindex 76f8f3567..0476d83d3 100644--- a/apps/OpenSignServer/cloud/customRoute/docxtopdf.js+++ b/apps/OpenSignServer/cloud/customRoute/docxtopdf.js@@ -3,7 +3,7 @@ import axios from 'axios';import multer from 'multer';import libre from 'libreoffice-convert';import util from 'node:util';-import { cloudServerUrl, getSecureUrl } from '../../Utils.js';+import { cloudServerUrl, getSecureUrl, serverAppId } from '../../Utils.js';libre.convertAsync = util.promisify(libre.convert);@@ -29,7 +29,7 @@ function generatePdfName(length) {export default async function docxtopdf(req, res) {const serverUrl = cloudServerUrl;- const appId = process.env.APP_ID;+ const appId = serverAppId;const masterKey = process.env.MASTER_KEY;const inputPath = req.file.path;const name = generatePdfName(16);diff --git a/apps/OpenSignServer/cloud/customRoute/uploadFile.js b/apps/OpenSignServer/cloud/customRoute/uploadFile.jsindex 73389319f..5eee3a4b6 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 { cloudServerUrl, useLocal } from '../../Utils.js';+import { cloudServerUrl, serverAppId, useLocal } from '../../Utils.js';dotenv.config();function sanitizeFileName(fileName) {@@ -50,7 +50,7 @@ async function uploadFile(req, res) {const DO_SPACE = process.env.DO_SPACE;const parseBaseUrl = cloudServerUrl; //process.env.SERVER_URL;- const parseAppId = process.env.APP_ID;+ const parseAppId = serverAppId;let fileStorage;if (useLocal === 'true') {fileStorage = multer.diskStorage({diff --git a/apps/OpenSignServer/cloud/parsefunction/AddAdmin.js b/apps/OpenSignServer/cloud/parsefunction/AddAdmin.jsindex a9e77dbdb..53dfa8256 100644--- a/apps/OpenSignServer/cloud/parsefunction/AddAdmin.js+++ b/apps/OpenSignServer/cloud/parsefunction/AddAdmin.js@@ -1,7 +1,7 @@import axios from 'axios';-import { cloudServerUrl } from '../../Utils.js';+import { cloudServerUrl, serverAppId } from '../../Utils.js';const serverUrl = cloudServerUrl; //process.env.SERVER_URL;-const APPID = process.env.APP_ID;+const APPID = serverAppId;const masterKEY = process.env.MASTER_KEY;async function addTeamAndOrg(extUser) {try {diff --git a/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js b/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.jsindex 2eeb63d54..a716b3d2f 100644--- a/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js+++ b/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js@@ -1,10 +1,10 @@import axios from 'axios';-import { cloudServerUrl } from '../../Utils.js';+import { cloudServerUrl, serverAppId } from '../../Utils.js';async function AuthLoginAsMail(request) {try {//function for login user using user objectId without touching user's passwordconst serverUrl = cloudServerUrl; //process.env.SERVER_URL;- const APPID = process.env.APP_ID;+ const APPID = serverAppId;const masterKEY = process.env.MASTER_KEY;let otpN = request.params.otp;diff --git a/apps/OpenSignServer/cloud/parsefunction/ForwardDoc.js b/apps/OpenSignServer/cloud/parsefunction/ForwardDoc.jsindex 226aeec0f..24d95a39f 100644--- a/apps/OpenSignServer/cloud/parsefunction/ForwardDoc.js+++ b/apps/OpenSignServer/cloud/parsefunction/ForwardDoc.js@@ -1,5 +1,5 @@import axios from 'axios';-import { appName, cloudServerUrl } from '../../Utils.js';+import { appName, cloudServerUrl, serverAppId } from '../../Utils.js';export default async function forwardDoc(request) {try {@@ -58,7 +58,7 @@ export default async function forwardDoc(request) {mailRes = await axios.post(`${cloudServerUrl}/functions/sendmailv3`, params, {headers: {'Content-Type': 'application/json',- 'X-Parse-Application-Id': process.env.APP_ID,+ 'X-Parse-Application-Id': serverAppId,'X-Parse-Master-Key': process.env.MASTER_KEY,},});diff --git a/apps/OpenSignServer/cloud/parsefunction/GetTemplate.js b/apps/OpenSignServer/cloud/parsefunction/GetTemplate.jsindex 1aefc2d66..83f67bdde 100644--- a/apps/OpenSignServer/cloud/parsefunction/GetTemplate.js+++ b/apps/OpenSignServer/cloud/parsefunction/GetTemplate.js@@ -1,5 +1,5 @@import axios from 'axios';-import { cloudServerUrl } from '../../Utils.js';+import { cloudServerUrl, serverAppId } from '../../Utils.js';export default async function GetTemplate(request) {const serverUrl = cloudServerUrl; //process.env.SERVER_URL;@@ -10,7 +10,7 @@ export default async function GetTemplate(request) {if (sessiontoken) {const userRes = await axios.get(serverUrl + '/users/me', {headers: {- 'X-Parse-Application-Id': process.env.APP_ID,+ 'X-Parse-Application-Id': serverAppId,'X-Parse-Session-Token': sessiontoken,},});diff --git a/apps/OpenSignServer/cloud/parsefunction/createBatchContact.js b/apps/OpenSignServer/cloud/parsefunction/createBatchContact.jsindex 51ce40a62..fa4e14536 100644--- a/apps/OpenSignServer/cloud/parsefunction/createBatchContact.js+++ b/apps/OpenSignServer/cloud/parsefunction/createBatchContact.js@@ -1,6 +1,6 @@import axios from 'axios';-import { cloudServerUrl } from '../../Utils.js';-const appId = process.env.APP_ID;+import { cloudServerUrl, serverAppId } from '../../Utils.js';+const appId = serverAppId;const masterkey = process.env.MASTER_KEY;export default async function createBatchContact(req) {if (!req?.user) {diff --git a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.jsindex 0ac40523f..90d469d55 100644--- a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js+++ b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js@@ -1,7 +1,7 @@import axios from 'axios';-import { cloudServerUrl, mailTemplate, replaceMailVaribles } from '../../Utils.js';+import { cloudServerUrl, mailTemplate, replaceMailVaribles, serverAppId } from '../../Utils.js';const serverUrl = cloudServerUrl; //process.env.SERVER_URL;-const appId = process.env.APP_ID;+const appId = serverAppId;async function deductcount(docsCount, extUserId) {try {const extCls = new Parse.Object('contracts_Users');diff --git a/apps/OpenSignServer/cloud/parsefunction/getDocument.js b/apps/OpenSignServer/cloud/parsefunction/getDocument.jsindex 0d71bdbdb..d64ffbecc 100644--- a/apps/OpenSignServer/cloud/parsefunction/getDocument.js+++ b/apps/OpenSignServer/cloud/parsefunction/getDocument.js@@ -1,5 +1,5 @@import axios from 'axios';-import { cloudServerUrl } from '../../Utils.js';+import { cloudServerUrl, serverAppId } from '../../Utils.js';export default async function getDocument(request) {const serverUrl = cloudServerUrl; //process.env.SERVER_URL;const docId = request.params.docId;@@ -30,7 +30,7 @@ export default async function getDocument(request) {try {const userRes = await axios.get(serverUrl + '/users/me', {headers: {- 'X-Parse-Application-Id': process.env.APP_ID,+ 'X-Parse-Application-Id': serverAppId,'X-Parse-Session-Token': sessiontoken,},});diff --git a/apps/OpenSignServer/cloud/parsefunction/getDrive.js b/apps/OpenSignServer/cloud/parsefunction/getDrive.jsindex 346a5f6bf..562f7c676 100644--- a/apps/OpenSignServer/cloud/parsefunction/getDrive.js+++ b/apps/OpenSignServer/cloud/parsefunction/getDrive.js@@ -1,8 +1,8 @@import axios from 'axios';-import { cloudServerUrl } from '../../Utils.js';+import { cloudServerUrl, serverAppId } from '../../Utils.js';export default async function getDrive(request) {const serverUrl = cloudServerUrl; //process.env.SERVER_URL;- const appId = process.env.APP_ID;+ const appId = serverAppId;const limit = request.params.limit;const skip = request.params.skip;const docId = request.params.docId;diff --git a/apps/OpenSignServer/cloud/parsefunction/getReport.js b/apps/OpenSignServer/cloud/parsefunction/getReport.jsindex 85eb6f662..f1ed47cc0 100644--- a/apps/OpenSignServer/cloud/parsefunction/getReport.js+++ b/apps/OpenSignServer/cloud/parsefunction/getReport.js@@ -1,4 +1,4 @@-import { cloudServerUrl } from '../../Utils.js';+import { cloudServerUrl, serverAppId } from '../../Utils.js';import reportJson from './reportsJson.js';import axios from 'axios';@@ -14,7 +14,7 @@ export default async function getReport(request) {const searchTerm = request.params.searchTerm || '';const serverUrl = cloudServerUrl; //process.env.SERVER_URL;- const appId = process.env.APP_ID;+ const appId = serverAppId;const masterKey = process.env.MASTER_KEY;const sessionToken = request.headers['sessiontoken'] || request.headers['x-parse-session-token'];try {diff --git a/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js b/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.jsindex 63bac492e..c8f5436ca 100644--- a/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js+++ b/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js@@ -7,6 +7,7 @@ import {saveFileUsage,getSecureUrl,appName,+ serverAppId,} from '../../../Utils.js';import GenerateCertificate from './GenerateCertificate.js';import { pdflibAddPlaceholder } from '@signpdf/placeholder-pdf-lib';@@ -15,7 +16,7 @@ import { SignPdf } from '@signpdf/signpdf';import { P12Signer } from '@signpdf/signer-p12';const serverUrl = cloudServerUrl; // process.env.SERVER_URL;-const APPID = process.env.APP_ID;+const APPID = serverAppId;const masterKEY = process.env.MASTER_KEY;const eSignName = 'OpenSign';const eSigncontact = '[email protected]';diff --git a/apps/OpenSignServer/cloud/parsefunction/usersignup.js b/apps/OpenSignServer/cloud/parsefunction/usersignup.jsindex 506051fa4..118f76ef3 100644--- a/apps/OpenSignServer/cloud/parsefunction/usersignup.js+++ b/apps/OpenSignServer/cloud/parsefunction/usersignup.js@@ -1,7 +1,7 @@import axios from 'axios';-import { cloudServerUrl } from '../../Utils.js';+import { cloudServerUrl, serverAppId } from '../../Utils.js';const serverUrl = cloudServerUrl; //process.env.SERVER_URL;-const APPID = process.env.APP_ID;+const APPID = serverAppId;const masterKEY = process.env.MASTER_KEY;async function saveUser(userDetails) {diff --git a/apps/OpenSignServer/index.js b/apps/OpenSignServer/index.jsindex 209d07d67..16fb02b2c 100644--- a/apps/OpenSignServer/index.js+++ b/apps/OpenSignServer/index.js@@ -15,7 +15,7 @@ import AWS from 'aws-sdk';import { app as customRoute } from './cloud/customRoute/customApp.js';import { exec } from 'child_process';import { createTransport } from 'nodemailer';-import { appName, cloudServerUrl, smtpenable, smtpsecure, useLocal } from './Utils.js';+import { appName, cloudServerUrl, serverAppId, smtpenable, smtpsecure, useLocal } from './Utils.js';import { SSOAuth } from './auth/authadapter.js';import createContactIndex from './migrationdb/createContactIndex.js';import { validateSignedLocalUrl } from './cloud/parsefunction/getSignedUrl.js';@@ -97,7 +97,7 @@ export const config = {cloud: function () {import('./cloud/main.js');},- appId: process.env.APP_ID || 'opensign',+ appId: serverAppId,logLevel: ['error'],maxLimit: 500,maxUploadSize: '30mb',@@ -234,8 +234,8 @@ if (!process.env.TESTING) {createContactIndex();const migrate = isWindows- ? `set APPLICATION_ID=${process.env.APP_ID}&& set SERVER_URL=${cloudServerUrl}&& set MASTER_KEY=${process.env.MASTER_KEY}&& npx parse-dbtool migrate`- : `APPLICATION_ID=${process.env.APP_ID} SERVER_URL=${cloudServerUrl} MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;+ ? `set APPLICATION_ID=${serverAppId}&& set SERVER_URL=${cloudServerUrl}&& set MASTER_KEY=${process.env.MASTER_KEY}&& npx parse-dbtool migrate`+ : `APPLICATION_ID=${serverAppId} SERVER_URL=${cloudServerUrl} MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;exec(migrate, (error, stdout, stderr) => {if (error) {console.error(`Error: ${error.message}`);