🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
fix: handle server down error in add admin for self-hosting
prafull-opensignlabs1e869d2d2b60
diff --git a/apps/OpenSign/src/pages/AddAdmin.js b/apps/OpenSign/src/pages/AddAdmin.jsindex 049119f88..505e08814 100644--- a/apps/OpenSign/src/pages/AddAdmin.js+++ b/apps/OpenSign/src/pages/AddAdmin.js@@ -45,7 +45,9 @@ const AddAdmin = () => {setState((prev) => ({ ...prev, loading: true }));try {const app = await getAppLogo();- if (app?.user === "exist") {+ if (app?.error === "invalid_json") {+ setErrMsg(t("server-down"));+ } else if (app?.user === "exist") {setErrMsg(t("admin-exists"));}} catch (err) {diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.jsindex 421fe6fed..b963b35c5 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js@@ -214,7 +214,7 @@ export default async function createDocumentWithTemplate(request, response) {object.set('Folder', folderPtr);}if (template?.FileAdapterId) {- object.set('FileAdapterId');+ object.set('FileAdapterId', template?.FileAdapterId);}const newACL = new Parse.ACL();newACL.setPublicReadAccess(false);diff --git a/apps/OpenSignServer/cloud/parsefunction/TemplateAfterFind.js b/apps/OpenSignServer/cloud/parsefunction/TemplateAfterFind.jsindex 44d606a1f..c10a80e47 100644--- a/apps/OpenSignServer/cloud/parsefunction/TemplateAfterFind.js+++ b/apps/OpenSignServer/cloud/parsefunction/TemplateAfterFind.js@@ -2,34 +2,32 @@ import { useLocal } from '../../Utils.js';import getPresignedUrl from './getSignedUrl.js';async function TemplateAfterFind(request) {- if (useLocal !== 'true') {- if (request.objects.length === 1) {- if (request.objects) {- const obj = request.objects[0];- const FileAdapterId = obj?.get('FileAdapterId') || '';- if (FileAdapterId || useLocal !== 'true') {- const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');- const Url = obj?.get('URL') && obj?.get('URL');- const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');- let fileAdapter = {};- if (FileAdapterId) {- const tenantId = obj?.get('ExtUserPtr')?.get('TenantId');- if (tenantId) {- const _tenantId = JSON.parse(JSON.stringify(obj?.get('ExtUserPtr')?.get('TenantId')));- fileAdapter = _tenantId?.FileAdapters?.find(x => x.id === FileAdapterId) || {};- }+ if (request.objects.length === 1) {+ if (request.objects) {+ const obj = request.objects[0];+ const FileAdapterId = obj?.get('FileAdapterId') || '';+ if (FileAdapterId || useLocal !== 'true') {+ const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');+ const Url = obj?.get('URL') && obj?.get('URL');+ const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');+ let fileAdapter = {};+ if (FileAdapterId) {+ const tenantId = obj?.get('ExtUserPtr')?.get('TenantId');+ if (tenantId) {+ const _tenantId = JSON.parse(JSON.stringify(obj?.get('ExtUserPtr')?.get('TenantId')));+ fileAdapter = _tenantId?.FileAdapters?.find(x => x.id === FileAdapterId) || {};}- if (SignedUrl) {- obj.set('SignedUrl', getPresignedUrl(SignedUrl, fileAdapter));- }- if (Url) {- obj.set('URL', getPresignedUrl(Url, fileAdapter));- }- if (certificateUrl) {- obj.set('CertificateUrl', getPresignedUrl(certificateUrl, fileAdapter));- }- return [obj];}+ if (SignedUrl) {+ obj.set('SignedUrl', getPresignedUrl(SignedUrl, fileAdapter));+ }+ if (Url) {+ obj.set('URL', getPresignedUrl(Url, fileAdapter));+ }+ if (certificateUrl) {+ obj.set('CertificateUrl', getPresignedUrl(certificateUrl, fileAdapter));+ }+ return [obj];}}}