🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
fix: add users count
prafull-opensignlabsbf56348c625d
diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.jsindex f1c77eb1c..b849580a4 100644--- a/apps/OpenSign/src/components/AddUser.js+++ b/apps/OpenSign/src/components/AddUser.js@@ -336,16 +336,18 @@ const AddUser = (props) => {<div className="w-full mx-auto">{!isEnableSubscription || allowedUser > 0 ? (<form onSubmit={handleSubmit}>- <p className="flex justify-center mb-1">- {t("remaing-users")}{" "}- <span- className={`${- allowedUser < 2 ? "op-text-accent" : "op-text-primary"- } font-medium ml-1`}- >- {allowedUser} {t("of")} {planInfo.totalAllowedUser}- </span>- </p>+ {isEnableSubscription && (+ <p className="flex justify-center mb-1">+ {t("remaing-users")}{" "}+ <span+ className={`${+ allowedUser < 2 ? "op-text-accent" : "op-text-primary"+ } font-medium ml-1`}+ >+ {allowedUser} {t("of")} {planInfo.totalAllowedUser}+ </span>+ </p>+ )}<div className="mb-3"><labelhtmlFor="name"diff --git a/apps/OpenSign/src/constant/const.js b/apps/OpenSign/src/constant/const.jsindex 3796e3e46..ad5ae7b53 100644--- a/apps/OpenSign/src/constant/const.js+++ b/apps/OpenSign/src/constant/const.js@@ -4,11 +4,11 @@ export const documentCls = "contracts_Document";export const themeColor = "#47a3ad";export const iconColor = "#686968";export const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;-export const isEnableSubscription = false;-// process.env.REACT_APP_ENABLE_SUBSCRIPTION &&-// process.env.REACT_APP_ENABLE_SUBSCRIPTION?.toLowerCase() === "true"-// ? true-// : false;+export const isEnableSubscription =+ process.env.REACT_APP_ENABLE_SUBSCRIPTION &&+ process.env.REACT_APP_ENABLE_SUBSCRIPTION?.toLowerCase() === "true"+ ? true+ : false;export const isStaging = "http://localhost:3001";// window.location.origin === "https://staging-app.opensignlabs.com";export const isPublicStaging =diff --git a/apps/OpenSignServer/cloud/main.js b/apps/OpenSignServer/cloud/main.jsindex 490c491d3..fc4f61817 100644--- a/apps/OpenSignServer/cloud/main.js+++ b/apps/OpenSignServer/cloud/main.js@@ -66,6 +66,8 @@ import AllowedApis from './parsefunction/AllowedApis.js';import BuyApis from './parsefunction/BuyApis.js';import AllowedQuicksend from './parsefunction/AllowedQuicksend.js';import BuyQuickSend from './parsefunction/BuyQuicksend.js';+import ExtUserAftersave from './parsefunction/ExtUserAftersave.js';+import ExtUserAfterdelete from './parsefunction/ExtUserAfterdelete.js';// This afterSave function triggers after an object is added or updated in the specified class, allowing for post-processing logic.Parse.Cloud.afterSave('contracts_Document', DocumentAftersave);@@ -73,6 +75,8 @@ Parse.Cloud.afterSave('contracts_Contactbook', ContactbookAftersave);Parse.Cloud.afterSave('contracts_Template', TemplateAfterSave);Parse.Cloud.afterSave('contracts_Teams', TeamsAftersave);Parse.Cloud.afterSave('contracts_Subscriptions', SubscriptionAftersave);+Parse.Cloud.afterSave('contracts_Users', ExtUserAftersave);+// This beforeSave function triggers before an object is added or updated in the specified class, allowing for validation or modification.Parse.Cloud.beforeSave('contracts_Document', DocumentBeforesave);Parse.Cloud.beforeSave('contracts_Template', TemplateBeforeSave);@@ -84,6 +88,9 @@ Parse.Cloud.afterFind('contracts_Template', TemplateAfterFind);Parse.Cloud.afterFind('contracts_Signature', SignatureAfterFind);Parse.Cloud.afterFind('partners_Tenant', TenantAterFind);+// This afterDelete function triggers after an object get deleted.+Parse.Cloud.afterDelete('contracts_Users', ExtUserAfterdelete);+// This define function creates a custom Cloud Function that can be called from the client-side, enabling custom business logic on the server.Parse.Cloud.define('signPdf', PDF);Parse.Cloud.define('sendmailv3', sendmailv3);diff --git a/apps/OpenSignServer/cloud/parsefunction/AlllowedUsers.js b/apps/OpenSignServer/cloud/parsefunction/AlllowedUsers.jsindex 336bccabc..bcca9951b 100644--- a/apps/OpenSignServer/cloud/parsefunction/AlllowedUsers.js+++ b/apps/OpenSignServer/cloud/parsefunction/AlllowedUsers.js@@ -22,14 +22,7 @@ export default async function AllowedUsers(request) {const resSub = await subscription.first({ useMasterKey: true });if (resSub) {const _resSub = JSON.parse(JSON.stringify(resSub));- const userCls = new Parse.Query('contracts_Users');- userCls.equalTo('OrganizationId', {- __type: 'Pointer',- className: 'contracts_Organizations',- objectId: _resSub.ExtUserPtr.OrganizationId.objectId,- });- userCls.notEqualTo('IsDisabled', true);- const count = await userCls.count({ useMasterKey: true });+ const count = _resSub?.UsersCount || 0;if (count > 0) {const allowedUser = resSub.get('AllowedUsers') || 0;const remainUsers = allowedUser - count;diff --git a/apps/OpenSignServer/cloud/parsefunction/DocumentBeforesave.js b/apps/OpenSignServer/cloud/parsefunction/DocumentBeforesave.jsindex 3d9f85454..266148613 100644--- a/apps/OpenSignServer/cloud/parsefunction/DocumentBeforesave.js+++ b/apps/OpenSignServer/cloud/parsefunction/DocumentBeforesave.js@@ -5,7 +5,7 @@ async function DocumentBeforesave(request) {const oldDocument = request.original;// Check if SignedUrl field has been added (transition from undefined to defined)- if (!oldDocument?.get('SignedUrl') && document?.get('SignedUrl')) {+ if (oldDocument && !oldDocument?.get('SignedUrl') && document?.get('SignedUrl')) {// Update count in contracts_Users classconst query = new Parse.Query('contracts_Users');query.equalTo('objectId', oldDocument.get('ExtUserPtr').id);diff --git a/apps/OpenSignServer/cloud/parsefunction/ExtUserAfterdelete.js b/apps/OpenSignServer/cloud/parsefunction/ExtUserAfterdelete.jsnew file mode 100644index 000000000..3a7fc4bbd--- /dev/null+++ b/apps/OpenSignServer/cloud/parsefunction/ExtUserAfterdelete.js@@ -0,0 +1,31 @@+async function ExtUserAfterdelete(request) {+ try {+ const extUser = request.object;+ const tenantId = extUser.get('TenantId')?.id;+ const subscription = new Parse.Query('contracts_Subscriptions');+ subscription.equalTo('TenantId', {+ __type: 'Pointer',+ className: 'partners_Tenant',+ objectId: tenantId,+ });+ const resSub = await subscription.first({ useMasterKey: true });+ if (resSub) {+ const updateSub = new Parse.Object('contracts_Subscriptions');+ updateSub.id = resSub.id;+ if (resSub?.get('UsersCount') > 0) {+ updateSub.decrement('UsersCount', 1);+ } else {+ updateSub.decrement('UsersCount', 0);+ }+ updateSub.save(null, { useMasterKey: true });+ } else {+ const addSub = new Parse.Object('contracts_Subscriptions');+ addSub.set('UsersCount', 0);+ addSub.save(null, { useMasterKey: true });+ }+ } catch (err) {+ console.log('err in extuser afterdelete', err);+ }+}++export default ExtUserAfterdelete;diff --git a/apps/OpenSignServer/cloud/parsefunction/ExtUserAftersave.js b/apps/OpenSignServer/cloud/parsefunction/ExtUserAftersave.jsnew file mode 100644index 000000000..59a23b354--- /dev/null+++ b/apps/OpenSignServer/cloud/parsefunction/ExtUserAftersave.js@@ -0,0 +1,44 @@+async function ExtUserAftersave(request) {+ try {+ if (!request.original) {+ const extUser = request.object;+ const tenantId = extUser.get('TenantId')?.id;+ const subscription = new Parse.Query('contracts_Subscriptions');+ subscription.equalTo('TenantId', {+ __type: 'Pointer',+ className: 'partners_Tenant',+ objectId: tenantId,+ });+ const resSub = await subscription.first({ useMasterKey: true });+ if (resSub) {+ const updateSub = new Parse.Object('contracts_Subscriptions');+ updateSub.id = resSub.id;+ updateSub.increment('UsersCount', 1);+ updateSub.save(null, { useMasterKey: true });+ } else {+ const addSub = new Parse.Object('contracts_Subscriptions');+ addSub.set('UsersCount', 1);+ addSub.set('ExtUserPtr', {+ __type: 'Pointer',+ className: 'contracts_Users',+ objectId: extUser.id,+ });+ addSub.set('CreatedBy', {+ __type: 'Pointer',+ className: '_User',+ objectId: extUser.get('UserId').id,+ });+ addSub.set('TenantId', {+ __type: 'Pointer',+ className: 'partners_Tenant',+ objectId: extUser.get('TenantId').id,+ });+ addSub.save(null, { useMasterKey: true });+ }+ }+ } catch (err) {+ console.log('err in extuser aftersave', err);+ }+}++export default ExtUserAftersave;diff --git a/apps/OpenSignServer/cloud/parsefunction/SubscribeFree.js b/apps/OpenSignServer/cloud/parsefunction/SubscribeFree.jsindex 4b0e53956..11bab60f9 100644--- a/apps/OpenSignServer/cloud/parsefunction/SubscribeFree.js+++ b/apps/OpenSignServer/cloud/parsefunction/SubscribeFree.js@@ -29,6 +29,17 @@ export default async function SubscribeFree(request) {}} else if (subcripitions?.get('Next_billing_date') > new Date()) {return { status: 'success', result: 'already subscribed!' };+ } else if (!subcripitions?.get('PlanCode')) {+ try {+ const updateSubscription = new Parse.Object('contracts_Subscriptions');+ updateSubscription.id = subcripitions.id;+ updateSubscription.set('PlanCode', 'freeplan');+ await updateSubscription.save(null, { useMasterKey: true });+ return { status: 'success', result: 'subscribed!' };+ } catch (err) {+ console.log('err ', err);+ return { status: 'error', result: err.message };+ }} else {try {const createSubscription = new Parse.Object('contracts_Subscriptions');diff --git a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.jsindex a78c434d6..35e602cc3 100644--- a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js+++ b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js@@ -3,7 +3,7 @@ import { cloudServerUrl } from '../../Utils.js';const serverUrl = cloudServerUrl; //process.env.SERVER_URL;const appId = process.env.APP_ID;-async function deductcount(tenantId, docs) {+async function deductcount(tenantId, docs, extUserId) {try {const subscription = new Parse.Query('contracts_Subscriptions');subscription.equalTo('TenantId', {@@ -28,6 +28,11 @@ async function deductcount(tenantId, docs) {}const resSubcription = await subscriptionCls.save(null, { useMasterKey: true });}++ const extCls = new Parse.Object('contracts_Users');+ extCls.id = extUserId;+ extCls.increment('DocumentCount', docs);+ const resExt = await extCls.save(null, { useMasterKey: true });} catch (err) {console.log('Err in deduct in quick send', err);}@@ -143,7 +148,6 @@ export default async function createBatchDocs(request) {const resExt = await extCls.first({ useMasterKey: true });if (resExt) {const _resExt = JSON.parse(JSON.stringify(resExt));- console.log('here');try {const requests = Documents.map(x => {const Signers = x.Signers;@@ -216,7 +220,7 @@ export default async function createBatchDocs(request) {objectId: response.data[i]?.success?.objectId,createdAt: response.data[i]?.success?.createdAt,}));- deductcount(_resExt.TenantId.objectId, response.data.length);+ deductcount(_resExt.TenantId.objectId, response.data.length, resExt.id);for (let i = 0; i < updateDocuments.length; i++) {sendMail(updateDocuments[i], sessionToken);}