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

refactor: change variable from isDisableOTP to isEnableOTP

Browse Source
This commit is contained in:
prafull-opensignlabs
2024-09-18 14:32:45 +05:30
parent cc11848346
commit 4caf9f598a
28 changed files with 156 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js
+3 -2
View File
@@ -196,8 +196,9 @@ export default async function createDocumentWithTemplate(request, response) {
if (TimeToCompleteDays) {
object.set('TimeToCompleteDays', TimeToCompleteDays);
}
const isDisableOTP = template?.IsDisableOTP || request.body?.isDisableOTP || false;
object.set('IsDisableOTP', isDisableOTP);
const enableOTP = request.body?.enableOTP === true ? true : false;
const IsEnableOTP = template?.IsEnableOTP || enableOTP;
object.set('IsEnableOTP', IsEnableOTP);
object.set('CreatedBy', template.CreatedBy);
object.set('ExtUserPtr', {
__type: 'Pointer',
apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js
+2 -2
View File
@@ -63,7 +63,7 @@ export default async function createDocumentwithCoordinate(request, response) {
const email_body = request.body.email_body;
const sendInOrder = request.body.sendInOrder || false;
const TimeToCompleteDays = request.body.timeToCompleteDays || 15;
const isDisableOTP = request.body.isDisableOTP || false;
const IsEnableOTP = request.body?.enableOTP === true ? true : false;
// console.log('fileData ', fileData);
const protocol = customAPIurl();
const baseUrl = new URL(process.env.PUBLIC_URL);
@@ -163,7 +163,7 @@ export default async function createDocumentwithCoordinate(request, response) {
if (TimeToCompleteDays) {
object.set('TimeToCompleteDays', TimeToCompleteDays);
}
object.set('IsDisableOTP', isDisableOTP);
object.set('IsEnableOTP', IsEnableOTP);
object.set('IsSendMail', send_email);
let contact = [];
if (signers && signers.length > 0) {
apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js
+2
View File
@@ -9,6 +9,7 @@ export default async function createTemplate(request, response) {
const SendinOrder = request.body.sendInOrder || false;
const fileData = request.files?.[0] ? request.files[0].buffer : null;
const baseUrl = new URL(process.env.PUBLIC_URL);
const isEnableOTP = request.body?.enableOTP === true ? true : false;
try {
const reqToken = request.headers['x-api-token'];
@@ -65,6 +66,7 @@ export default async function createTemplate(request, response) {
object.set('URL', fileUrl);
object.set('CreatedBy', userPtr);
object.set('ExtUserPtr', extUserPtr);
object.set('IsEnableOTP', isEnableOTP);
if (SendinOrder) {
object.set('SendinOrder', SendinOrder);
}
apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js
+2 -2
View File
@@ -17,7 +17,7 @@ export default async function createTemplatewithCoordinate(request, response) {
const base64File = request.body.file;
const fileData = request.files?.[0] ? request.files[0].buffer : null;
const SendinOrder = request.body.sendInOrder || false;
const isDisableOTP = request.body.isDisableOTP || false;
const isEnableOTP = request.body?.enableOTP === true ? true : false;
// console.log('fileData ', fileData);
const protocol = customAPIurl();
@@ -82,7 +82,7 @@ export default async function createTemplatewithCoordinate(request, response) {
object.set('URL', fileUrl);
object.set('CreatedBy', userPtr);
object.set('ExtUserPtr', extUserPtr);
object.set('IsDisableOTP', isDisableOTP);
object.set('IsEnableOTP', isEnableOTP);
let contact = [];
if (signers && signers.length > 0) {
let parseSigners;
apps/OpenSignServer/cloud/customRoute/v1/routes/draftDocument.js
+3
View File
@@ -12,6 +12,8 @@ export default async function draftDocument(request, response) {
const send_email = request.body.send_email || true;
const fileData = request.files?.[0] ? request.files[0].buffer : null;
const SendinOrder = request.body.sendInOrder || false;
const isEnableOTP = request.body?.enableOTP === true ? true : false;
// console.log('fileData ', fileData);
const protocol = customAPIurl();
const baseUrl = new URL(process.env.PUBLIC_URL);
@@ -83,6 +85,7 @@ export default async function draftDocument(request, response) {
object.set('CreatedBy', userPtr);
object.set('ExtUserPtr', extUserPtr);
object.set('IsSendMail', send_email);
object.set('IsEnableOTP', isEnableOTP);
if (signers && signers.length > 0) {
let parseSigners;
if (base64File) {
apps/OpenSignServer/cloud/customRoute/v1/routes/getDocument.js
+1
View File
@@ -62,6 +62,7 @@ export default async function getDocument(request, response) {
document?.Signers?.map(y => ({ name: y?.Name, email: y?.Email, phone: y?.Phone })) ||
[],
sendInOrder: document?.SendinOrder || false,
enableOTP: document?.IsEnableOTP || false,
createdAt: document.createdAt,
updatedAt: document.updatedAt,
});
apps/OpenSignServer/cloud/customRoute/v1/routes/getDocumentList.js
+1
View File
@@ -100,6 +100,7 @@ export default async function getDocumentList(request, response) {
x?.Signers?.map(y => ({ name: y?.Name, email: y?.Email, phone: y?.Phone })) ||
[],
sendInOrder: x?.SendinOrder || false,
enableOTP: x?.IsEnableOTP || false,
createdAt: x.createdAt,
updatedAt: x.updatedAt,
}));
apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplate.js
+1
View File
@@ -61,6 +61,7 @@ export default async function getTemplate(request, response) {
),
})) || [],
sendInOrder: template?.SendinOrder || false,
enableOTP: template?.IsEnableOTP || false,
createdAt: template.createdAt,
updatedAt: template.updatedAt,
});
apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplateList.js
+1
View File
@@ -88,6 +88,7 @@ export default async function getTemplatetList(request, response) {
),
})) || [],
sendInOrder: template?.SendinOrder || false,
enableOTP: template?.IsEnableOTP || false,
createdAt: template.createdAt,
updatedAt: template.updatedAt,
}));
apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js
+4
View File
@@ -48,6 +48,10 @@ export default async function updateDocument(request, response) {
objectId: request?.body?.folderId,
});
}
if (request.body?.enableOTP) {
updateQuery.set('IsEnableOTP', request.body?.enableOTP);
}
const updatedRes = await updateQuery.save(null, { useMasterKey: true });
if (updatedRes) {
if (request.posthog) {
apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js
+3
View File
@@ -48,6 +48,9 @@ export default async function updateTemplate(request, response) {
objectId: request?.body?.folderId,
});
}
if (request.body?.enableOTP) {
updateQuery.set('IsEnableOTP', request.body?.enableOTP);
}
const updatedRes = await updateQuery.save(null, { useMasterKey: true });
if (updatedRes) {
if (request.posthog) {
apps/OpenSignServer/cloud/parsefunction/callWebhook.js
+3 -3
View File
@@ -10,9 +10,9 @@ export default async function callWebhook(request) {
try {
const docQuery = new Parse.Query('contracts_Document');
const docRes = await docQuery.get(docId, { useMasterKey: true });
const isDisableOTP = docRes?.get('IsDisableOTP') || false;
const isEnableOTP = docRes?.get('IsEnableOTP') || false;
let userId;
if (!isDisableOTP) {
if (!isEnableOTP) {
const userRes = await axios.get(serverUrl + '/users/me', {
headers: {
'X-Parse-Application-Id': appId,
@@ -21,7 +21,7 @@ export default async function callWebhook(request) {
});
userId = userRes.data && userRes.data.objectId;
}
if (isDisableOTP || userId) {
if (!isEnableOTP || userId) {
if (event === 'viewed' && contactId) {
if (docRes) {
const _docRes = docRes.toJSON();
apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js
+1 -1
View File
@@ -199,7 +199,7 @@ export default async function createBatchDocs(request) {
TimeToCompleteDays: x.TimeToCompleteDays || 15,
OriginIp: Ip,
DocSentAt: { __type: 'Date', iso: isoDate },
IsDisableOTP: x?.IsDisableOTP || false,
IsEnableOTP: x?.IsEnableOTP || false,
},
};
});
apps/OpenSignServer/cloud/parsefunction/getDocument.js
+2 -2
View File
@@ -19,8 +19,8 @@ export default async function getDocument(request) {
query.notEqualTo('IsArchive', true);
const res = await query.first({ useMasterKey: true });
if (res) {
const IsDisableOTP = res?.get('IsDisableOTP') || false;
if (IsDisableOTP) {
const IsEnableOTP = res?.get('IsEnableOTP') || false;
if (!IsEnableOTP) {
return res;
} else {
if (request?.headers?.['sessiontoken']) {
apps/OpenSignServer/cloud/parsefunction/getSignedUrl.js
+1 -1
View File
@@ -34,7 +34,7 @@ export async function getSignedUrl(request) {
try {
const query = new Parse.Query('contracts_Document');
query.equalTo('objectId', docId);
query.equalTo('IsDisableOTP', true);
query.notEqualTo('IsEnableOTP', true);
query.include('CreatedBy');
query.include('Signers');
query.include('AuditTrail.UserPtr');
apps/OpenSignServer/cloud/parsefunction/pdf/GenerateCertificate.js
+2 -2
View File
@@ -32,7 +32,7 @@ export default async function GenerateCertificate(docDetails) {
const OriginIp = docDetails?.OriginIp || '';
const company = docDetails?.ExtUserPtr?.Company || '';
const createdAt = docDetails?.DocSentAt?.iso || docDetails.createdAt;
const isDisableOTP = docDetails?.IsDisableOTP || false;
const IsEnableOTP = docDetails?.IsEnableOTP || false;
const auditTrail =
docDetails?.Signers?.length > 0
? docDetails.AuditTrail.map(x => {
@@ -349,7 +349,7 @@ export default async function GenerateCertificate(docDetails) {
font: timesRomanFont,
color: textValueColor,
});
if (!isDisableOTP) {
if (IsEnableOTP) {
page.drawText('Security level :', {
x: half + 55,
y: yPosition4 + 10,
apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js
+3 -3
View File
@@ -286,9 +286,9 @@ async function PDF(req) {
if (!resDoc) {
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Document not found.');
}
const IsDisableOTP = resDoc?.get('IsDisableOTP') || false;
// if `IsDisableOTP` is true then we don't have to check authentication
if (!IsDisableOTP) {
const IsEnableOTP = resDoc?.get('IsEnableOTP') || false;
// if `IsEnableOTP` is false then we don't have to check authentication
if (IsEnableOTP) {
if (!req?.user) {
throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
}