WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-23 16:12:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #676 from OpenSignLabs/guestsign_url

Browse Source 
fix: issue of url encoded parameter in guest login url
This commit is contained in:
prafull-opensignlabs
2024-05-07 18:53:27 +05:30
committed by GitHub
parent a7dd47f1b1 0f67013005
commit 9ba05d23fd
8 changed files with 76 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/App.js
+4
View File
@@ -109,6 +109,10 @@ function App() {
path="/login/:id/:userMail/:contactBookId/:serverUrl"
element={<LazyPage Page={GuestLogin} />}
/>
<Route
path="/login/:base64url"
element={<LazyPage Page={GuestLogin} />}
/>
<Route path="/debugpdf" element={<LazyPage Page={DebugPdf} />} />
<Route
path="/forgetpassword"
apps/OpenSign/src/pages/GuestLogin.js
+20 -11
View File
@@ -6,9 +6,10 @@ import axios from "axios";
import { isEnableSubscription, themeColor } from "../constant/const";
import { contractUsers, getAppLogo } from "../constant/Utils";
import logo from "../assets/images/logo.png";
import { appInfo } from "../constant/appinfo";
function GuestLogin() {
const { id, userMail, contactBookId, serverUrl } = useParams();
const { id, userMail, contactBookId, base64url } = useParams();
let navigate = useNavigate();
const [email, setEmail] = useState(userMail);
const [OTP, setOTP] = useState("");
@@ -16,7 +17,8 @@ function GuestLogin() {
const [loading, setLoading] = useState(false);
const [isLoading, setIsLoading] = useState(true);
const [appLogo, setAppLogo] = useState("");
const [documentId, setDocumentId] = useState(id);
const [contactId, setContactId] = useState(contactBookId);
useEffect(() => {
handleServerUrl();
@@ -36,17 +38,24 @@ function GuestLogin() {
setAppLogo(logo);
}
//split url in array from '&'
localStorage.clear();
const checkSplit = serverUrl.split("&");
const server = checkSplit[0];
const parseId = checkSplit[1];
const appName = checkSplit[2];
const newServer = server.replaceAll("%2F", "/");
const parseId = appInfo.appId;
const newServer = `${appInfo.baseUrl}/`;
const appName = appInfo.appname;
localStorage.setItem("baseUrl", newServer);
localStorage.setItem("parseAppId", parseId);
localStorage.setItem("_appName", appName);
//this condition is used decode base64 to string and get userEmail,documentId, contactBoookId data.
if (!id) {
//`atob` function is used to decode base64
const decodebase64 = atob(base64url);
//split url in array from '/'
const checkSplit = decodebase64.split("/");
setDocumentId(checkSplit[0]);
setEmail(checkSplit[1]);
setContactId(checkSplit[2]);
}
setIsLoading(false);
};
@@ -74,7 +83,7 @@ function GuestLogin() {
};
let body = {
email: email.toString(),
docId: id
docId: documentId
};
let Otp = await axios.post(url, body, { headers: headers });
@@ -137,7 +146,7 @@ function GuestLogin() {
//save isGuestSigner true in local to handle login flow header in mobile view
localStorage.setItem("isGuestSigner", true);
setLoading(false);
navigate(`/load/recipientSignPdf/${id}/${contactBookId}`);
navigate(`/load/recipientSignPdf/${documentId}/${contactId}`);
}
} catch (error) {
console.log("err ", error);
apps/OpenSign/src/pages/Opensigndrive.js
+15 -5
View File
@@ -64,6 +64,7 @@ function Opensigndrive() {
const sortingValue = ["Name", "Date"];
const [isDontShow, setIsDontShow] = useState(false);
const [tourData, setTourData] = useState();
const [showTourFirstTIme, setShowTourFirstTime] = useState(true);
const orderName = {
Ascending: "Ascending",
Descending: "Descending",
@@ -134,7 +135,9 @@ function Opensigndrive() {
//function for get all pdf document list
const getPdfDocumentList = async (disbaleLoading) => {
setLoading(true);
checkTourStatus();
if (showTourFirstTIme) {
checkTourStatus();
}
if (!disbaleLoading) {
setIsLoading({ isLoad: true, message: "This might take some time" });
}
@@ -250,17 +253,23 @@ function Opensigndrive() {
}, [loading, sortingOrder, selectedSort]); // Add/remove scroll event listener when loading changes
//function for handle folder name path
const handleRoute = (index) => {
setPdfData([]);
const handleRoute = (index, folderData) => {
setSkip(0);
// after onclick on route filter route from that index
const updateFolderName = folderName.filter((x, i) => {
if (i <= index) {
return x;
}
});
setFolderName(updateFolderName);
//get route details after onclick path of folder name
const getCurrentId = folderData[index];
const getLastId = updateFolderName[updateFolderName.length - 1];
setDocId(getLastId.objectId);
//below condition is used to check if user click on same route which already open then don't change any thing
if (docId !== getCurrentId.objectId) {
setPdfData([]);
setDocId(getLastId.objectId);
}
};
//function for add new folder name
@@ -439,7 +448,7 @@ function Opensigndrive() {
return (
<React.Fragment key={id}>
<span
onClick={() => handleRoute(id)}
onClick={() => handleRoute(id, folderData)}
style={{
color: "#a64b4e",
fontWeight: "400",
@@ -474,6 +483,7 @@ function Opensigndrive() {
const closeTour = async () => {
setIsTour(false);
setShowTourFirstTime(false);
if (isDontShow) {
const serverUrl = localStorage.getItem("baseUrl");
const appId = localStorage.getItem("parseAppId");
apps/OpenSign/src/pages/PdfRequestFiles.js
+8 -9
View File
@@ -740,14 +740,13 @@ function PdfRequestFiles() {
localStorage.getItem("parseAppId"),
sessionToken: localStorage.getItem("accesstoken")
};
const serverUrl = localStorage.getItem("baseUrl");
const newServer = serverUrl.replaceAll("/", "%2F");
const objectId = user.objectId;
const serverParams = `${newServer}&${localStorage.getItem(
"parseAppId"
)}&${localStorage.getItem("_appName")}`;
const hostUrl = window.location.origin;
let signPdf = `${hostUrl}/login/${pdfDetails?.[0].objectId}/${user.Email}/${objectId}/${serverParams}`;
//encode this url value `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}` to base64 using `btoa` function
const encodeBase64 = btoa(
`${pdfDetails?.[0].objectId}/${user.Email}/${objectId}`
);
let signPdf = `${hostUrl}/login/${encodeBase64}`;
const openSignUrl =
"https://www.opensignlabs.com/contact-us";
const orgName = pdfDetails[0]?.ExtUserPtr.Company
@@ -1245,9 +1244,9 @@ function PdfRequestFiles() {
isDecline.currnt === "Sure"
? "Are you sure want to decline this document ?"
: isDecline.currnt === "YouDeclined"
? "You have declined this document!"
: isDecline.currnt === "another" &&
"You can not sign this document as it has been declined/revoked."
? "You have declined this document!"
: isDecline.currnt === "another" &&
"You can not sign this document as it has been declined/revoked."
}
footerMessage={isDecline.currnt === "Sure"}
declineDoc={declineDoc}
apps/OpenSign/src/pages/PlaceHolderSign.js
+10 -15
View File
@@ -251,7 +251,6 @@ function PlaceHolderSign() {
navigate(`/subscription`);
}
}
//function for get document details
const getDocumentDetails = async () => {
fetchTenantDetails();
@@ -968,15 +967,13 @@ function PlaceHolderSign() {
const shareLinkList = [];
let signerMail = signersdata;
for (let i = 0; i < signerMail.length; i++) {
const serverUrl = localStorage.getItem("baseUrl");
const newServer = serverUrl.replaceAll("/", "%2F");
const objectId = signerMail[i].objectId;
const serverParams = `${newServer}&${localStorage.getItem(
"parseAppId"
)}&${localStorage.getItem("_appName")}`;
const hostUrl = window.location.origin;
let signPdf = `${hostUrl}/login/${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}/${serverParams}`;
//encode this url value `${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}` to base64 using `btoa` function
const encodeBase64 = btoa(
`${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}`
);
let signPdf = `${hostUrl}/login/${encodeBase64}`;
shareLinkList.push({ signerEmail: signerMail[i].Email, url: signPdf });
}
return shareLinkList.map((data, ind) => {
@@ -1050,15 +1047,13 @@ function PlaceHolderSign() {
"X-Parse-Application-Id": localStorage.getItem("parseAppId"),
sessionToken: localStorage.getItem("accesstoken")
};
const serverUrl = localStorage.getItem("baseUrl");
const newServer = serverUrl.replaceAll("/", "%2F");
const objectId = signerMail[i].objectId;
const serverParams = `${newServer}&${localStorage.getItem(
"parseAppId"
)}&${localStorage.getItem("_appName")}`;
const hostUrl = window.location.origin;
let signPdf = `${hostUrl}/login/${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}/${serverParams}`;
//encode this url value `${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}` to base64 using `btoa` function
const encodeBase64 = btoa(
`${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}`
);
let signPdf = `${hostUrl}/login/${encodeBase64}`;
const openSignUrl = "https://www.opensignlabs.com/";
const orgName = pdfDetails[0]?.ExtUserPtr.Company
? pdfDetails[0].ExtUserPtr.Company
apps/OpenSign/src/primitives/GetReportDisplay.js
+7 -5
View File
@@ -287,13 +287,15 @@ const ReportTable = (props) => {
const handleShare = (item) => {
setActLoader({ [item.objectId]: true });
const host = window.location.origin;
const serverUrl = process.env.REACT_APP_SERVERURL
? process.env.REACT_APP_SERVERURL
: window.location.origin + "/api/app";
const baseURL = serverUrl.replace(/\//g, "%2F");
const getUrl = (x) => {
//encode this url value `${item.objectId}/${x.Email}/${x.objectId}` to base64 using `btoa` function
const encodeBase64 = btoa(`${item.objectId}/${x.Email}/${x.objectId}`);
return `${host}/login/${encodeBase64}`;
};
const urls = item.Signers.map((x) => ({
email: x.Email,
url: `${host}/login/${item.objectId}/${x.Email}/${x.objectId}/${baseURL}%2F&opensign&contracts`
url: getUrl(x)
}));
setShareUrls(urls);
setIsShare({ [item.objectId]: true });
apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js
+6 -3
View File
@@ -217,9 +217,10 @@ export default async function createDocumentWithTemplate(request, response) {
};
const objectId = contactMail[i].contactPtr.objectId;
const hostUrl = baseUrl.origin;
let signPdf = `${hostUrl}/login/${res.id}/${contactMail[i].email}/${objectId}/${serverParams}`;
//encode this url value `${res.id}/${contactMail[i].email}/${objectId}` to base64 using `btoa` function
const encodeBase64 = btoa(`${res.id}/${contactMail[i].email}/${objectId}`);
let signPdf = `${hostUrl}/login/${encodeBase64}`;
const openSignUrl = 'https://www.opensignlabs.com/contact-us';
const orgName = template.ExtUserPtr.Company ? template.ExtUserPtr.Company : '';
const themeBGcolor = '#47a3ad';
@@ -316,11 +317,13 @@ export default async function createDocumentWithTemplate(request, response) {
properties: { response_code: 200 },
});
}
//encode this url value `${res.id}/${x.email}/${x.contactPtr.objectId}` to base64 using `btoa` function
const encodeBase64 = btoa(`${res.id}/${x.email}/${x.contactPtr.objectId}`);
return response.json({
objectId: res.id,
signurl: contact.map(x => ({
email: x.email,
url: `${baseUrl.origin}/login/${res.id}/${x.email}/${x.contactPtr.objectId}/${serverParams}`,
url: `${baseUrl.origin}/login/${encodeBase64}`,
})),
message: 'Document sent successfully!',
});
apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js
+6 -2
View File
@@ -278,7 +278,9 @@ export default async function createDocumentwithCoordinate(request, response) {
const objectId = contactMail[i].contactPtr.objectId;
const hostUrl = baseUrl.origin;
let signPdf = `${hostUrl}/login/${res.id}/${contactMail[i].email}/${objectId}/${serverParams}`;
//encode this url value `${response.id}/${contactMail[i].email}/${objectId}` to base64 using `btoa` function
const encodeBase64 = btoa(`${response.id}/${contactMail[i].email}/${objectId}`);
let signPdf = `${hostUrl}/login/${encodeBase64}`;
const openSignUrl = 'https://www.opensignlabs.com/contact-us';
const orgName = parseExtUser.Company ? parseExtUser.Company : '';
const themeBGcolor = '#47a3ad';
@@ -359,11 +361,13 @@ export default async function createDocumentwithCoordinate(request, response) {
properties: { response_code: 200 },
});
}
//encode this url value `${res.id}/${x.email}/${x.contactPtr.objectId}` to base64 using `btoa` function
const encodeBase64 = btoa(`${res.id}/${x.email}/${x.contactPtr.objectId}`);
return response.json({
objectId: res.id,
signurl: contact.map(x => ({
email: x.email,
url: `${baseUrl.origin}/login/${res.id}/${x.email}/${x.contactPtr.objectId}/${serverParams}`,
url: `${baseUrl.origin}/login/${encodeBase64}`,
})),
message: 'Document sent successfully!',
});