Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into docker_beta

apps/OpenSignServer/cloud/customRoute/saveSubscription.js

@@ -1,9 +1,9 @@
 export default async function saveSubscription(request, response) {
-  const SubscriptionId = request.body.data.subscription.subscription_id;
+  const SubscriptionId = request.body?.data?.subscription?.subscription_id;
   const body = request.body;
-  const Email = request.body.data.subscription.customer.email;
-  const Next_billing_date = request.body.data.subscription.next_billing_at;
-  const planCode = request.body.data.subscription.plan.plan_code
+  const Email = request.body.data?.subscription?.customer?.email;
+  const Next_billing_date = request.body?.data?.subscription?.next_billing_at;
+  const planCode = request.body?.data?.subscription?.plan?.plan_code;
 
   try {
     const extUserCls = new Parse.Query('contracts_Users');
@@ -22,7 +22,11 @@ export default async function saveSubscription(request, response) {
         updateSubscription.id = subscription.id;
         updateSubscription.set('SubscriptionId', SubscriptionId);
         updateSubscription.set('SubscriptionDetails', body);
-        updateSubscription.set('Next_billing_date', new Date(Next_billing_date));
+        if (Next_billing_date) {
+          updateSubscription.set('Next_billing_date', new Date(Next_billing_date));
+        } else {
+          updateSubscription.unset('Next_billing_date');
+        }
         updateSubscription.set('PlanCode', planCode);
         await updateSubscription.save(null, { useMasterKey: true });
         return response.status(200).json({ status: 'update subscription!' });
@@ -45,7 +49,11 @@ export default async function saveSubscription(request, response) {
           className: 'partners_Tenant',
           objectId: extUser.get('TenantId').id,
         });
-        createSubscription.set('Next_billing_date', new Date(Next_billing_date));
+        if (Next_billing_date) {
+          createSubscription.set('Next_billing_date', new Date(Next_billing_date));
+        } else {
+          createSubscription.unset('Next_billing_date');
+        }
         createSubscription.set('PlanCode', planCode);
         await createSubscription.save(null, { useMasterKey: true });
         return response.status(200).json({ status: 'create subscription!' });

apps/OpenSignServer/cloud/parsefunction/GetPublicTemplate.js

@@ -22,11 +22,16 @@ async function GetPublicTemplate(request) {
         templatQuery.notEqualTo('IsArchive', true);
         const getTemplate = await templatQuery.find({ useMasterKey: true });
 
-        const extend_Res = await Parse.Cloud.run('getUserDetails', {
-          email: user.get('email'),
-        });
-        if (extend_Res) {
-          return { template: getTemplate, user: user, extend_User: extend_Res };
+        const extcls = new Parse.Query('contracts_Users');
+        extcls.equalTo('email', user.get('email'));
+        const res = await extcls.first({ useMasterKey: true });
+        if (res) {
+          const _res = JSON.parse(JSON.stringify(_res));
+          return {
+            template: getTemplate,
+            user: user,
+            extend_User: { Tagline: _res?.Tagline || '', SearchIndex: _res?.SearchIndex || '' },
+          };
         } else {
           throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Template not found');
         }

apps/OpenSignServer/cloud/parsefunction/getUserDetails.js

@@ -1,19 +1,39 @@
 async function getUserDetails(request) {
-  try {
-    const userId = request.params.userId;
-    const userQuery = new Parse.Query('contracts_Users');
-    userQuery.equalTo('Email', request.params.email);
-    userQuery.include('TenantId');
-    userQuery.include('UserId');
-    userQuery.exclude('google_refresh_token')
-    if (userId) {
-      userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });
+  const reqEmail = request.params.email;
+  if (reqEmail || request.user) {
+    try {
+      const userId = request.params.userId;
+      const userQuery = new Parse.Query('contracts_Users');
+      if (reqEmail) {
+        userQuery.equalTo('Email', reqEmail);
+      } else {
+        const email = request.user.get('email');
+        userQuery.equalTo('Email', email);
+      }
+      userQuery.include('TenantId');
+      userQuery.include('UserId');
+      userQuery.exclude('google_refresh_token');
+      if (userId) {
+        userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });
+      }
+      const res = await userQuery.first({ useMasterKey: true });
+      if (res) {
+        if (reqEmail) {
+          return { objectId: res.id };
+        } else {
+          return res;
+        }
+      } else {
+        return '';
+      }
+    } catch (err) {
+      console.log('Err ', err);
+      const code = err?.code || 400;
+      const msg = err?.message || 'Something went wrong.';
+      throw new Parse.Error(code, msg);
     }
-    const res = await userQuery.first({ useMasterKey: true });
-    return res;
-  } catch (err) {
-    console.log('Err ', err);
-    return err;
+  } else {
+    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
   }
 }
 export default getUserDetails;

apps/OpenSignServer/databases/migrations/20240806141611-update_contracts_users_cjs.cjs

@@ -0,0 +1,31 @@
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.up = async Parse => {
+  // TODO: set className here
+  const className = 'contracts_Users';
+  const schema = new Parse.Schema(className);
+  schema.addString('Language');
+  // 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_Users';
+  const schema = new Parse.Schema(className);
+  schema.deleteField('Language');
+  // TODO: Set the schema here
+  // Example:
+  // schema.deleteField('name').deleteField('cash');
+
+  return schema.update();
+};

apps/OpenSignServer/index.js

@@ -17,7 +17,7 @@ import { exec } from 'child_process';
 import { createTransport } from 'nodemailer';
 import { app as v1 } from './cloud/customRoute/v1/apiV1.js';
 import { PostHog } from 'posthog-node';
-import { smtpenable, smtpsecure, useLocal } from './Utils.js';
+import { cloudServerUrl, smtpenable, smtpsecure, useLocal } from './Utils.js';
 import { SSOAuth } from './auth/authadapter.js';
 let fsAdapter;
 if (useLocal !== 'true') {
@@ -98,9 +98,9 @@ export const config = {
   maxUploadSize: '30mb',
   masterKey: process.env.MASTER_KEY, //Add your master key here. Keep it secret!
   masterKeyIps: ['0.0.0.0/0', '::/0'], // '::1'
-  serverURL: 'http://localhost:8080/app', // Don't forget to change to https if needed
+  serverURL: cloudServerUrl, // Don't forget to change to https if needed
   verifyUserEmails: false,
-  publicServerURL: process.env.SERVER_URL || 'http://localhost:8080/app',
+  publicServerURL: process.env.SERVER_URL || cloudServerUrl,
   // Your apps name. This will appear in the subject and body of the emails that are sent.
   appName: 'Opensign',
   allowClientClassCreation: false,
@@ -219,8 +219,8 @@ if (!process.env.TESTING) {
     // console.log('isWindows', isWindows);
 
     const migrate = isWindows
-      ? `set APPLICATION_ID=${process.env.APP_ID}&& set SERVER_URL=http://localhost:8080/app&& set MASTER_KEY=${process.env.MASTER_KEY}&& npx parse-dbtool migrate`
-      : `APPLICATION_ID=${process.env.APP_ID} SERVER_URL=http://localhost:8080/app MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;
+      ? `set APPLICATION_ID=${process.env.APP_ID}&& set SERVER_URL=${cloudServerUrl}&& set MASTER_KEY=${process.env.MASTER_KEY}&& npx parse-dbtool migrate`
+      : `APPLICATION_ID=${process.env.APP_ID} SERVER_URL=${cloudServerUrl} MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;
     exec(migrate, (error, stdout, stderr) => {
       if (error) {
         console.error(`Error: ${error.message}`);

apps/OpenSignServer/package-lock.json

@@ -15,8 +15,8 @@
         "@signpdf/placeholder-pdf-lib": "^3.2.4",
         "@signpdf/signer-p12": "^3.2.4",
         "@signpdf/signpdf": "^3.2.4",
-        "aws-sdk": "^2.1665.0",
-        "axios": "^1.7.2",
+        "aws-sdk": "^2.1667.0",
+        "axios": "^1.7.3",
         "cors": "^2.8.5",
         "dotenv": "^16.4.5",
         "express": "^4.19.2",
@@ -4134,9 +4134,9 @@
       }
     },
     "node_modules/aws-sdk": {
-      "version": "2.1665.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1665.0.tgz",
-      "integrity": "sha512-IhEcdGmiplF3l/pCROxEYIdi0s+LZ2VkbMAq3RgoXTHxY5cgqVRNaqsEsgIHev2Clxa9V08HttnIERTIUqb1+Q==",
+      "version": "2.1667.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1667.0.tgz",
+      "integrity": "sha512-hE4FmdZRMc3bYeC5LUAAU/ryYpjhEm1xdi4aVtUiZ14rrfMd0li6XQIM00a9ctZwDJpwJppcSXfDj6bVBCzvXQ==",
       "hasInstallScript": true,
       "dependencies": {
         "buffer": "4.9.2",
@@ -4176,9 +4176,9 @@
       "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g=="
     },
     "node_modules/axios": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
-      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz",
+      "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",

apps/OpenSignServer/package.json

@@ -24,8 +24,8 @@
     "@signpdf/placeholder-pdf-lib": "^3.2.4",
     "@signpdf/signer-p12": "^3.2.4",
     "@signpdf/signpdf": "^3.2.4",
-    "aws-sdk": "^2.1665.0",
-    "axios": "^1.7.2",
+    "aws-sdk": "^2.1667.0",
+    "axios": "^1.7.3",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",

apps/OpenSignServer/runmigrate.js

@@ -1,37 +0,0 @@
-// const { exec } = require('child_process');
-import { exec } from 'child_process';
-
-const migrate =
-  'APPLICATION_ID=legadranaxn SERVER_URL=http://localhost:8080/app MASTER_KEY=XnAwPDRQQyMr npx parse-dbtool migrate';
-// `APPLICATION_ID=${process.env.APP_ID} SERVER_URL=${process.env.SERVER_URL} MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;
-
-exec(migrate, (error, stdout, stderr) => {
-  if (error) {
-    console.error(`Error: ${error.message}`);
-    return;
-  }
-
-  if (stderr) {
-    console.error(`Error: ${stderr}`);
-    return;
-  }
-
-  console.log(`Command output: ${stdout}`);
-});
-
-// const seeder =
-//   'APPLICATION_ID=legadranaxn SERVER_URL=http://localhost:8080/app MASTER_KEY=XnAwPDRQQyMr npx parse-dbtool seed';
-
-// exec(seeder, (error, stdout, stderr) => {
-//   if (error) {
-//     console.error(`Error: ${error.message}`);
-//     return;
-//   }
-
-//   if (stderr) {
-//     console.error(`Error: ${stderr}`);
-//     return;
-//   }
-
-//   console.log(`Command output: ${stdout}`);
-// });