Skip to content

Commit

Permalink
Merge pull request #978 from OpenSignLabs/raktima-opensignlabs-patch-11
Browse files Browse the repository at this point in the history
fix: ip address missing issue in the completion certificate of document originator using public-sign flow
  • Loading branch information
prafull-opensignlabs authored Jul 26, 2024
2 parents 7335d7d + 72e9e48 commit 4941031
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 17 deletions.
33 changes: 18 additions & 15 deletions apps/OpenSign/src/pages/PdfRequestFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -1591,6 +1591,17 @@ function PdfRequestFiles(props) {
alert("Please Enter OTP!");
}
};
const handleCloseOtp = () => {
setIsPublicContact(false);
setLoading(false);
setIsOtp(false);
setOtp();
setContact({
name: "",
email: "",
phone: ""
});
};

return (
<DndProvider backend={HTML5Backend}>
Expand Down Expand Up @@ -1720,16 +1731,18 @@ function PdfRequestFiles(props) {

<ModalUi
isOpen={isPublicContact}
title={"Contact Details"}
title={isOtp ? "Verify email" : "Contact Details"}
handleClose={() => {
setIsPublicContact(false);
handleCloseOtp();
}}
>
<div className="h-full p-[20px]">
{isOtp ? (
<form onSubmit={VerifyOTP}>
<div className="flex flex-col gap-2">
<span>You will get a OTP via Email</span>
<span>
You will get a verification code via email
</span>
<label className="op-input op-input-bordered flex items-center gap-2 ">
<input
type="number"
Expand All @@ -1748,16 +1761,7 @@ function PdfRequestFiles(props) {
<button
className="op-btn op-btn-ghost"
onClick={() => {
// document.getElementById("my_modal").close();
setIsPublicContact(false);
setLoading(false);
setIsOtp(false);
setOtp();
setContact({
name: "",
email: "",
phone: ""
});
handleCloseOtp();
}}
>
Cancel
Expand Down Expand Up @@ -1841,8 +1845,7 @@ function PdfRequestFiles(props) {
<button
className="op-btn op-btn-ghost"
onClick={() => {
// document.getElementById("my_modal").close();
setIsPublicContact(false);
handleCloseOtp();
}}
>
Close
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ async function DocumentAftersave(request) {
console.log('new entry is insert in contracts_Document');
const createdAt = request.object.get('createdAt');
const Folder = request.object.get('Type');
const ip = request?.headers?.['x-real-ip'] || '';
const ip = request?.headers?.['x-real-ip'] || request.object?.get('OriginIp') || '';
if (createdAt && Folder === undefined) {
// console.log("IN If condition")
const TimeToCompleteDays = request.object.get('TimeToCompleteDays') || 15;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const createDocumentFromTemplate = async (template, existContact, index) => {
object.set('URL', template?.URL);
object.set('CreatedBy', template?.CreatedBy);
object.set('ExtUserPtr', template?.ExtUserPtr);
object.set('OriginIp', template?.OriginIp || '');
let signers = template?.Signers || [];
const signerobj = {
__type: 'Pointer',
Expand Down
4 changes: 3 additions & 1 deletion apps/OpenSignServer/cloud/parsefunction/TemplateAfterSave.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ export default async function TemplateAfterSave(request) {
// update acl of New Document If There are signers present in array
const signers = request.object.get('Signers');
const AutoReminder = request?.object?.get('AutomaticReminders') || false;
const ip = request?.headers?.['x-real-ip'] || '';
if (AutoReminder) {
const RemindOnceInEvery = request?.object?.get('RemindOnceInEvery') || 5;
const ReminderDate = new Date(request?.object?.get('createdAt'));
ReminderDate.setDate(ReminderDate.getDate() + RemindOnceInEvery);
request.object.set('NextReminderDate', ReminderDate);
await request.object.save(null, { useMasterKey: true });
}
request.object.set('OriginIp', ip);
await request.object.save(null, { useMasterKey: true });
if (signers && signers.length > 0) {
await updateAclDoc(request.object.id);
} else {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
*
* @param {Parse} Parse
*/
exports.up = async (Parse) => {
// TODO: set className here
const className = 'contracts_Template';
const schema = new Parse.Schema(className);
schema.addString('OriginIp');

// TODO: Set the schema here
// Example:
// schema.addString('name').addNumber('cash');

return schema.update();
};

/**
*
* @param {Parse} Parse
*/
exports.down = async (Parse) => {
// TODO: set className here
const className = 'contracts_Template';
const schema = new Parse.Schema(className);
schema.deleteField('OriginIp');
// TODO: Set the schema here
// Example:
// schema.deleteField('name').deleteField('cash');

return schema.update();
};

0 comments on commit 4941031

Please sign in to comment.