+ {/* your page content */}
+
-
+
+ ) : (
+ {
+ {/* sticky-but-scrollable footer */}
+
+
- )}
- {/* BODY */}
-
- {/* SIDEBAR with width animation */}
-
-
-
- {/* your page content */}
-
- {
- {/* sticky-but-scrollable footer */}
-
-
-
-
-
- {t("session-expired")}
- +
{isLoader && (
@@ -447,6 +469,17 @@ const UserList = () => {
deleteRes={deleteUserRes}
handleClose={handleCloseModal}
/>
+
diff --git a/apps/OpenSign/src/primitives/PasswordResetModal.jsx b/apps/OpenSign/src/primitives/PasswordResetModal.jsx
new file mode 100644
index 0000000000..05c7826c5e
--- /dev/null
+++ b/apps/OpenSign/src/primitives/PasswordResetModal.jsx
@@ -0,0 +1,205 @@
+import { useMemo, useState } from "react";
+import ModalUi from "./ModalUi";
+import { useTranslation } from "react-i18next";
+
+/**
+ * PasswordResetModal
+ * - Validates password rules (length >= 8, upper, lower, digit, special)
+ * - Buttons: Submit, Autogenerate (12 chars), Copy (Font Awesome icon only)
+ * - `Autogenerate` fills a valid 12-char password but remains editable
+ * - `Copy` copies the current password to clipboard
+ *
+ * Props:
+ * - isOpen: boolean
+ * - onClose: () => void
+ * - onSubmit: (password: string) => Promise{t("session-expired")}
@@ -32,4 +35,4 @@ const ValidateSession = ({ children }) => { ); }; -export default ValidateSession; +export default SessionExpiredModal; diff --git a/apps/OpenSign/src/primitives/Validate.jsx b/apps/OpenSign/src/primitives/Validate.jsx index 1cb6de19e9..dc0d937c1f 100644 --- a/apps/OpenSign/src/primitives/Validate.jsx +++ b/apps/OpenSign/src/primitives/Validate.jsx @@ -1,12 +1,9 @@ -import React, { useState, useEffect } from "react"; +import { useState, useEffect } from "react"; import Parse from "parse"; -import { Outlet, useNavigate, useLocation } from "react-router"; -import ModalUi from "./ModalUi"; -import { useTranslation } from "react-i18next"; +import { Outlet } from "react-router"; +import SessionExpiredModal from "./SessionExpiredModal"; + const Validate = () => { - const navigate = useNavigate(); - const { t } = useTranslation(); - const location = useLocation(); const [isUserValid, setIsUserValid] = useState(true); useEffect(() => { (async () => { @@ -37,30 +34,7 @@ const Validate = () => { // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - const handleLoginBtn = async () => { - try { - await Parse.User.logOut(); - } catch (err) { - console.log("err ", err); - } finally { - localStorage.removeItem("accesstoken"); - navigate("/", { replace: true, state: { from: location } }); - } - }; - return isUserValid ? ( -
-
- ) : (
-
-
- {t("session-expired")}
- - handleActionBtn(act, item)}
diff --git a/apps/OpenSign/src/reports/template/TemplatesReport.jsx b/apps/OpenSign/src/reports/template/TemplatesReport.jsx
index 5b14cb4377..4ef51dec06 100644
--- a/apps/OpenSign/src/reports/template/TemplatesReport.jsx
+++ b/apps/OpenSign/src/reports/template/TemplatesReport.jsx
@@ -165,6 +165,15 @@ const TemplatesReport = (props) => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
+ // Close dropdown when clicking outside or on button again
+ useEffect(() => {
+ const onDocClick = (e) => {
+ if (!e.target.closest('[data-dropdown-root="1"]')) setIsOption({});
+ };
+ document.addEventListener("click", onDocClick);
+ return () => document.removeEventListener("click", onDocClick);
+ }, []);
+
// `fetchTeamList` is used to fetch team list for share with functionality
const fetchTeamList = async () => {
try {
@@ -1152,6 +1161,7 @@ const TemplatesReport = (props) => {
role="button"
data-tut={act?.selector}
key={index}
+ data-dropdown-root="1"
onClick={() => handleActionBtn(act, item)}
title={t(`btnLabel.${act.hoverLabel}`)}
className={
diff --git a/apps/OpenSignServer/cloud/main.js b/apps/OpenSignServer/cloud/main.js
index 0d5244a591..25a0932df9 100644
--- a/apps/OpenSignServer/cloud/main.js
+++ b/apps/OpenSignServer/cloud/main.js
@@ -56,6 +56,7 @@ import loginUser from './parsefunction/loginUser.js';
import addUser from './parsefunction/addUser.js';
import filterDocs from './parsefunction/filterDocs.js';
import sendDeleteUserMail from './parsefunction/sendDeleteUserMail.js';
+import resetPassword from './parsefunction/resetPassword.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);
@@ -122,3 +123,4 @@ Parse.Cloud.define('loginuser', loginUser);
Parse.Cloud.define('adduser', addUser);
Parse.Cloud.define('filterdocs', filterDocs);
Parse.Cloud.define('senddeleterequest', sendDeleteUserMail);
+Parse.Cloud.define('resetpassword', resetPassword);
diff --git a/apps/OpenSignServer/cloud/parsefunction/resetPassword.js b/apps/OpenSignServer/cloud/parsefunction/resetPassword.js
new file mode 100644
index 0000000000..cd93650f0d
--- /dev/null
+++ b/apps/OpenSignServer/cloud/parsefunction/resetPassword.js
@@ -0,0 +1,62 @@
+export default async function resetPassword(request) {
+ const userId = request.params.userId;
+ const newPassword = request.params.password;
+
+ if (!userId || !newPassword) {
+ throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Please provide required parameters.');
+ }
+
+ if (!request.user) {
+ throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+ }
+
+ if (request.user.id === userId) {
+ throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Unauthorized to reset your own password.');
+ }
+
+ try {
+ // 1. Get Admin User TenantId
+ const adminUserQuery = new Parse.Query('contracts_Users');
+ adminUserQuery.equalTo('UserId', request.user);
+ const adminUser = await adminUserQuery.first({ useMasterKey: true });
+
+ const tenantId = adminUser?.get('TenantId');
+ if (!tenantId) {
+ throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Admin user tenant not found.');
+ }
+ const isAdmin =
+ adminUser.get('UserRole') === 'contracts_Admin' ||
+ adminUser.get('UserRole') === 'contracts_OrgAdmin';
+ if (!isAdmin) {
+ throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Unauthorized.');
+ }
+
+ // 2. Verify the user belongs to the same tenant and is not an admin
+ const targetUserQuery = new Parse.Query('contracts_Users');
+ targetUserQuery.equalTo('UserId', { __type: 'Pointer', className: '_User', objectId: userId });
+ targetUserQuery.equalTo('TenantId', tenantId);
+ targetUserQuery.notEqualTo('UserRole', 'contracts_Admin');
+ const targetUser = await targetUserQuery.first({ useMasterKey: true });
+
+ if (!targetUser) {
+ throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found or not allowed.');
+ }
+
+ // 3. Update user's password
+ const userQuery = new Parse.Query(Parse.User);
+ userQuery.equalTo('objectId', userId);
+ const user = await userQuery.first({ useMasterKey: true });
+
+ if (!user) {
+ throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
+ }
+
+ user.set('password', newPassword);
+ await user.save(null, { useMasterKey: true });
+
+ return { status: 'success', message: 'Password has been reset.' };
+ } catch (error) {
+ console.error('Error while resetting password:', error);
+ throw error;
+ }
+}