WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-17 21:25:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle server down error in add admin for self-hosting

Browse Source
This commit is contained in:
prafull-opensignlabs
2024-10-09 13:50:20 +05:30
parent d8b2a80e90
commit 1e869d2d2b
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/pages/AddAdmin.js
+3 -1
View File
@@ -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) {
apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js
+1 -1
View File
@@ -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);
apps/OpenSignServer/cloud/parsefunction/TemplateAfterFind.js
+24 -26
View File
@@ -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];
}
}
}