Skip to content

🔥 The free & Open Source DocuSign alternative

fix: validation of api token

prafull-opensignlabs07878207de39
diff --git a/apps/OpenSign/src/components/BulkSendUi.js b/apps/OpenSign/src/components/BulkSendUi.js
index f04130cbf..c71ab35ed 100644
--- a/apps/OpenSign/src/components/BulkSendUi.js
+++ b/apps/OpenSign/src/components/BulkSendUi.js
@@ -6,8 +6,11 @@ import { useTranslation } from "react-i18next";
import Parse from "parse";
import ModalUi from "../primitives/ModalUi";
import { isEnableSubscription } from "../constant/const";
+import { fetchSubscription } from "../constant/Utils";
+import { useNavigate } from "react-router-dom";
const BulkSendUi = (props) => {
const { t } = useTranslation();
+ const navigate = useNavigate();
const [forms, setForms] = useState([]);
const [formId, setFormId] = useState(2);
const formRef = useRef(null);
@@ -25,6 +28,7 @@ const BulkSendUi = (props) => {
});
const [isQuotaReached, setIsQuotaReached] = useState(false);
const [isLoader, setIsLoader] = useState(false);
+ const [isFreePlan, setIsFreePlan] = useState(false);
const allowedSigners = 50;
useEffect(() => {
signatureExist();
@@ -36,6 +40,10 @@ const BulkSendUi = (props) => {
if (isEnableSubscription) {
setIsLoader(true);
try {
+ const subscription = await fetchSubscription();
+ if (subscription?.plan === "freeplan") {
+ setIsFreePlan(true);
+ }
const allowedquicksend = await Parse.Cloud.run("allowedquicksend");
if (allowedquicksend > 0) {
setIsBulkAvailable(true);
@@ -273,6 +281,9 @@ const BulkSendUi = (props) => {
const handleCloseQuotaReached = () => {
setIsQuotaReached(false);
};
+ const handleNavigation = () => {
+ navigate("/subscription");
+ };
return (
<>
{isLoader ? (
@@ -385,46 +396,62 @@ const BulkSendUi = (props) => {
)}
</>
) : (
- <form onSubmit={handleAddOnQuickSubmit} className="p-3">
- <p className="flex justify-center text-center mx-2 mb-3 text-base op-text-accent font-medium">
- {t("additional-quicksend")}
- </p>
- <div className="mb-3 flex justify-between">
- <label
- htmlFor="quantity"
- className="block text-xs text-gray-700 font-semibold"
- >
- {t("quantityofquicksend")}
- <span className="text-[red] text-[13px]">*</span>
- </label>
- <select
- value={amount.quantity}
- onChange={(e) => handlePricePerQuick(e)}
- name="quantity"
- className="op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content w-1/4 text-xs"
- required
- >
- {quantityList.length > 0 &&
- quantityList.map((x) => (
- <option key={x} value={x}>
- {x}
- </option>
- ))}
- </select>
- </div>
- <div className="mb-3 flex justify-between">
- <label className="block text-xs text-gray-700 font-semibold">
- {t("Price")} (1 * {amount.priceperbulksend})
- </label>
- <div className="w-1/4 flex justify-center items-center text-sm">
- USD {amount.price}
+ <>
+ {isFreePlan ? (
+ <div className="w-full h-[130px] flex flex-col justify-center items-center text-center p-4">
+ <p className="text-base font-medium mb-2.5">
+ Please upgrade to Professional or Team plan to use quicksend
+ </p>
+ <button
+ onClick={() => handleNavigation()}
+ className="op-btn op-btn-primary"
+ >
+ Upgrade Now
+ </button>
</div>
- </div>
- <hr className="text-base-content mb-3" />
- <button className="op-btn op-btn-primary w-full mt-2">
- {t("Proceed")}
- </button>
- </form>
+ ) : (
+ <form onSubmit={handleAddOnQuickSubmit} className="p-3">
+ <p className="flex justify-center text-center mx-2 mb-3 text-base op-text-accent font-medium">
+ {t("additional-quicksend")}
+ </p>
+ <div className="mb-3 flex justify-between">
+ <label
+ htmlFor="quantity"
+ className="block text-xs text-gray-700 font-semibold"
+ >
+ {t("quantityofquicksend")}
+ <span className="text-[red] text-[13px]">*</span>
+ </label>
+ <select
+ value={amount.quantity}
+ onChange={(e) => handlePricePerQuick(e)}
+ name="quantity"
+ className="op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content w-1/4 text-xs"
+ required
+ >
+ {quantityList.length > 0 &&
+ quantityList.map((x) => (
+ <option key={x} value={x}>
+ {x}
+ </option>
+ ))}
+ </select>
+ </div>
+ <div className="mb-3 flex justify-between">
+ <label className="block text-xs text-gray-700 font-semibold">
+ {t("Price")} (1 * {amount.priceperbulksend})
+ </label>
+ <div className="w-1/4 flex justify-center items-center text-sm">
+ USD {amount.price}
+ </div>
+ </div>
+ <hr className="text-base-content mb-3" />
+ <button className="op-btn op-btn-primary w-full mt-2">
+ {t("Proceed")}
+ </button>
+ </form>
+ )}
+ </>
)}
</>
)}
diff --git a/apps/OpenSign/src/pages/GenerateToken.js b/apps/OpenSign/src/pages/GenerateToken.js
index 108a47deb..0cbcfa198 100644
--- a/apps/OpenSign/src/pages/GenerateToken.js
+++ b/apps/OpenSign/src/pages/GenerateToken.js
@@ -9,7 +9,6 @@ import Tooltip from "../primitives/Tooltip";
import Loader from "../primitives/Loader";
import SubscribeCard from "../primitives/SubscribeCard";
import Tour from "reactour";
-import { validplan } from "../json/plansArr";
import { useTranslation } from "react-i18next";
import Parse from "parse";
@@ -65,7 +64,7 @@ function GenerateToken() {
};
const handleSubmit = async (e) => {
e.preventDefault();
- if (!validplan[isSubscribe.plan] && isEnableSubscription) {
+ if (isSubscribe?.plan === "freeplan" && isEnableSubscription) {
setIsTour(true);
} else {
setIsLoader(true);
@@ -103,11 +102,15 @@ function GenerateToken() {
setTimeout(() => setIsAlert({ type: "success", msg: "" }), 1500); // Reset copied state after 1.5 seconds
};
const handleModal = () => {
- setIsModal((obj) => ({ ...obj, generateapi: !obj.generateapi }));
+ if (isSubscribe?.plan === "freeplan" && isEnableSubscription) {
+ setIsTour(true);
+ } else {
+ setIsModal((obj) => ({ ...obj, generateapi: !obj.generateapi }));
+ }
};
const handleBuyAPIsModal = () => {
- if (!validplan[isSubscribe.plan] && isEnableSubscription) {
+ if (isSubscribe?.plan === "freeplan" && isEnableSubscription) {
setIsTour(true);
} else {
setIsModal((obj) => ({ ...obj, buyapis: !obj.buyapis }));
@@ -176,16 +179,18 @@ function GenerateToken() {
<span
id="token"
className={`${
- validplan[isSubscribe.plan]
- ? ""
- : "bg-white/20 pointer-events-none select-none"
+ isSubscribe?.plan === "freeplan"
+ ? "bg-white/20 pointer-events-none select-none"
+ : ""
} md:text-end py-2 md:py-0`}
>
<span
className="cursor-pointer"
onClick={() => copytoclipboard(apiToken)}
>
- {apiToken ? apiToken : "_____"}
+ {isSubscribe?.plan !== "freeplan" && apiToken
+ ? apiToken
+ : "_____"}
</span>
<button
className="op-btn op-btn-accent op-btn-outline op-btn-sm ml-2 cursor-pointer"
@@ -303,9 +308,9 @@ function GenerateToken() {
</form>
</ModalUi>
</div>
- {!validplan[isSubscribe.plan] && isEnableSubscription && (
+ {isSubscribe?.plan === "freeplan" && isEnableSubscription && (
<div data-tut="apisubscribe">
- <SubscribeCard plan_code={isSubscribe.plan} />
+ <SubscribeCard plan_code={isSubscribe?.plan} />
</div>
)}
</>