From 7ec8f4ec2432ec21937cc9379e4ccba1498a61d3 Mon Sep 17 00:00:00 2001 From: nxglabs Date: Fri, 18 Jul 2025 14:00:27 +0000 Subject: [PATCH] Merge pull request #1006 from nxglabs/sso_main --- apps/OpenSign/public/locales/de/translation.json | 3 ++- apps/OpenSign/public/locales/en/translation.json | 3 ++- apps/OpenSign/public/locales/es/translation.json | 3 ++- apps/OpenSign/public/locales/fr/translation.json | 3 ++- apps/OpenSign/public/locales/hi/translation.json | 3 ++- apps/OpenSign/public/locales/it/translation.json | 3 ++- apps/OpenSign/src/components/Header.jsx | 4 ++++ apps/OpenSign/src/pages/Login.jsx | 6 +++++- apps/OpenSignServer/cloud/parsefunction/usersignup.js | 2 +- 9 files changed, 22 insertions(+), 8 deletions(-) diff --git a/apps/OpenSign/public/locales/de/translation.json b/apps/OpenSign/public/locales/de/translation.json index 293fa9b41..7eeea2ffa 100644 --- a/apps/OpenSign/public/locales/de/translation.json +++ b/apps/OpenSign/public/locales/de/translation.json @@ -1042,5 +1042,6 @@ "vertical": "Vertikal", "horizontal": "Horizontal", "billing": "Abrechnung", - "console": "Konsole" + "console": "Konsole", + "action-prohibited": "Diese Aktion ist für Ihre E-Mail-Domain nicht erlaubt. Bitte wenden Sie sich an Ihren Administrator, um Hilfe zu erhalten." } diff --git a/apps/OpenSign/public/locales/en/translation.json b/apps/OpenSign/public/locales/en/translation.json index 2b1359f8f..06d491ecc 100644 --- a/apps/OpenSign/public/locales/en/translation.json +++ b/apps/OpenSign/public/locales/en/translation.json @@ -1042,5 +1042,6 @@ "vertical": "Vertical", "horizontal": "Horizontal", "billing": "Billing", - "console": "Console" + "console": "Console", + "action-prohibited": "This action isn't allowed for your email domain. Please contact your administrator for assistance." } \ No newline at end of file diff --git a/apps/OpenSign/public/locales/es/translation.json b/apps/OpenSign/public/locales/es/translation.json index 6a6166eb1..aa981aee9 100644 --- a/apps/OpenSign/public/locales/es/translation.json +++ b/apps/OpenSign/public/locales/es/translation.json @@ -1042,5 +1042,6 @@ "vertical": "Vertical", "horizontal": "Horizontal", "billing": "Facturación", - "console": "Consola" + "console": "Consola", + "action-prohibited": "Esta acción no está permitida para su dominio de correo electrónico. Por favor, contacte con su administrador para obtener ayuda." } diff --git a/apps/OpenSign/public/locales/fr/translation.json b/apps/OpenSign/public/locales/fr/translation.json index 3462048f5..e06076f09 100644 --- a/apps/OpenSign/public/locales/fr/translation.json +++ b/apps/OpenSign/public/locales/fr/translation.json @@ -1042,5 +1042,6 @@ "vertical": "Vertical", "horizontal": "Horizontal", "billing": "Facturation", - "console": "Console" + "console": "Console", + "action-prohibited": "Cette action n'est pas autorisée pour votre domaine de messagerie. Veuillez contacter votre administrateur pour obtenir de l'aide." } diff --git a/apps/OpenSign/public/locales/hi/translation.json b/apps/OpenSign/public/locales/hi/translation.json index 4ef0783ad..5bf318cc6 100644 --- a/apps/OpenSign/public/locales/hi/translation.json +++ b/apps/OpenSign/public/locales/hi/translation.json @@ -1042,5 +1042,6 @@ "vertical": "वर्टिकल", "horizontal": "हॉरिज़ॉन्टल", "billing": "बिलिंग", - "console": "कंसोल" + "console": "कंसोल", + "action-prohibited": "यह क्रिया आपके ईमेल डोमेन के लिए अनुमत नहीं है। कृपया सहायता के लिए अपने व्यवस्थापक से संपर्क करें।" } diff --git a/apps/OpenSign/public/locales/it/translation.json b/apps/OpenSign/public/locales/it/translation.json index 425140fd7..2b1667c33 100644 --- a/apps/OpenSign/public/locales/it/translation.json +++ b/apps/OpenSign/public/locales/it/translation.json @@ -1042,5 +1042,6 @@ "vertical": "Verticale", "horizontal": "Orizzontale", "billing": "Fatturazione", - "console": "Console" + "console": "Console", + "action-prohibited": "Questa azione non è consentita per il tuo dominio email. Contatta il tuo amministratore per ricevere assistenza." } diff --git a/apps/OpenSign/src/components/Header.jsx b/apps/OpenSign/src/components/Header.jsx index e189b4a6c..d2b327ed5 100644 --- a/apps/OpenSign/src/components/Header.jsx +++ b/apps/OpenSign/src/components/Header.jsx @@ -19,6 +19,10 @@ const Header = ({ showSidebar, setIsMenu, isConsole }) => { const { width } = useWindowSize(); const username = localStorage.getItem("username") || ""; const image = localStorage.getItem("profileImg") || dp; + const isAdmin = + localStorage.getItem("Extand_Class") && + JSON.parse(localStorage.getItem("Extand_Class"))?.[0]?.UserRole === + "contracts_Admin"; const [isOpen, setIsOpen] = useState(false); const [applogo, setAppLogo] = useState(""); const [isDarkTheme, setIsDarkTheme] = useState(); diff --git a/apps/OpenSign/src/pages/Login.jsx b/apps/OpenSign/src/pages/Login.jsx index 554033ea4..c1f0c9590 100644 --- a/apps/OpenSign/src/pages/Login.jsx +++ b/apps/OpenSign/src/pages/Login.jsx @@ -125,7 +125,11 @@ function Login() { } } catch (error) { console.error("Error while logging in user", error); - showToast("danger", "Invalid username/password or region"); + if (error?.code === 1001) { + showToast("danger", t("action-prohibited")); + } else { + showToast("danger", "Invalid username/password or region"); + } } }; const handleLoginBtn = async (event) => { diff --git a/apps/OpenSignServer/cloud/parsefunction/usersignup.js b/apps/OpenSignServer/cloud/parsefunction/usersignup.js index 118f76ef3..b5c4a2022 100644 --- a/apps/OpenSignServer/cloud/parsefunction/usersignup.js +++ b/apps/OpenSignServer/cloud/parsefunction/usersignup.js @@ -43,9 +43,9 @@ async function saveUser(userDetails) { } export default async function usersignup(request) { const userDetails = request.params.userDetails; - const user = await saveUser(userDetails); try { + const user = await saveUser(userDetails); const extClass = userDetails.role.split('_')[0]; const extQuery = new Parse.Query(extClass + '_Users');