Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -694,17 +694,20 @@ function WidgetsValueModal(props) {
}
}
if (isTab === "type") {
//trim user name or typed name value to show in initial signature
const trimmedName = typedSignature
? typedSignature?.trim()
: currentUserName?.trim();
//get full name of user
const fullUserName = typedSignature || currentUserName
const 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]);
Expand Down
1 change: 1 addition & 0 deletions apps/OpenSignServer/Utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/customRoute/docxtopdf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/customRoute/uploadFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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({
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/parsefunction/AddAdmin.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js
Original file line number Diff line number Diff line change
@@ -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 password
const 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;
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/parsefunction/ForwardDoc.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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,
},
});
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/parsefunction/GetTemplate.js
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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,
},
});
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/parsefunction/createBatchContact.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/parsefunction/getDocument.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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,
},
});
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/parsefunction/getDrive.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/parsefunction/getReport.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { cloudServerUrl } from '../../Utils.js';
import { cloudServerUrl, serverAppId } from '../../Utils.js';
import reportJson from './reportsJson.js';
import axios from 'axios';

Expand All @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
saveFileUsage,
getSecureUrl,
appName,
serverAppId,
} from '../../../Utils.js';
import GenerateCertificate from './GenerateCertificate.js';
import { pdflibAddPlaceholder } from '@signpdf/placeholder-pdf-lib';
Expand All @@ -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 = 'hello@opensignlabs.com';
Expand Down
4 changes: 2 additions & 2 deletions apps/OpenSignServer/cloud/parsefunction/usersignup.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions apps/OpenSignServer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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}`);
Expand Down