Merge pull request #1205 from OpenSignLabs/validation

Author: andrew-opensignlabs

apps/OpenSign/public/locales/en/translation.json

@@ -635,7 +635,7 @@
   "quota-mail": "You've reached your limit of 15 signature request emails for this month. Upgrade now to continue sending emails directly.",
   "quota-mail-tip":"Tip: You can still sign <1>unlimited documents</1> by manually sharing the signing request links.",
   "quota-mail-head":"Quota Reached",
-  "unauthorized-modal":"You don't have permission to perform this action, please contact {{adminName}}<{{adminEmail}}>.",
+  "unauthorized-modal":"You don't have permission to perform this action, please contact {{adminEmail}}.",
   "sent-this-month":"Sent this month",
   "available-seats":"Available seats",
   "buy-users":"Buy more users"

apps/OpenSign/public/locales/fr/translation.json

@@ -634,7 +634,7 @@
   "quota-mail": "Vous avez atteint votre limite de 15 e-mails de demande de signature pour ce mois. Mettez à niveau maintenant pour continuer à envoyer des e-mails directement.",
   "quota-mail-tip-tip":"Astuce : Vous pouvez toujours signer un nombre <1>illimité de documents</1> en partageant manuellement les liens de demande de signature.",
   "quota-mail-head":"Quota atteint",
-  "unauthorized-modal":"Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminName}}<{{adminEmail}}>.",
+  "unauthorized-modal":"Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminEmail}}.",
   "sent-this-month":"envoyé ce mois-ci",
   "available-seats":"Disponible sièges",
   "buy-users":"Acheter plus d'utilisateurs"

apps/OpenSign/src/components/AddUser.js

@@ -498,8 +498,7 @@ const AddUser = (props) => {
                   {planInfo.adminId !== extUser?.objectId ? (
                     <div className="mb-3 mt-1 flex justify-center text-center items-center font-medium break-all">
                       {t("unauthorized-modal", {
-                        adminName: extUser?.CreatedBy?.name,
-                        adminEmail: extUser?.CreatedBy?.email
+                        adminEmail: extUser?.TenantId?.EmailAddress
                       })}
                     </div>
                   ) : (

apps/OpenSign/src/components/BulkSendUi.js

@@ -31,7 +31,6 @@ const BulkSendUi = (props) => {
   const [isFreePlan, setIsFreePlan] = useState(false);
   const [admin, setAdmin] = useState({
     objectId: "",
-    name: "",
     email: "",
     isAdmin: true
   });
@@ -63,8 +62,7 @@ const BulkSendUi = (props) => {
           setAdmin((obj) => ({
             ...obj,
             isAdmin: false,
-            name: extUser?.CreatedBy?.name,
-            email: extUser?.CreatedBy?.email
+            email: extUser?.TenantId?.EmailAddress
           }));
         }
         setAdmin((obj) => ({ ...obj, objectId: subscription?.adminId }));
@@ -491,10 +489,7 @@ const BulkSendUi = (props) => {
                     </form>
                   ) : (
                     <div className="mx-8 mt-4 mb-8 flex justify-center text-center items-center font-medium break-all">
-                      {t("unauthorized-modal", {
-                        adminName: admin?.name,
-                        adminEmail: admin?.email
-                      })}
+                      {t("unauthorized-modal", { adminEmail: admin?.email })}
                     </div>
                   )}
                 </>

apps/OpenSign/src/pages/GenerateToken.js

@@ -28,7 +28,6 @@ function GenerateToken() {
     plan: "",
     isValid: false,
     adminId: "",
-    adminName: "",
     adminEmail: ""
   });
   const [isAlert, setIsAlert] = useState({ type: "success", msg: "" });
@@ -154,8 +153,7 @@ function GenerateToken() {
       } else {
         setIsSubscribe((obj) => ({
           ...obj,
-          adminName: extUser?.CreatedBy?.name,
-          adminEmail: extUser?.CreatedBy?.email
+          adminEmail: extUser?.TenantId?.EmailAddress
         }));
         setIsModal((obj) => ({ ...obj, unauthorized: !obj.unauthorized }));
       }
@@ -447,7 +445,6 @@ function GenerateToken() {
             >
               <div className="m-8 flex justify-center text-center items-center font-medium break-all">
                 {t("unauthorized-modal", {
-                  adminName: isSubscribe?.adminName,
                   adminEmail: isSubscribe?.adminEmail
                 })}
               </div>

apps/OpenSign/src/script/locales/en/translation.json

@@ -632,7 +632,7 @@
   "quota-mail": "You've reached your limit of 15 signature request emails for this month. Upgrade now to continue sending emails directly.",
   "quota-mail-tip":"Tip: You can still sign <1>unlimited documents</1> by manually sharing the signing request links.",
   "quota-mail-head":"Quota Reached",
-  "unauthorized-modal":"You don't have permission to perform this action, please contact {{adminName}}<{{adminEmail}}>.",
+  "unauthorized-modal":"You don't have permission to perform this action, please contact {{adminEmail}}.",
   "sent-this-month":"Sent this month",
   "available-seats":"Available seats",
   "buy-users":"Buy more users"

apps/OpenSign/src/script/locales/fr/translation.json

@@ -631,7 +631,7 @@
   "quota-mail": "Vous avez atteint votre limite de 15 e-mails de demande de signature pour ce mois. Mettez à niveau maintenant pour continuer à envoyer des e-mails directement.",
   "quota-mail-tip":"Astuce : Vous pouvez toujours signer un nombre <1>illimité de documents</1> en partageant manuellement les liens de demande de signature.",
   "quota-mail-head":"Quota atteint",
-  "unauthorized-modal":"Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminName}}<{{adminEmail}}>.",
+  "unauthorized-modal":"Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminEmail}}.",
   "sent-this-month":"envoyé ce mois-ci",
   "available-seats":"Disponible sièges",
   "buy-users":"Acheter plus d'utilisateurs"

apps/OpenSignServer/cloud/parsefunction/getUserDetails.js

@@ -13,6 +13,7 @@ async function getUserDetails(request) {
       userQuery.include('TenantId');
       userQuery.include('UserId');
       userQuery.include('CreatedBy');
+      userQuery.exclude('CreatedBy.authData');
       userQuery.exclude('google_refresh_token');
       if (userId) {
         userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });