Skip to content

Commit 07851cc

Browse files
feat: add create document api with base64
1 parent 85a1c10 commit 07851cc

File tree

4 files changed

+178
-50
lines changed

4 files changed

+178
-50
lines changed

apps/OpenSign/src/App.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import LoadMf from "./routes/LoadMf";
1818
import GenerateToken from "./routes/GenerateToken";
1919
import ValidateRoute from "./primitives/ValidateRoute";
2020
import Webhook from "./routes/Webhook";
21+
import Validate from "./primitives/Validate";
2122

2223
function App() {
2324
const [isloading, setIsLoading] = useState(true);
@@ -65,6 +66,9 @@ function App() {
6566
<Route exact path="/" element={<Login />} />
6667
<Route exact path="/signup" element={<Signup />} />
6768
</Route>
69+
<Route element={<Validate />}>
70+
<Route exact path="/load/:remoteApp/*" element={<LoadMf />} />
71+
</Route>
6872
<Route exact path="/loadmf/:remoteApp/*" element={<LoadMf />} />
6973
<Route exact path="/forgetpassword" element={<ForgetPassword />} />
7074
{process.env.REACT_APP_ENABLE_SUBSCRIPTION && (
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import React, { useState, useEffect } from "react";
2+
import Parse from "parse";
3+
import { Outlet, useNavigate, useLocation } from "react-router-dom";
4+
import ModalUi from "./ModalUi";
5+
const Validate = () => {
6+
const navigate = useNavigate();
7+
const location = useLocation();
8+
const [isUserValid, setIsUserValid] = useState(true);
9+
useEffect(() => {
10+
(async () => {
11+
try {
12+
// Use the session token to validate the user
13+
const userQuery = new Parse.Query(Parse.User);
14+
const user = await userQuery.get(Parse.User.current().id, {
15+
sessionToken: localStorage.getItem("accesstoken")
16+
});
17+
if (user) {
18+
setIsUserValid(true);
19+
} else {
20+
setIsUserValid(false);
21+
}
22+
} catch (error) {
23+
// Session token is invalid or there was an error
24+
setIsUserValid(false);
25+
}
26+
})();
27+
}, []);
28+
const handleLoginBtn = () => {
29+
try {
30+
Parse.User.logOut();
31+
} catch (err) {
32+
console.log("err ", err);
33+
} finally {
34+
localStorage.removeItem("accesstoken");
35+
navigate("/", { replace: true, state: { from: location } });
36+
}
37+
};
38+
return isUserValid ? (
39+
<div>
40+
<Outlet />
41+
</div>
42+
) : (
43+
<ModalUi title={"Session Expired"} isOpen={true} showClose={false}>
44+
<div className="flex flex-col justify-center items-center py-4 md:py-5 gap-5">
45+
<p className="text-xl font-normal">Your session has expired.</p>
46+
<button
47+
onClick={handleLoginBtn}
48+
className="text-base px-3 py-1.5 rounded shadow-md text-white bg-[#1ab6ce]"
49+
>
50+
Login
51+
</button>
52+
</div>
53+
</ModalUi>
54+
);
55+
};
56+
57+
export default Validate;

apps/OpenSignServer/cloud/customRoute/v1/apiV1.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ app.delete('/contact/:contact_id', deleteContact);
4949
app.get('/contactlist', getContactList);
5050

5151
// create Document
52-
app.post('/createdocument', upload.array('file', 1), createDocument);
52+
app.post('/createdocumentwithbinary', upload.array('file', 1), createDocument);
53+
54+
// create Document with base64
55+
app.post('/createdocument', createDocument);
5356

5457
// create Document with templateId
5558
app.post('/createdocument/:template_id', createDocumentWithTemplate);

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

Lines changed: 113 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
const randomId = () => Math.floor(1000 + Math.random() * 9000);
1+
// import batchQuery from './batchquery.js';
2+
3+
// const randomId = () => Math.floor(1000 + Math.random() * 9000);
24
export default async function createDocument(request, response) {
35
const name = request.body.Title;
46
const note = request.body.Note;
57
const description = request.body.Description;
68
const signers = request.body.Signers;
79
const folderId = request.body.FolderId;
8-
// const file = request.body.file;
9-
const url = process.env.SERVER_URL;
10-
const fileData = request.files[0] ? request.files[0].buffer : null;
10+
const base64File = request.body.file;
11+
const url = request?.get('host');
12+
const fileData = request.files?.[0] ? request.files[0].buffer : null;
13+
console.log('fileData ', fileData);
1114
try {
1215
const reqToken = request.headers['x-api-token'];
1316
if (!reqToken) {
@@ -18,55 +21,116 @@ export default async function createDocument(request, response) {
1821
const token = await tokenQuery.first({ useMasterKey: true });
1922
if (token !== undefined) {
2023
// Valid Token then proceed request
21-
const userPtr = token.get('userId');
24+
if (signers) {
25+
const userPtr = token.get('userId');
26+
let fileUrl;
27+
if (request.files?.[0]) {
28+
const file = new Parse.File(request.files?.[0]?.originalname, {
29+
base64: fileData?.toString('base64'),
30+
});
31+
await file.save({ useMasterKey: true });
32+
fileUrl = file.url();
33+
} else {
34+
const file = new Parse.File(`${name}.pdf`, {
35+
base64: base64File,
36+
});
37+
await file.save({ useMasterKey: true });
38+
fileUrl = file.url();
39+
}
40+
const contractsUser = new Parse.Query('contracts_Users');
41+
contractsUser.equalTo('UserId', userPtr);
42+
const extUser = await contractsUser.first({ useMasterKey: true });
43+
const extUserPtr = {
44+
__type: 'Pointer',
45+
className: 'contracts_Users',
46+
objectId: extUser.id,
47+
};
2248

23-
const file = new Parse.File(request.files?.[0]?.originalname, {
24-
base64: fileData.toString('base64'),
25-
});
26-
await file.save({ useMasterKey: true });
27-
const fileUrl = file.url();
28-
const contractsUser = new Parse.Query('contracts_Users');
29-
contractsUser.equalTo('UserId', userPtr);
30-
const extUser = await contractsUser.first({ useMasterKey: true });
31-
const extUserPtr = { __type: 'Pointer', className: 'contracts_Users', objectId: extUser.id };
49+
const folderPtr = {
50+
__type: 'Pointer',
51+
className: 'contracts_Document',
52+
objectId: folderId,
53+
};
3254

33-
const folderPtr = { __type: 'Pointer', className: 'contracts_Document', objectId: folderId };
55+
const object = new Parse.Object('contracts_Document');
56+
object.set('Name', name);
57+
if (note) {
58+
object.set('Note', note);
59+
}
60+
if (description) {
61+
object.set('Description', description);
62+
}
63+
object.set('URL', fileUrl);
64+
object.set('CreatedBy', userPtr);
65+
object.set('ExtUserPtr', extUserPtr);
66+
if (signers) {
67+
let parseSigners;
68+
if (base64File) {
69+
parseSigners = signers;
70+
} else {
71+
parseSigners = JSON.parse(signers);
72+
}
3473

35-
const object = new Parse.Object('contracts_Document');
36-
object.set('Name', name);
37-
if (note) {
38-
object.set('Note', note);
39-
}
40-
if (description) {
41-
object.set('Description', description);
42-
}
43-
object.set('URL', fileUrl);
44-
object.set('CreatedBy', userPtr);
45-
object.set('ExtUserPtr', extUserPtr);
46-
if (signers) {
47-
const parseSigners = JSON.parse(signers);
48-
const placeholders = parseSigners.map(x => ({
49-
email: x,
50-
Id: randomId(),
51-
Role: '',
52-
blockColor: '',
53-
signerObjId: '',
54-
signerPtr: {},
55-
placeHolder: [],
56-
}));
57-
object.set('Placeholders', placeholders);
58-
}
59-
if (folderId) {
60-
object.set('Folder', folderPtr);
74+
const contactbook = new Parse.Query('contracts_Contactbook');
75+
contactbook.equalTo('UserId', userPtr);
76+
contactbook.notEqualTo('IsDeleted', true);
77+
contactbook.containedIn('Email', parseSigners);
78+
const contactbookRes = await contactbook.find({ useMasterKey: true });
79+
console.log('contactbookRes ', contactbookRes);
80+
const parseContactbookRes = JSON.parse(JSON.stringify(contactbookRes));
81+
// console.log('userPtr ', userPtr);
82+
// const newContacts = parseSigners
83+
// .filter(x => !parseContactbookRes.some(y => y.Email === x))
84+
// .map(email => ({
85+
// method: 'POST',
86+
// path: '/app/classes/contracts_Contactbook',
87+
// body: {
88+
// Email: email,
89+
// CreatedBy: { __type: 'Pointer', className: '_User', objectId: userPtr.id },
90+
// UserId: { __type: 'Pointer', className: '_User', objectId: userPtr.id },
91+
// Role: 'contracts_Guest',
92+
// IsDeleted: false,
93+
// ACL: {
94+
// [userPtr.id]: { read: true, write: true },
95+
// },
96+
// },
97+
// }));
98+
// console.log('newContacts', newContacts);
99+
let contactSigners = parseContactbookRes?.map(x => ({
100+
__type: 'Pointer',
101+
className: 'contracts_Contactbook',
102+
objectId: x.objectId,
103+
}));
104+
// if (newContacts.length > 0) {
105+
// const batchRes = await batchQuery(newContacts);
106+
// const contacts = batchRes?.map(x => ({
107+
// __type: 'Pointer',
108+
// className: 'contracts_Contactbook',
109+
// objectId: x.success.objectId,
110+
// }));
111+
// contactSigners = [...contactSigners, ...contacts];
112+
// }
113+
// console.log('contactsigners', contactSigners);
114+
115+
object.set('Signers', contactSigners);
116+
}
117+
if (folderId) {
118+
object.set('Folder', folderPtr);
119+
}
120+
const newACL = new Parse.ACL();
121+
newACL.setPublicReadAccess(false);
122+
newACL.setPublicWriteAccess(false);
123+
newACL.setReadAccess(userPtr.id, true);
124+
newACL.setWriteAccess(userPtr.id, true);
125+
object.setACL(newACL);
126+
const res = await object.save(null, { useMasterKey: true });
127+
return response.json({
128+
objectId: res.id,
129+
url: 'https://' + url + '/load/signmicroapp/placeholdersign/' + res.id,
130+
});
131+
} else {
132+
return response.status(400).json({ error: 'Please provide signers!' });
61133
}
62-
const newACL = new Parse.ACL();
63-
newACL.setPublicReadAccess(false);
64-
newACL.setPublicWriteAccess(false);
65-
newACL.setReadAccess(userPtr.id, true);
66-
newACL.setWriteAccess(userPtr.id, true);
67-
object.setACL(newACL);
68-
const res = await object.save(null, { useMasterKey: true });
69-
return response.json({ objectId: res.id, url: url });
70134
} else {
71135
return response.status(405).json({ error: 'Invalid API Token!' });
72136
}

0 commit comments

Comments
 (0)