Skip to content

Commit 55cfbae

Browse files
feat: api for createtemplate using base64 and binary
1 parent 07851cc commit 55cfbae

File tree

7 files changed

+62
-67
lines changed

7 files changed

+62
-67
lines changed

apps/OpenSign/src/routes/GenerateToken.js

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function GenerateToken() {
9090
const handleModal = () => setIsModal(!isModal);
9191
return (
9292
<React.Fragment>
93-
<Title title={"token"} />
93+
<Title title={"API Token"} />
9494
{isGenerate && (
9595
<Alert type="success">Token generated successfully!</Alert>
9696
)}
@@ -115,9 +115,10 @@ function GenerateToken() {
115115
</div>
116116
) : (
117117
<div className="bg-white flex flex-col justify-center shadow rounded">
118-
<ul className="w-full flex flex-col p-2 text-sm">
118+
<h1 className="ml-4 mt-3 mb-2 font-semibold">API Token</h1>
119+
<ul className="w-full flex flex-col p-2 text-sm">
119120
<li
120-
className={`flex justify-between items-center border-t-[1px] border-gray-300 break-all py-2`}
121+
className={`flex justify-between items-center border-y-[1px] border-gray-300 break-all py-2`}
121122
>
122123
<span className="w-[40%]">Api Token:</span>{" "}
123124
<span
@@ -128,17 +129,6 @@ function GenerateToken() {
128129
{apiToken && apiToken}
129130
</span>
130131
</li>
131-
<li
132-
className={`flex justify-between items-center border-y-[1px] border-gray-300 break-all py-2`}
133-
>
134-
<span className="w-[40%]">Application Id:</span>{" "}
135-
<span
136-
className="w-[60%] md:text-end cursor-pointer"
137-
onClick={() => copytoclipboard(localStorage.getItem("AppID12"))}
138-
>
139-
{localStorage.getItem("AppID12")}
140-
</span>
141-
</li>
142132
</ul>
143133
<div className="flex flex-col md:flex-row items-center justify-center gap-2 pb-4">
144134
<button

apps/OpenSign/src/routes/Webhook.js

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ function Webhook() {
1212
const [parseAppId] = useState(localStorage.getItem("parseAppId"));
1313
const [webhook, setWebhook] = useState();
1414
const [isLoader, setIsLoader] = useState(true);
15-
const [copied, setCopied] = useState(false);
1615
const [isGenerate, setIsGenerate] = useState(false);
1716
const [isErr, setIsErr] = useState(false);
1817
const [isModal, setIsModal] = useState(false);
@@ -77,19 +76,11 @@ function Webhook() {
7776
}
7877
};
7978

80-
const copytoclipboard = (text) => {
81-
navigator.clipboard.writeText(text);
82-
setCopied(true);
83-
setTimeout(() => {
84-
setCopied(false);
85-
}, 1500); // Reset copied state after 1.5 seconds
86-
};
8779
const handleModal = () => setIsModal(!isModal);
8880
return (
8981
<React.Fragment>
9082
<Title title={"Webhook"} />
9183
{isGenerate && <Alert type="success">Webhook added successfully!</Alert>}
92-
{copied && <Alert type="success">Copied</Alert>}
9384
{isErr && <Alert type="danger">Something went wrong!</Alert>}
9485
{isLoader ? (
9586
<div
@@ -110,26 +101,16 @@ function Webhook() {
110101
</div>
111102
) : (
112103
<div className="bg-white flex flex-col justify-center shadow rounded">
104+
<h1 className="ml-4 mt-3 mb-2 font-semibold">Webhook</h1>
113105
<ul className="w-full flex flex-col p-2 text-sm">
114106
<li
115-
className={`flex justify-between items-center border-t-[1px] border-gray-300 break-all py-2`}
107+
className={`flex justify-between items-center border-y-[1px] border-gray-300 break-all py-2`}
116108
>
117109
<span className="w-[40%]">Webhook:</span>{" "}
118110
<span id="token" className="w-[60%] md:text-end cursor-pointer">
119111
{webhook && webhook}
120112
</span>
121113
</li>
122-
<li
123-
className={`flex justify-between items-center border-y-[1px] border-gray-300 break-all py-2`}
124-
>
125-
<span className="w-[40%]">Application Id:</span>{" "}
126-
<span
127-
className="w-[60%] md:text-end cursor-pointer"
128-
onClick={() => copytoclipboard(localStorage.getItem("AppID12"))}
129-
>
130-
{localStorage.getItem("AppID12")}
131-
</span>
132-
</li>
133114
</ul>
134115
<div className="flex flex-col md:flex-row items-center justify-center gap-2 pb-4">
135116
<button

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export default async function createContact(request, response) {
131131
} catch (err) {
132132
console.log('err ', err);
133133
if (err.code === 137) {
134-
return response.status(137).json({ error: 'Contact already exists!' });
134+
return response.status(401).json({ error: 'Contact already exists!' });
135135
} else {
136136
return response
137137
.status(400)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ export default async function createDocument(request, response) {
77
const description = request.body.Description;
88
const signers = request.body.Signers;
99
const folderId = request.body.FolderId;
10-
const base64File = request.body.file;
10+
const base64File = request.body.File;
1111
const url = request?.get('host');
1212
const fileData = request.files?.[0] ? request.files[0].buffer : null;
13-
console.log('fileData ', fileData);
13+
// console.log('fileData ', fileData);
1414
try {
1515
const reqToken = request.headers['x-api-token'];
1616
if (!reqToken) {
@@ -76,7 +76,7 @@ export default async function createDocument(request, response) {
7676
contactbook.notEqualTo('IsDeleted', true);
7777
contactbook.containedIn('Email', parseSigners);
7878
const contactbookRes = await contactbook.find({ useMasterKey: true });
79-
console.log('contactbookRes ', contactbookRes);
79+
// console.log('contactbookRes ', contactbookRes);
8080
const parseContactbookRes = JSON.parse(JSON.stringify(contactbookRes));
8181
// console.log('userPtr ', userPtr);
8282
// const newContacts = parseSigners

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

Lines changed: 51 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
const randomId = () => Math.floor(1000 + Math.random() * 9000);
22
export default async function createTemplate(request, response) {
3-
const name = request.body.Title;
4-
const note = request.body.Note;
5-
const description = request.body.Description;
6-
const signers = request.body.Signers;
7-
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;
3+
const name = request.body?.Title;
4+
const note = request.body?.Note;
5+
const description = request.body?.Description;
6+
const signers = request.body?.Signers;
7+
const folderId = request.body?.FolderId;
8+
const url = request?.get('host');
9+
const base64File = request.body.File;
10+
const fileData = request.files?.[0] ? request.files[0].buffer : null;
1111
try {
1212
const reqToken = request.headers['x-api-token'];
1313
if (!reqToken) {
@@ -19,13 +19,23 @@ export default async function createTemplate(request, response) {
1919
if (token !== undefined) {
2020
// Valid Token then proceed request
2121
const userPtr = token.get('userId');
22-
const file = new Parse.File(request.files?.[0]?.originalname, {
23-
base64: fileData.toString('base64'),
24-
});
25-
await file.save({ useMasterKey: true });
26-
const fileUrl = file.url();
22+
let fileUrl;
23+
if (base64File) {
24+
const file = new Parse.File(`${name}.pdf`, {
25+
base64: base64File,
26+
});
27+
await file.save({ useMasterKey: true });
28+
fileUrl = file.url();
29+
} else {
30+
const file = new Parse.File(request.files?.[0]?.originalname, {
31+
base64: fileData?.toString('base64'),
32+
});
33+
await file.save({ useMasterKey: true });
34+
fileUrl = file.url();
35+
}
36+
2737
const contractsUser = new Parse.Query('contracts_Users');
28-
contractsUser.equalTo('UserId', userId);
38+
contractsUser.equalTo('UserId', userPtr);
2939
const extUser = await contractsUser.first({ useMasterKey: true });
3040
const extUserPtr = { __type: 'Pointer', className: 'contracts_Users', objectId: extUser.id };
3141

@@ -43,17 +53,29 @@ export default async function createTemplate(request, response) {
4353
object.set('CreatedBy', userPtr);
4454
object.set('ExtUserPtr', extUserPtr);
4555
if (signers) {
46-
const parseSigners = JSON.parse(signers);
47-
const placeholders = parseSigners.map((x, i) => ({
48-
email: x,
49-
Id: randomId(),
50-
Role: 'User ' + (i + 1),
51-
blockColor: '',
52-
signerObjId: '',
53-
signerPtr: {},
54-
placeHolder: [],
55-
}));
56-
object.set('Placeholders', placeholders);
56+
let parseSigners;
57+
if (base64File) {
58+
parseSigners = signers;
59+
} else {
60+
parseSigners = JSON.parse(signers);
61+
}
62+
63+
const contactbook = new Parse.Query('contracts_Contactbook');
64+
contactbook.containedIn('Email', parseSigners);
65+
contactbook.equalTo('UserId', userPtr);
66+
contactbook.notEqualTo('IsDeleted', true);
67+
const contactbookRes = await contactbook.find({ useMasterKey: true });
68+
// console.log('contactbookRes ', contactbookRes);
69+
const parseContactbookRes = JSON.parse(JSON.stringify(contactbookRes));
70+
71+
object.set(
72+
'Signers',
73+
parseContactbookRes?.map(x => ({
74+
__type: 'Pointer',
75+
className: 'contracts_Contactbook',
76+
objectId: x.objectId,
77+
}))
78+
);
5779
}
5880
if (folderId) {
5981
object.set('Folder', folderPtr);
@@ -65,7 +87,10 @@ export default async function createTemplate(request, response) {
6587
newACL.setWriteAccess(userPtr.id, true);
6688
object.setACL(newACL);
6789
const res = await object.save(null, { useMasterKey: true });
68-
return response.json({ objectId: res.id, url: url });
90+
return response.json({
91+
objectId: res.id,
92+
url: 'https://' + url + '/load/signmicroapp/template/' + res.id,
93+
});
6994
} else {
7095
return response.status(405).json({ error: 'Invalid API Token!' });
7196
}

apps/OpenSignServer/cloud/parsefunction/TemplateAfterSave.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default async function TemplateAfterSave(request) {
1313
}
1414
}
1515
} else {
16-
if (request.user) {
16+
if (request?.user) {
1717
const signers = request.object.get('Signers');
1818
if (signers && signers.length > 0) {
1919
await updateAclDoc(request.object.id);

apps/OpenSignServer/cloud/parsefunction/pdf/PDF.min.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ async function sendDoctoWebhook(t) {
112112
.post(t?.data?.ExtUserPtr?.Webhook, e, { headers: { 'Content-Type': 'application/json' } })
113113
.then(e => {
114114
try {
115-
console.log('res ', e);
116115
var a = new Parse.Object('contracts_Webhook');
117116
a.set('Log', e?.status),
118117
a.set('UserId', {

0 commit comments

Comments
 (0)