Skip to content

Commit 1e869d2

Browse files
fix: handle server down error in add admin for self-hosting
1 parent d8b2a80 commit 1e869d2

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

apps/OpenSign/src/pages/AddAdmin.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ const AddAdmin = () => {
4545
setState((prev) => ({ ...prev, loading: true }));
4646
try {
4747
const app = await getAppLogo();
48-
if (app?.user === "exist") {
48+
if (app?.error === "invalid_json") {
49+
setErrMsg(t("server-down"));
50+
} else if (app?.user === "exist") {
4951
setErrMsg(t("admin-exists"));
5052
}
5153
} catch (err) {

apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ export default async function createDocumentWithTemplate(request, response) {
214214
object.set('Folder', folderPtr);
215215
}
216216
if (template?.FileAdapterId) {
217-
object.set('FileAdapterId');
217+
object.set('FileAdapterId', template?.FileAdapterId);
218218
}
219219
const newACL = new Parse.ACL();
220220
newACL.setPublicReadAccess(false);

apps/OpenSignServer/cloud/parsefunction/TemplateAfterFind.js

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,32 @@ import { useLocal } from '../../Utils.js';
22
import getPresignedUrl from './getSignedUrl.js';
33

44
async function TemplateAfterFind(request) {
5-
if (useLocal !== 'true') {
6-
if (request.objects.length === 1) {
7-
if (request.objects) {
8-
const obj = request.objects[0];
9-
const FileAdapterId = obj?.get('FileAdapterId') || '';
10-
if (FileAdapterId || useLocal !== 'true') {
11-
const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');
12-
const Url = obj?.get('URL') && obj?.get('URL');
13-
const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');
14-
let fileAdapter = {};
15-
if (FileAdapterId) {
16-
const tenantId = obj?.get('ExtUserPtr')?.get('TenantId');
17-
if (tenantId) {
18-
const _tenantId = JSON.parse(JSON.stringify(obj?.get('ExtUserPtr')?.get('TenantId')));
19-
fileAdapter = _tenantId?.FileAdapters?.find(x => x.id === FileAdapterId) || {};
20-
}
5+
if (request.objects.length === 1) {
6+
if (request.objects) {
7+
const obj = request.objects[0];
8+
const FileAdapterId = obj?.get('FileAdapterId') || '';
9+
if (FileAdapterId || useLocal !== 'true') {
10+
const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');
11+
const Url = obj?.get('URL') && obj?.get('URL');
12+
const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');
13+
let fileAdapter = {};
14+
if (FileAdapterId) {
15+
const tenantId = obj?.get('ExtUserPtr')?.get('TenantId');
16+
if (tenantId) {
17+
const _tenantId = JSON.parse(JSON.stringify(obj?.get('ExtUserPtr')?.get('TenantId')));
18+
fileAdapter = _tenantId?.FileAdapters?.find(x => x.id === FileAdapterId) || {};
2119
}
22-
if (SignedUrl) {
23-
obj.set('SignedUrl', getPresignedUrl(SignedUrl, fileAdapter));
24-
}
25-
if (Url) {
26-
obj.set('URL', getPresignedUrl(Url, fileAdapter));
27-
}
28-
if (certificateUrl) {
29-
obj.set('CertificateUrl', getPresignedUrl(certificateUrl, fileAdapter));
30-
}
31-
return [obj];
3220
}
21+
if (SignedUrl) {
22+
obj.set('SignedUrl', getPresignedUrl(SignedUrl, fileAdapter));
23+
}
24+
if (Url) {
25+
obj.set('URL', getPresignedUrl(Url, fileAdapter));
26+
}
27+
if (certificateUrl) {
28+
obj.set('CertificateUrl', getPresignedUrl(certificateUrl, fileAdapter));
29+
}
30+
return [obj];
3331
}
3432
}
3533
}

0 commit comments

Comments
 (0)