🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
feat: add login validation for user and fix warning message in teams and users report
prafull-opensignlabs5fc1a58bdbad
diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.jsindex 4bcab07f2..11465a4e6 100644--- a/apps/OpenSign/src/layout/HomeLayout.js+++ b/apps/OpenSign/src/layout/HomeLayout.js@@ -167,7 +167,6 @@ const HomeLayout = () => {setIsTour(false);const serverUrl = localStorage.getItem("baseUrl");const appId = localStorage.getItem("parseAppId");- const extUserClass = localStorage.getItem("extended_class");const json = JSON.parse(localStorage.getItem("Extand_Class"));const extUserId = json && json.length > 0 && json[0].objectId;// console.log("extUserId ", extUserId)@@ -189,7 +188,7 @@ const HomeLayout = () => {// console.log("updatedTourStatus ", updatedTourStatus);await axios.put(- serverUrl + "classes/" + extUserClass + "/" + extUserId,+ serverUrl + "classes/contracts_Users/" + extUserId,{TourStatus: updatedTourStatus},diff --git a/apps/OpenSign/src/pages/Login.js b/apps/OpenSign/src/pages/Login.jsindex eadc3b9ff..ff1d05a1d 100644--- a/apps/OpenSign/src/pages/Login.js+++ b/apps/OpenSign/src/pages/Login.js@@ -78,263 +78,169 @@ function Login() {if (email && password) {try {setState({ ...state, loading: true });- let baseUrl = localStorage.getItem("baseUrl");- let parseAppId = localStorage.getItem("parseAppId");localStorage.setItem("appLogo", appInfo.applogo);// Pass the username and password to logIn function- await Parse.User.logIn(email, password)- .then(async (user) => {- if (user) {- let _user = user.toJSON();- localStorage.setItem("UserInformation", JSON.stringify(_user));- localStorage.setItem("userEmail", email);- localStorage.setItem("username", _user.name);- localStorage.setItem("accesstoken", _user.sessionToken);- localStorage.setItem("scriptId", true);- if (_user.ProfilePic) {- localStorage.setItem("profileImg", _user.ProfilePic);- } else {- localStorage.setItem("profileImg", "");- }- // Check extended class user role and tenentId- try {- let userRoles = [];- if (appInfo.settings) {- let userSettings = appInfo.settings;-- //Get Current user roles- let url = `${baseUrl}functions/UserGroups`;- const headers = {- "Content-Type": "application/json",- "X-Parse-Application-Id": parseAppId,- sessionToken: _user.sessionToken- };- const body = { appname: "contracts" };- await axios- .post(url, JSON.stringify(body), { headers: headers })- .then(async (axiosRes) => {- const roles = axiosRes.data.result;- const currentUser = Parse.User.current();- await Parse.Cloud.run("getUserDetails", {- email: currentUser.get("email")- })- .then((extUser) => {- if (extUser && roles) {- userRoles = roles;- let _currentRole = "";- const valuesToExclude = [- "contracts_Guest",- "contracts_appeditor"- ];- const filterRoles = userRoles.filter(- (x) => !valuesToExclude.includes(x)- );- if (filterRoles.length > 0) {- _currentRole = filterRoles?.[0];- userSettings.forEach(async (element) => {- const redirectUrl =- location?.state?.from ||- `/${element.pageType}/${element.pageId}`;- if (element.role === _currentRole) {- let _role = _currentRole.replace(- "contracts_",- ""- );- localStorage.setItem("_user_role", _role);- // Get TenentID from Extendend Class- localStorage.setItem(- "extended_class",- element.extended_class- );- let tenentInfo = [];- const results = [extUser];- if (extUser) {- let extendedInfo_stringify =- JSON.stringify(results);-- localStorage.setItem(- "Extand_Class",- extendedInfo_stringify- );- let extendedInfo = JSON.parse(- extendedInfo_stringify- );- if (extendedInfo.length > 0) {- extendedInfo.forEach((x) => {- if (x.TenantId) {- let obj = {- tenentId: x.TenantId.objectId,- tenentName:- x.TenantId.TenantName || ""- };- localStorage.setItem(- "TenantId",- x.TenantId.objectId- );- tenentInfo.push(obj);- }- });- if (tenentInfo.length) {- dispatch(- showTenant(- tenentInfo[0].tenentName || ""- )- );- localStorage.setItem(- "TenantName",- tenentInfo[0].tenentName || ""- );- }- localStorage.setItem(- "PageLanding",- element.pageId- );- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem(- "pageType",- element.pageType- );- setState({ ...state, loading: false });- if (isEnableSubscription) {- const LocalUserDetails = {- name: results[0].get("Name"),- email: results[0].get("Email"),- phone: results[0]?.get("Phone") || "",- company: results[0].get("Company")- };- localStorage.setItem(- "userDetails",- JSON.stringify(LocalUserDetails)- );- const res = await fetchSubscription();- const freeplan = res.plan;- const billingDate = res.billingDate;- if (freeplan === "freeplan") {- navigate(redirectUrl);- } else if (billingDate) {- if (- new Date(billingDate) > new Date()- ) {- localStorage.removeItem(- "userDetails"- );- // Redirect to the appropriate URL after successful login- navigate(redirectUrl);- } else {- navigate(`/subscription`, {- replace: true- });- }- } else {- navigate(`/subscription`, {- replace: true- });- }- } else {- // Redirect to the appropriate URL after successful login- navigate(redirectUrl);- }- }- } else {- localStorage.setItem(- "PageLanding",- element.pageId- );- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem(- "pageType",- element.pageType- );- setState({ ...state, loading: false });- if (isEnableSubscription) {- const LocalUserDetails = {- name: _user.name,- email: email,- phone: _user?.phone || ""- // company: results.get("Company"),- };- localStorage.setItem(- "userDetails",- JSON.stringify(LocalUserDetails)- );- const billingDate = "";- if (billingDate) {- navigate(`/subscription`, {- replace: true- });- }- } else {- // Redirect to the appropriate URL after successful login- navigate(redirectUrl);- }- }- }- });+ const user = await Parse.User.logIn(email, password);+ if (user) {+ let _user = user.toJSON();+ localStorage.setItem("UserInformation", JSON.stringify(_user));+ localStorage.setItem("userEmail", email);+ localStorage.setItem("accesstoken", _user.sessionToken);+ localStorage.setItem("scriptId", true);+ if (_user.ProfilePic) {+ localStorage.setItem("profileImg", _user.ProfilePic);+ } else {+ localStorage.setItem("profileImg", "");+ }+ // Check extended class user role and tenentId+ try {+ const userSettings = appInfo.settings;+ const currentUser = Parse.User.current();+ await Parse.Cloud.run("getUserDetails", {+ email: currentUser.get("email")+ })+ .then(async (extUser) => {+ if (extUser) {+ const IsDisabled = extUser?.get("IsDisabled") || false;+ if (!IsDisabled) {+ const userRole = extUser?.get("UserRole");+ const menu =+ userRole &&+ userSettings.find((menu) => menu.role === userRole);+ if (menu) {+ const _currentRole = userRole;+ const redirectUrl =+ location?.state?.from ||+ `/${menu.pageType}/${menu.pageId}`;+ let _role = _currentRole.replace("contracts_", "");+ localStorage.setItem("_user_role", _role);+ const results = [extUser];+ if (extUser) {+ const extUser_str = JSON.stringify(results);+ localStorage.setItem("Extand_Class", extUser_str);+ const extInfo = JSON.parse(JSON.stringify(extUser));+ localStorage.setItem("userEmail", extInfo.Email);+ localStorage.setItem("username", extInfo.Name);+ if (extInfo?.TenantId) {+ const tenant = {+ Id: extInfo?.TenantId?.objectId || "",+ Name: extInfo?.TenantId?.TenantName || ""+ };+ localStorage.setItem("TenantId", tenant?.Id);+ dispatch(showTenant(tenant?.Name));+ localStorage.setItem("TenantName", tenant?.Name);+ }+ localStorage.setItem("PageLanding", menu.pageId);+ localStorage.setItem("defaultmenuid", menu.menuId);+ localStorage.setItem("pageType", menu.pageType);+ setState({ ...state, loading: false });+ if (isEnableSubscription) {+ const LocalUserDetails = {+ name: results[0].get("Name"),+ email: results[0].get("Email"),+ phone: results[0]?.get("Phone") || "",+ company: results[0].get("Company")+ };+ localStorage.setItem(+ "userDetails",+ JSON.stringify(LocalUserDetails)+ );+ const res = await fetchSubscription();+ const freeplan = res.plan;+ const billingDate = res.billingDate;+ if (freeplan === "freeplan") {+ navigate(redirectUrl);+ } else if (billingDate) {+ if (new Date(billingDate) > new Date()) {+ localStorage.removeItem("userDetails");+ // Redirect to the appropriate URL after successful login+ navigate(redirectUrl);+ } else {+ navigate(`/subscription`, { replace: true });}} else {- setState({ ...state, loading: false });- setIsModal(true);+ navigate(`/subscription`, { replace: true });}- })- .catch((error) => {- const payload = {- sessionToken: user.getSessionToken()+ } else {+ // Redirect to the appropriate URL after successful login+ navigate(redirectUrl);+ }+ } else {+ localStorage.setItem("PageLanding", menu.pageId);+ localStorage.setItem("defaultmenuid", menu.menuId);+ localStorage.setItem("pageType", menu.pageType);+ setState({ ...state, loading: false });+ if (isEnableSubscription) {+ const LocalUserDetails = {+ name: _user.name,+ email: email,+ phone: _user?.phone || ""+ // company: results.get("Company"),};- handleSubmitbtn(payload);- console.error("Error while fetching Follow", error);- });- })- .catch((err) => {- console.log("err", err);+ localStorage.setItem(+ "userDetails",+ JSON.stringify(LocalUserDetails)+ );+ const billingDate = "";+ if (billingDate) {+ navigate(`/subscription`, { replace: true });+ }+ } else {+ // Redirect to the appropriate URL after successful login+ navigate(redirectUrl);+ }+ }+ } else {setState({ ...state, loading: false });setIsModal(true);+ }+ } else {+ setState({+ ...state,+ loading: false,+ alertType: "danger",+ alertMsg:+ "You don't have access, please contact the admin."});+ setTimeout(() => {+ setState({ ...state, alertMsg: "" });+ }, 2000);+ logOutUser();+ }+ } else {+ setState({ ...state, loading: false });+ setIsModal(true);}- } catch (error) {- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: `${error.message}`- });- setTimeout(function () {- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: ""- });- }, 2000);- console.log(error);- }- }- })- .catch((error) => {+ })+ .catch((error) => {+ const payload = { sessionToken: user.getSessionToken() };+ handleSubmitbtn(payload);+ console.error("Error while fetching Follow", error);+ });+ } catch (error) {setState({...state,loading: false,alertType: "danger",- alertMsg: "Invalid username or password!"+ alertMsg: `${error.message}`});- setTimeout(function () {- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: ""- });+ setTimeout(() => {+ setState({ ...state, alertMsg: "" });}, 2000);- console.error("Error while logging in user", error);- });+ console.log(error);+ }+ }} catch (error) {- console.log(error.message);- setState({ ...state, loading: false });+ setState({+ ...state,+ loading: false,+ alertType: "danger",+ alertMsg: "Invalid username or password!"+ });+ setTimeout(() => {+ setState({ ...state, alertMsg: "" });+ }, 2000);+ console.error("Error while logging in user", error);}}};@@ -375,7 +281,6 @@ function Login() {let _user = res.data;localStorage.setItem("UserInformation", JSON.stringify(_user));localStorage.setItem("userEmail", _user.email);- localStorage.setItem("username", _user.name);localStorage.setItem("accesstoken", _user.sessionToken);localStorage.setItem("scriptId", true);if (_user.ProfilePic) {@@ -385,254 +290,97 @@ function Login() {}// Check extended class user role and tenentIdtry {- let userRoles = [];- if (appInfo.settings) {- let userSettings = appInfo.settings;-- //Get Current user roles- let url = `${baseUrl}functions/UserGroups`;- const headers = {- "Content-Type": "application/json",- "X-Parse-Application-Id": parseAppId,- sessionToken: _user.sessionToken- };-- let body = { appname: "contracts" };- await axios- .post(url, JSON.stringify(body), { headers: headers })- .then((axiosRes) => {- const roles = axiosRes.data.result;- if (roles) {- userRoles = roles;- let _currentRole = "";- const valuesToExclude = [- "contracts_Guest",- "contracts_appeditor"- ];- if (userRoles.length > 1) {- const rolesfiltered = userRoles.filter(- (x) => !valuesToExclude.includes(x)- );- if (rolesfiltered.length > 0) {- _currentRole = rolesfiltered[0];- }- } else {- const rolesfiltered = userRoles.filter(- (x) => !valuesToExclude.includes(x)- );- if (rolesfiltered.length > 0) {- _currentRole = userRoles[0];- } else {- _currentRole = "";+ const userSettings = appInfo.settings;+ const currentUser = Parse.User.current();+ await Parse.Cloud.run("getUserDetails", {+ email: currentUser.get("email")+ })+ .then(async (extUser) => {+ if (extUser) {+ const IsDisabled = extUser?.get("IsDisabled") || false;+ if (!IsDisabled) {+ const userRole = extUser?.get("UserRole");+ const menu =+ userRole &&+ userSettings.find((menu) => menu.role === userRole);+ if (menu) {+ const _currentRole = userRole;+ const redirectUrl =+ location?.state?.from || `/${menu.pageType}/${menu.pageId}`;+ const _role = _currentRole.replace("contracts_", "");+ localStorage.setItem("_user_role", _role);+ const results = [extUser];+ const extUser_stringify = JSON.stringify(results);+ localStorage.setItem("Extand_Class", extUser_stringify);+ const extInfo = JSON.parse(JSON.stringify(extUser));+ localStorage.setItem("userEmail", extInfo?.Email);+ localStorage.setItem("username", extInfo?.Name);+ if (extInfo?.TenantId) {+ const tenant = {+ Id: extInfo?.TenantId?.objectId || "",+ Name: extInfo?.TenantId?.TenantName || ""+ };+ localStorage.setItem("TenantId", tenant?.Id);+ dispatch(showTenant(tenant?.Name));+ localStorage.setItem("TenantName", tenant?.Name);}- }- if (_currentRole && _currentRole !== "contracts_appeditor") {- userSettings.forEach(async (element) => {- const redirectUrl =- location?.state?.from ||- `/${element.pageType}/${element.pageId}`;- if (element.role === _currentRole) {- let _role = _currentRole.replace("contracts_", "");- localStorage.setItem("_user_role", _role);-- // Get TenentID from Extendend Class- localStorage.setItem(- "extended_class",- element.extended_class- );- const currentUser = Parse.User.current();- await Parse.Cloud.run("getUserDetails", {- email: currentUser.get("email")- }).then(- async (result) => {- let tenentInfo = [];- const results = [result];- if (results && results.length > 0) {- let extendedInfo_stringify =- JSON.stringify(results);- localStorage.setItem(- "Extand_Class",- extendedInfo_stringify- );- let extendedInfo = JSON.parse(- extendedInfo_stringify- );- if (extendedInfo.length > 1) {- extendedInfo.forEach((x) => {- if (x.TenantId) {- let obj = {- tenentId: x.TenantId.objectId,- tenentName: x.TenantId.TenantName || ""- };- tenentInfo.push(obj);- }- });- if (tenentInfo.length) {- dispatch(- showTenant(tenentInfo[0].tenentName || "")- );- localStorage.setItem(- "TenantName",- tenentInfo[0].tenentName || ""- );- }-- localStorage.setItem("showpopup", true);- localStorage.setItem(- "PageLanding",- element.pageId- );- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem(- "pageType",- element.pageType- );- setThirdpartyLoader(false);- setState({ ...state, loading: false });- navigate("/");- } else {- extendedInfo.forEach(async (x) => {- if (x.TenantId) {- let obj = {- tenentId: x.TenantId.objectId,- tenentName: x.TenantId.TenantName || ""- };- localStorage.setItem(- "TenantId",- x.TenantId.objectId- );- tenentInfo.push(obj);- }- });- if (tenentInfo.length) {- dispatch(- showTenant(tenentInfo[0].tenentName || "")- );- localStorage.setItem(- "TenantName",- tenentInfo[0].tenentName || ""- );- }- localStorage.setItem(- "PageLanding",- element.pageId- );- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem(- "pageType",- element.pageType- );- setThirdpartyLoader(false);- setState({ ...state, loading: false });- if (isEnableSubscription) {- const res = await fetchSubscription();- const freeplan = res.plan;- const billingDate = res.billingDate;- if (freeplan === "freeplan") {- navigate(redirectUrl);- } else if (billingDate) {- if (new Date(billingDate) > new Date()) {- localStorage.removeItem("userDetails");- navigate(redirectUrl);- } else {- if (isFreeplan) {- navigate(redirectUrl);- } else {- navigate(`/subscription`, {- replace: true- });- }- }- } else {- if (isFreeplan) {- navigate(redirectUrl);- } else {- navigate(`/subscription`, {- replace: true- });- }- }- } else {- navigate(redirectUrl);- }- }- } else {- localStorage.setItem("PageLanding", element.pageId);- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem("pageType", element.pageType);- setState({ ...state, loading: false });- setThirdpartyLoader(false);- if (isEnableSubscription) {- const res = await fetchSubscription();- const freeplan = res.plan;- const billingDate = res.billingDate;- if (freeplan === "freeplan") {- navigate(redirectUrl);- } else if (billingDate) {- if (new Date(billingDate) > new Date()) {- localStorage.removeItem("userDetails");- // Redirect to the appropriate URL after successful login- navigate(redirectUrl);- } else {- if (isFreeplan) {- navigate(redirectUrl);- } else {- navigate(`/subscription`, {- replace: true- });- }- }- } else {- if (isFreeplan) {- navigate(redirectUrl);- } else {- navigate(`/subscription`, {- replace: true- });- }- }- } else {- navigate(redirectUrl);- }- }- },- (error) => {- const payload = {- sessionToken: sessionToken- };- setThirdpartyLoader(false);- handleSubmitbtn(payload);-- // localStorage.setItem("accesstoken", null);- console.error("Error while fetching Follow", error);- }- );- }- });- } else {+ localStorage.setItem("PageLanding", menu.pageId);+ localStorage.setItem("defaultmenuid", menu.menuId);+ localStorage.setItem("pageType", menu.pageType);setThirdpartyLoader(false);setState({ ...state, loading: false });+ if (isEnableSubscription) {+ const res = await fetchSubscription();+ const freeplan = res.plan;+ const billingDate = res.billingDate;+ if (freeplan === "freeplan") {+ navigate(redirectUrl);+ } else if (billingDate) {+ if (new Date(billingDate) > new Date()) {+ localStorage.removeItem("userDetails");+ navigate(redirectUrl);+ } else {+ if (isFreeplan) {+ navigate(redirectUrl);+ } else {+ navigate(`/subscription`, { replace: true });+ }+ }+ } else {+ if (isFreeplan) {+ navigate(redirectUrl);+ } else {+ navigate(`/subscription`, { replace: true });+ }+ }+ } else {+ navigate(redirectUrl);+ }}} else {setThirdpartyLoader(false);- setState({ ...state, loading: false });+ setState({+ ...state,+ loading: false,+ alertType: "danger",+ alertMsg: "You don't have access, please contact the admin."+ });+ setTimeout(() => {+ setState({ ...state, alertMsg: "" });+ }, 2000);+ logOutUser();}- })- .catch((err) => {- console.log("err", err);+ } else {setThirdpartyLoader(false);setState({ ...state, loading: false });- });- }+ }+ })+ .catch((err) => {+ console.error("err in fetching extUser", err);+ const payload = { sessionToken: sessionToken };+ setThirdpartyLoader(false);+ handleSubmitbtn(payload);+ });} catch (error) {setThirdpartyLoader(false);setState({@@ -641,13 +389,8 @@ function Login() {alertType: "danger",alertMsg: `${error.message}`});- setTimeout(function () {- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: ""- });+ setTimeout(() => {+ setState({ ...state, alertMsg: "" });}, 2000);console.log(error);}@@ -658,9 +401,8 @@ function Login() {setState({ ...state, loading: true });try {const user = await Parse.User.become(localStorage.getItem("accesstoken"));- let _user = user.toJSON();+ const _user = user.toJSON();localStorage.setItem("UserInformation", JSON.stringify(_user));- localStorage.setItem("username", _user.name);localStorage.setItem("accesstoken", _user.sessionToken);localStorage.setItem("scriptId", true);if (_user.ProfilePic) {@@ -668,212 +410,83 @@ function Login() {} else {localStorage.setItem("profileImg", "");}- let userRoles = [];- let userSettings = appInfo.settings;-- //Get Current user roles- let url = `${localStorage.getItem("baseUrl")}functions/UserGroups`;- const headers1 = {- "Content-Type": "application/json",- "X-Parse-Application-Id": localStorage.getItem("parseAppId"),- sessionToken: _user.sessionToken- };- const body = { appname: "contracts" };-- await axios- .post(url, JSON.stringify(body), { headers: headers1 })- .then((axiosres) => {- const roles = axiosres.data.result;- if (roles && roles.length > 0) {- userRoles = roles;- let _currentRole = "";- const valuesToExclude = ["contracts_Guest", "contracts_appeditor"];- const filterRoles = userRoles.filter(- (x) => !valuesToExclude.includes(x)- );- if (filterRoles.length > 0) {- _currentRole = filterRoles?.[0];- let SettingsUser = userSettings;- SettingsUser.forEach(async (item) => {- if (item.role === _currentRole) {- let _role = _currentRole.replace("contracts_", "");- localStorage.setItem("_user_role", _role);- // Get TenentID from Extendend Class- localStorage.setItem("extended_class", item.extended_class);- const currentUser = Parse.User.current();- const userSettings = appInfo.settings;- const setting = userSettings.find(- (x) => x.role === _currentRole- );- const redirectUrl =- location?.state?.from ||- `/${setting.pageType}/${setting.pageId}`;- await Parse.Cloud.run("getUserDetails", {- email: currentUser.get("email")- }).then(- async (result) => {- let tenentInfo = [];- const results = [result];- if (results) {- let extendedInfo_stringify = JSON.stringify(results);- localStorage.setItem(- "Extand_Class",- extendedInfo_stringify- );- let extendedInfo = JSON.parse(extendedInfo_stringify);- if (extendedInfo.length > 1) {- extendedInfo.forEach((x) => {- if (x.TenantId) {- let obj = {- tenentId: x.TenantId.objectId,- tenentName: x.TenantId.TenantName || ""- };- tenentInfo.push(obj);- }- });- localStorage.setItem("showpopup", true);- localStorage.setItem("PageLanding", item.pageId);- localStorage.setItem("defaultmenuid", item.menuId);- localStorage.setItem("pageType", item.pageType);- navigate("/");- } else {- extendedInfo.forEach((x) => {- if (x.TenantId) {- let obj = {- tenentId: x.TenantId.objectId,- tenentName: x.TenantId.TenantName || ""- };- localStorage.setItem(- "TenantId",- x.TenantId.objectId- );- tenentInfo.push(obj);- }- });- localStorage.setItem("PageLanding", setting.pageId);- localStorage.setItem("defaultmenuid", setting.menuId);- localStorage.setItem("pageType", setting.pageType);- if (isEnableSubscription) {- const LocalUserDetails = {- name: results[0].get("Name"),- email: results[0].get("Email"),- phone: results[0]?.get("Phone") || "",- company: results[0].get("Company")- };- localStorage.setItem(- "userDetails",- JSON.stringify(LocalUserDetails)- );- const res = await fetchSubscription();- const billingDate = res.billingDate;- const freeplan = res.plan;- if (freeplan === "freeplan") {- navigate(redirectUrl);- } else if (billingDate) {- if (new Date(billingDate) > new Date()) {- localStorage.removeItem("userDetails");- // Redirect to the appropriate URL after successful login- navigate(redirectUrl);- } else {- navigate(`/subscription`);- }- } else {- navigate(`/subscription`);- }- } else {- // Redirect to the appropriate URL after successful login- navigate(redirectUrl);- }- }- } else {- localStorage.setItem("PageLanding", setting.pageId);- localStorage.setItem("defaultmenuid", setting.menuId);- localStorage.setItem("pageType", setting.pageType);- setState({ ...state, loading: false });- if (isEnableSubscription) {- const LocalUserDetails = {- name: results[0].get("Name"),- email: results[0].get("Email"),- phone: results[0]?.get("Phone") || ""- // company: results.get("Company"),- };- localStorage.setItem(- "userDetails",- JSON.stringify(LocalUserDetails)- );- const billingDate = "";- if (billingDate) {- navigate(`/subscription`);- }- } else {- // Redirect to the appropriate URL after successful login- navigate(redirectUrl);- }- }- },- (error) => {- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: "You don`t have access to this application!"- });- setTimeout(function () {- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: ""- });- }, 2000);- localStorage.setItem("accesstoken", null);- console.error("Error while fetching Follow", error);- }- );+ const userSettings = appInfo.settings;+ await Parse.Cloud.run("getUserDetails", {+ email: _user.email+ }).then(async (extUser) => {+ if (extUser) {+ const IsDisabled = extUser?.get("IsDisabled") || false;+ if (!IsDisabled) {+ const userRole = extUser.get("UserRole");+ const _currentRole = userRole;+ const menu =+ userRole && userSettings.find((menu) => menu.role === userRole);+ if (menu) {+ const _role = _currentRole.replace("contracts_", "");+ localStorage.setItem("_user_role", _role);+ const redirectUrl =+ location?.state?.from || `/${menu.pageType}/${menu.pageId}`;+ const results = [extUser];+ const extendedInfo_stringify = JSON.stringify(results);+ localStorage.setItem("Extand_Class", extendedInfo_stringify);+ const extInfo = JSON.parse(JSON.stringify(extUser));+ localStorage.setItem("userEmail", extInfo.Email);+ localStorage.setItem("username", extInfo.Name);+ if (extInfo?.TenantId) {+ const tenant = {+ Id: extInfo?.TenantId?.objectId || "",+ Name: extInfo?.TenantId?.TenantName || ""+ };+ localStorage.setItem("TenantId", tenant?.Id);+ dispatch(showTenant(tenant?.Name));+ localStorage.setItem("TenantName", tenant?.Name);+ }+ localStorage.setItem("PageLanding", menu.pageId);+ localStorage.setItem("defaultmenuid", menu.menuId);+ localStorage.setItem("pageType", menu.pageType);+ if (isEnableSubscription) {+ const userInfo = {+ name: results[0].get("Name"),+ email: results[0].get("Email"),+ phone: results[0]?.get("Phone") || "",+ company: results[0]?.get("Company")+ };+ localStorage.setItem("userDetails", JSON.stringify(userInfo));+ const res = await fetchSubscription();+ const billingDate = res.billingDate;+ const freeplan = res.plan;+ if (freeplan === "freeplan") {+ navigate(redirectUrl);+ } else if (billingDate) {+ if (new Date(billingDate) > new Date()) {+ localStorage.removeItem("userDetails");+ // Redirect to the appropriate URL after successful login+ navigate(redirectUrl);+ } else {+ navigate(`/subscription`);+ }+ } else {+ navigate(`/subscription`);}- });- } else {- setState({ ...state, loading: false });- handleCloseModal();- setThirdpartyLoader(false);- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg:- "Does not have permissions to access this application!"- });- setTimeout(function () {- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: ""- });- }, 2000);+ } else {+ // Redirect to the appropriate URL after successful login+ navigate(redirectUrl);+ }}} else {- console.log("User Role Not Found.");- setThirdpartyLoader(false);setState({...state,loading: false,alertType: "danger",- alertMsg: "Does not have permissions to access this application!"+ alertMsg: "You don't have access, please contact the admin."});- setTimeout(function () {- setState({- ...state,- alertType: "danger",- alertMsg: ""- });+ setTimeout(() => {+ setState({ ...state, alertMsg: "" });}, 2000);+ logOutUser();}- })- .catch((err) => {- setState({ ...state, loading: false });- console.log("err", err);- });+ }+ });} catch (error) {setState({ ...state, loading: false });console.log("err", error);@@ -932,7 +545,7 @@ function Login() {}};- const handleCloseModal = () => {+ const logOutUser = () => {setIsModal(false);if (Parse?.User?.current()) {Parse.User.logOut();@@ -1132,7 +745,11 @@ function Login() {)}</div></div>- <Alert type={state.alertType}>{state.alertMsg}</Alert>+ {state.alertMsg && (+ <Alert type={state.alertType}>+ <div className="ml-3">{state.alertMsg}</div>+ </Alert>+ )}</div><ModalUi isOpen={isModal} title="Additional Info" showClose={false}><form className="px-4 py-3 text-base-content">@@ -1192,7 +809,7 @@ function Login() {<buttontype="button"className="op-btn op-btn-ghost"- onClick={handleCloseModal}+ onClick={logOutUser}>Cancel</button>diff --git a/apps/OpenSign/src/pages/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.jsindex 9f150da75..1dc2a8de6 100644--- a/apps/OpenSign/src/pages/Opensigndrive.js+++ b/apps/OpenSign/src/pages/Opensigndrive.js@@ -465,7 +465,6 @@ function Opensigndrive() {if (isDontShow) {const serverUrl = localStorage.getItem("baseUrl");const appId = localStorage.getItem("parseAppId");- const extUserClass = localStorage.getItem("extended_class");const json = JSON.parse(localStorage.getItem("Extand_Class"));const extUserId = json && json.length > 0 && json[0].objectId;let updatedTourStatus = [];@@ -483,7 +482,7 @@ function Opensigndrive() {updatedTourStatus = [{ driveTour: true }];}await axios.put(- serverUrl + "classes/" + extUserClass + "/" + extUserId,+ serverUrl + "classes/contracts_Users/" + extUserId,{TourStatus: updatedTourStatus},diff --git a/apps/OpenSign/src/pages/Pgsignup.js b/apps/OpenSign/src/pages/Pgsignup.jsindex 32aaab4f5..9180bf015 100644--- a/apps/OpenSign/src/pages/Pgsignup.js+++ b/apps/OpenSign/src/pages/Pgsignup.js@@ -207,8 +207,6 @@ const PgSignUp = () => {if (res.data) {let _user = res.data;localStorage.setItem("UserInformation", JSON.stringify(_user));- localStorage.setItem("userEmail", _user.email);- localStorage.setItem("username", _user.name);localStorage.setItem("accesstoken", _user.sessionToken);localStorage.setItem("scriptId", true);if (_user.ProfilePic) {@@ -218,179 +216,52 @@ const PgSignUp = () => {}// Check extended class user role and tenentIdtry {- let userRoles = [];- if (appInfo.settings) {- let userSettings = appInfo.settings;-- //Get Current user roles- let url = `${baseUrl}functions/UserGroups`;- const headers = {- "Content-Type": "application/json",- "X-Parse-Application-Id": parseAppId,- sessionToken: _user.sessionToken- };-- let body = { appname: "contracts" };- await axios- .post(url, JSON.stringify(body), { headers: headers })- .then((roles) => {- if (roles) {- userRoles = roles.data.result;- let _currentRole = "";- if (userRoles.length > 1) {- if (userRoles[0] === "contracts_appeditor") {- _currentRole = userRoles[1];- } else {- _currentRole = userRoles[0];- }- } else {- _currentRole = userRoles[0];- }- if (_currentRole !== "contracts_appeditor") {- userSettings.forEach(async (element) => {- if (element.role === _currentRole) {- let _role = _currentRole.replace("contracts_", "");- localStorage.setItem("_user_role", _role);- // Get TenentID from Extendend Class- localStorage.setItem(- "extended_class",- element.extended_class- );- const currentUser = Parse.User.current();- await Parse.Cloud.run("getUserDetails", {- email: currentUser.get("email")- }).then(- (result) => {- const results = [result];- let tenentInfo = [];- if (results) {- let extendedInfo_stringify =- JSON.stringify(results);- localStorage.setItem(- "Extand_Class",- extendedInfo_stringify- );- let extendedInfo = JSON.parse(- extendedInfo_stringify- );- if (extendedInfo.length > 1) {- extendedInfo.forEach((x) => {- if (x.TenantId) {- let obj = {- tenentId: x.TenantId.objectId,- tenentName: x.TenantId.TenantName || ""- };- tenentInfo.push(obj);- }- });- if (tenentInfo.length) {- dispatch(- showTenant(tenentInfo[0].tenentName || "")- );- localStorage.setItem(- "TenantName",- tenentInfo[0].tenentName || ""- );- }-- localStorage.setItem("showpopup", true);- localStorage.setItem(- "PageLanding",- element.pageId- );- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem(- "pageType",- element.pageType- );- setIsLoader(false);- navigate("/", { replace: true });- } else {- extendedInfo.forEach((x) => {- if (x.TenantId) {- let obj = {- tenentId: x.TenantId.objectId,- tenentName: x.TenantId.TenantName || ""- };- localStorage.setItem(- "TenantId",- x.TenantId.objectId- );- tenentInfo.push(obj);- }- });- if (tenentInfo.length) {- dispatch(- showTenant(tenentInfo[0].tenentName || "")- );- localStorage.setItem(- "TenantName",- tenentInfo[0].tenentName || ""- );- }- localStorage.setItem(- "PageLanding",- element.pageId- );- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem(- "pageType",- element.pageType- );- setIsLoader(false);- alert("Registered user successfully");- const redirectUrl =- location?.state?.from ||- `/${element.pageType}/${element.pageId}`;-- // Redirect to the appropriate URL after successful login- navigate(redirectUrl);- }- } else {- alert("Registered user successfully");- localStorage.setItem("PageLanding", element.pageId);- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem("pageType", element.pageType);- setIsLoader(false);- const redirectUrl =- location?.state?.from ||- `/${element.pageType}/${element.pageId}`;-- // Redirect to the appropriate URL after successful login- navigate(redirectUrl);- }- },- (error) => {- setIsLoader(false);- console.error("Error while fetching Follow", error);- }- );- }- });- } else {- setIsLoader(false);- }- } else {- setIsLoader(false);+ const userSettings = appInfo.settings;+ const currentUser = Parse.User.current();+ const extUser = await Parse.Cloud.run("getUserDetails", {+ email: currentUser.get("email")+ });+ if (extUser) {+ const IsDisabled = extUser?.get("IsDisabled") || false;+ if (!IsDisabled) {+ const userRole = extUser?.get("UserRole");+ const menu =+ userRole && userSettings.find((menu) => menu.role === userRole);+ if (menu) {+ const _currentRole = userRole;+ const _role = _currentRole.replace("contracts_", "");+ localStorage.setItem("_user_role", _role);+ const extInfo_stringify = JSON.stringify([extUser]);+ localStorage.setItem("Extand_Class", extInfo_stringify);+ const extInfo = JSON.parse(JSON.stringify(extUser));+ localStorage.setItem("userEmail", extInfo?.Email);+ localStorage.setItem("username", extInfo?.Name);+ if (extInfo?.TenantId) {+ const tenant = {+ Id: extInfo?.TenantId?.objectId || "",+ Name: extInfo?.TenantId?.TenantName || ""+ };+ localStorage.setItem("TenantId", tenant?.Id);+ dispatch(showTenant(tenant?.Name));+ localStorage.setItem("TenantName", tenant?.Name);}- })- .catch((err) => {- console.log("err", err);+ localStorage.setItem("PageLanding", menu.pageId);+ localStorage.setItem("defaultmenuid", menu.menuId);+ localStorage.setItem("pageType", menu.pageType);setIsLoader(false);- });+ alert("Registered user successfully");+ const redirectUrl =+ location?.state?.from || `/${menu.pageType}/${menu.pageId}`;+ // Redirect to the appropriate URL after successful login+ navigate(redirectUrl);+ }+ } else {+ setIsLoader(false);+ }}} catch (error) {setIsLoader(false);- console.log(error);+ console.log("Err in fetch extuser", error);}}};diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.jsindex f42f706d4..29aadebcb 100644--- a/apps/OpenSign/src/pages/PlaceHolderSign.js+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js@@ -1542,7 +1542,6 @@ function PlaceHolderSign() {const closeTour = async () => {setPlaceholderTour(false);if (isDontShow) {- const extUserClass = localStorage.getItem("extended_class");let updatedTourStatus = [];if (tourStatus.length > 0) {updatedTourStatus = [...tourStatus];@@ -1561,7 +1560,7 @@ function PlaceHolderSign() {.put(`${localStorage.getItem("baseUrl"- )}classes/${extUserClass}/${signerUserId}`,+ )}classes/contracts_Users/${signerUserId}`,{TourStatus: updatedTourStatus},diff --git a/apps/OpenSign/src/pages/SSOVerify.js b/apps/OpenSign/src/pages/SSOVerify.jsindex 51c3a0b64..0d7dacfac 100644--- a/apps/OpenSign/src/pages/SSOVerify.js+++ b/apps/OpenSign/src/pages/SSOVerify.js@@ -1,7 +1,6 @@import React, { useEffect, useState } from "react";import { useLocation, useNavigate } from "react-router-dom";import Parse from "parse";-import axios from "axios";import { appInfo } from "../constant/appinfo";import { isEnableSubscription } from "../constant/const";import { fetchSubscription } from "../constant/Utils";@@ -136,8 +135,6 @@ const SSOVerify = () => {};// `thirdpartyLoginfn` is used to save necessary parameters locally for the logged-in userconst thirdpartyLoginfn = async (sessionToken) => {- const baseUrl = localStorage.getItem("baseUrl");- const parseAppId = localStorage.getItem("parseAppId");try {const validUser = await Parse.User.become(sessionToken);if (validUser) {@@ -151,76 +148,44 @@ const SSOVerify = () => {}// Check extended class user role and tenentIdtry {- let userRoles = [];const userSettings = appInfo.settings;- //Get Current user roles- const url = `${baseUrl}functions/UserGroups`;- const headers = {- "Content-Type": "application/json",- "X-Parse-Application-Id": parseAppId,- sessionToken: _user.sessionToken- };- const body = { appname: "contracts" };- const UserGroupsRes = await axios.post(url, JSON.stringify(body), {- headers: headers- });- userRoles = (UserGroupsRes.data && UserGroupsRes.data.result) || [];- if (userRoles) {- let _currentRole = "";- const excludeRoles = ["contracts_Guest", `contracts_appeditor`];- const filteredRole = userRoles.filter(- (x) => !excludeRoles.includes(x)- );- if (filteredRole?.length > 1) {- console.log("user has two roles");- // _currentRole = filteredRole.filter((x) => x === "contracts_User");- } else {- _currentRole = filteredRole?.[0] || "";- }- if (_currentRole) {- const roleSetting = userSettings?.find(- (setting) => setting.role === _currentRole- );- const redirectUrl =- location?.state?.from ||- `/${roleSetting.pageType}/${roleSetting.pageId}`;- const _role = _currentRole.replace("contracts_", "");- localStorage.setItem("_user_role", _role);- // Get TenentID from Extendend Class- localStorage.setItem(- "extended_class",- roleSetting.extended_class- );- try {- const extUser = await Parse.Cloud.run("getUserDetails", {- email: _user.email- });- if (extUser) {- const _extUser = JSON.parse(JSON.stringify(extUser));- localStorage.setItem("userEmail", _extUser.Email);- localStorage.setItem("username", _extUser.Name);- localStorage.setItem("scriptId", true);- let tenentInfo = [];- const results = [extUser];- if (results) {- let extendedInfo_stringify = JSON.stringify(results);- localStorage.setItem(- "Extand_Class",- extendedInfo_stringify- );+ const currentUser = Parse.User.current();+ await Parse.Cloud.run("getUserDetails", {+ email: currentUser.get("email")+ })+ .then(async (extUser) => {+ if (extUser) {+ const IsDisabled = extUser?.get("IsDisabled") || false;+ if (!IsDisabled) {+ const userRole = extUser?.get("UserRole");+ const menu =+ userRole &&+ userSettings.find((menu) => menu.role === userRole);+ if (menu) {+ const _currentRole = userRole;+ const redirectUrl =+ location?.state?.from ||+ `/${menu.pageType}/${menu.pageId}`;+ const _role = _currentRole.replace("contracts_", "");+ localStorage.setItem("_user_role", _role);+ const extUser_stringify = JSON.stringify([extUser]);+ localStorage.setItem("Extand_Class", extUser_stringify);+ const _extUser = JSON.parse(JSON.stringify(extUser));+ localStorage.setItem("userEmail", _extUser.Email);+ localStorage.setItem("username", _extUser.Name);+ localStorage.setItem("scriptId", true);if (_extUser.TenantId) {- const obj = {- tenentId: _extUser.TenantId.objectId,- tenentName: _extUser.TenantId.TenantName || ""+ const tenant = {+ Id: _extUser?.TenantId?.objectId || "",+ Name: _extUser?.TenantId?.TenantName || ""};- localStorage.setItem("TenantId", obj.tenentId);- tenentInfo.push(obj);- dispatch(showTenant(obj.tenentName || ""));- localStorage.setItem("TenantName", obj.tenentName || "");+ localStorage.setItem("TenantId", tenant?.Id);+ dispatch(showTenant(tenant?.Name));+ localStorage.setItem("TenantName", tenant?.Name);}- localStorage.setItem("PageLanding", roleSetting.pageId);- localStorage.setItem("defaultmenuid", roleSetting.menuId);- localStorage.setItem("pageType", roleSetting.pageType);+ localStorage.setItem("PageLanding", menu.pageId);+ localStorage.setItem("defaultmenuid", menu.menuId);+ localStorage.setItem("pageType", menu.pageType);if (isEnableSubscription) {const res = await fetchSubscription();const plan = res.plan;@@ -232,33 +197,30 @@ const SSOVerify = () => {localStorage.removeItem("userDetails");navigate(redirectUrl);} else {- navigate(`/subscription`, {- replace: true- });+ navigate(`/subscription`, { replace: true });}} else {- navigate(`/subscription`, {- replace: true- });+ navigate(`/subscription`, { replace: true });}} else {navigate(redirectUrl);}}+ } else {+ alert(+ "Error: You don't have access, please contact the admin."+ );+ setMessage(+ "Error: You don't have access, please contact the admin."+ );}- } catch (err) {- alert("user not exist.");- setMessage("Error: User not exist.");- console.log("err in get extUser", err);}- } else {- alert("Role does not exists.");- setMessage("Error: Role does not exists.");- }- } else {- alert("Role does not exists.");- setMessage("Error: Role does not exists.");- }+ })+ .catch((error) => {+ console.error("Err in fetch extuser", error);+ alert("user not exist.");+ setMessage("Error: User not exist.");+ });} catch (err) {console.log("err in usergroups", err);}diff --git a/apps/OpenSign/src/pages/Signup.js b/apps/OpenSign/src/pages/Signup.jsindex 0471bba29..cf204d4fe 100644--- a/apps/OpenSign/src/pages/Signup.js+++ b/apps/OpenSign/src/pages/Signup.js@@ -182,8 +182,6 @@ const Signup = () => {if (res.data) {let _user = res.data;localStorage.setItem("UserInformation", JSON.stringify(_user));- localStorage.setItem("userEmail", _user.email);- localStorage.setItem("username", _user.name);localStorage.setItem("accesstoken", _user.sessionToken);localStorage.setItem("scriptId", true);if (_user.ProfilePic) {@@ -193,241 +191,84 @@ const Signup = () => {}// Check extended class user role and tenentIdtry {- let userRoles = [];- if (appInfo.settings) {- let userSettings = appInfo.settings;-- //Get Current user roles- let url = `${baseUrl}functions/UserGroups`;- const headers = {- "Content-Type": "application/json",- "X-Parse-Application-Id": parseAppId,- sessionToken: _user.sessionToken- };-- let body = { appname: "contracts" };- await axios- .post(url, JSON.stringify(body), { headers: headers })- .then((roles) => {- if (roles) {- userRoles = roles.data.result;- let _currentRole = "";- if (userRoles.length > 1) {- if (userRoles[0] === "contracts_appeditor") {- _currentRole = userRoles[1];- } else {- _currentRole = userRoles[0];+ const userSettings = appInfo.settings;+ const currentUser = Parse.User.current();+ await Parse.Cloud.run("getUserDetails", {+ email: currentUser.get("email")+ })+ .then(async (extUser) => {+ if (extUser) {+ const IsDisabled = extUser?.get("IsDisabled") || false;+ if (!IsDisabled) {+ const userRole = extUser?.get("UserRole");+ const menu =+ userRole &&+ userSettings.find((menu) => menu.role === userRole);+ if (menu) {+ const _currentRole = userRole;+ const _role = _currentRole.replace("contracts_", "");+ localStorage.setItem("_user_role", _role);+ const extInfo_stringify = JSON.stringify([extUser]);+ localStorage.setItem("Extand_Class", extInfo_stringify);+ const extInfo = JSON.parse(JSON.stringify(extUser));+ localStorage.setItem("userEmail", extInfo?.Email);+ localStorage.setItem("username", extInfo?.Name);+ if (extInfo?.TenantId) {+ const tenant = {+ Id: extInfo?.TenantId?.objectId || "",+ Name: extInfo?.TenantId?.TenantName || ""+ };+ localStorage.setItem("TenantId", tenant?.Id);+ dispatch(showTenant(tenant?.Name));+ localStorage.setItem("TenantName", tenant?.Name);}- } else {- _currentRole = userRoles[0];- }- if (_currentRole !== "contracts_appeditor") {- userSettings.forEach(async (element) => {- if (element.role === _currentRole) {- let _role = _currentRole.replace("contracts_", "");- localStorage.setItem("_user_role", _role);- // Get TenentID from Extendend Class- localStorage.setItem(- "extended_class",- element.extended_class- );- await Parse.Cloud.run("getUserDetails", {- email: email- }).then(- (result) => {- let tenentInfo = [];- const results = [result];- if (results) {- let extendedInfo_stringify =- JSON.stringify(results);- localStorage.setItem(- "Extand_Class",- extendedInfo_stringify- );- let extendedInfo = JSON.parse(- extendedInfo_stringify- );- if (extendedInfo.length > 1) {- extendedInfo.forEach((x) => {- if (x.TenantId) {- let obj = {- tenentId: x.TenantId.objectId,- tenentName: x.TenantId.TenantName || ""- };- tenentInfo.push(obj);- }- });- if (tenentInfo.length) {- dispatch(- showTenant(tenentInfo[0].tenentName || "")- );- localStorage.setItem(- "TenantName",- tenentInfo[0].tenentName || ""- );- }-- localStorage.setItem("showpopup", true);- localStorage.setItem(- "IncludedApps",- JSON.stringify(tenentInfo)- );-- localStorage.setItem(- "PageLanding",- element.pageId- );- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem(- "pageType",- element.pageType- );- setState({ loading: false });- navigate("/");- } else {- extendedInfo.forEach((x) => {- if (x.TenantId) {- let obj = {- tenentId: x.TenantId.objectId,- tenentName: x.TenantId.TenantName || ""- };- localStorage.setItem(- "TenantId",- x.TenantId.objectId- );- tenentInfo.push(obj);- }- });- if (tenentInfo.length) {- dispatch(- showTenant(tenentInfo[0].tenentName || "")- );- localStorage.setItem(- "TenantName",- tenentInfo[0].tenentName || ""- );- }- localStorage.setItem(- "PageLanding",- element.pageId- );- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem(- "pageType",- element.pageType- );- setState({ loading: false });- if (isEnableSubscription) {- if (isFreeplan) {- navigate(- `/${element.pageType}/${element.pageId}`- );- } else {- navigate(`/subscription`, { replace: true });- }- } else {- alert("Registered user successfully");- navigate(- `/${element.pageType}/${element.pageId}`- );- }- }- } else {- alert("Registered user successfully");- localStorage.setItem("PageLanding", element.pageId);- localStorage.setItem(- "defaultmenuid",- element.menuId- );- localStorage.setItem("pageType", element.pageType);- setState({ loading: false });- if (isEnableSubscription) {- if (isFreeplan) {- navigate(- `/${element.pageType}/${element.pageId}`- );- } else {- navigate(`/subscription`, { replace: true });- }- } else {- navigate(- `/${element.pageType}/${element.pageId}`- );- }- }- },- (error) => {- setState({- loading: false,- alertType: "danger",- alertMsg:- "You dont have access to this application!"- });- setTimeout(function () {- setState({- loading: false,- alertType: "danger",- alertMsg: ""- });- }, 2000);- localStorage.setItem("accesstoken", null);- console.error("Error while fetching Follow", error);- }- );+ localStorage.setItem("PageLanding", menu.pageId);+ localStorage.setItem("defaultmenuid", menu.menuId);+ localStorage.setItem("pageType", menu.pageType);+ setState({ loading: false });+ if (isEnableSubscription) {+ if (isFreeplan) {+ navigate(`/${menu.pageType}/${menu.pageId}`);+ } else {+ navigate(`/subscription`, { replace: true });}- });+ } else {+ alert("Registered user successfully");+ navigate(`/${menu.pageType}/${menu.pageId}`);+ }} else {setState({loading: false,alertType: "danger",- alertMsg: "User Role Not Found!"+ alertMsg: "Role not found."});- setTimeout(function () {- setState({- loading: false,- alertType: "danger",- alertMsg: ""- });+ setTimeout(() => {+ setState({ loading: false, alertMsg: "" });}, 2000);}} else {setState({loading: false,alertType: "danger",- alertMsg: "User Role Not Found!"+ alertMsg: "You don't have access, please contact the admin."});- setTimeout(function () {- setState({- loading: false,- alertType: "danger",- alertMsg: ""- });+ setTimeout(() => {+ setState({ loading: false, alertMsg: "" });}, 2000);}- })- .catch((err) => {- console.log("err", err);- setState({- loading: false,- alertType: "danger",- alertMsg:- "Does not have permissions to access this application!"- });- setTimeout(function () {- setState({- loading: false,- alertType: "danger",- alertMsg: ""- });- }, 2000);+ }+ })+ .catch((error) => {+ console.log("error in fetch extuser", error);+ setState({+ loading: false,+ alertType: "danger",+ alertMsg: "You don't have access, please contact the admin."});- }+ setTimeout(() => {+ setState({ loading: false, alertMsg: "" });+ }, 2000);+ });} catch (error) {// alert(`${error.message}`);setState({@@ -435,12 +276,8 @@ const Signup = () => {alertType: "danger",alertMsg: `${error.message}`});- setTimeout(function () {- setState({- loading: false,- alertType: "danger",- alertMsg: ""- });+ setTimeout(() => {+ setState({ loading: false, alertMsg: "" });}, 2000);console.log(error);}diff --git a/apps/OpenSign/src/pages/TeamList.js b/apps/OpenSign/src/pages/TeamList.jsindex 5820e6729..73e135b0b 100644--- a/apps/OpenSign/src/pages/TeamList.js+++ b/apps/OpenSign/src/pages/TeamList.js@@ -163,8 +163,8 @@ const TeamList = () => {teamCls.set("IsActive", !IsActive);await teamCls.save();setIsAlert({- type: "success",- msg: "Team disabled successfully."+ type: !IsActive === false ? "danger" : "success",+ msg: !IsActive === false ? "Team disabled." : "Team enabled."});} catch (err) {setIsAlert({ type: "danger", msg: "something went wrong." });@@ -281,8 +281,9 @@ const TeamList = () => {><div className="m-[20px]"><div className="text-lg font-normal text-black">- Are you sure you want to disable this- team?+ Are you sure you want to{" "}+ {item?.IsActive ? "disable" : "enable"}{" "}+ this team?</div><hr className="bg-[#ccc] mt-4 " /><div className="flex items-center mt-3 gap-2 text-white">diff --git a/apps/OpenSign/src/pages/TemplatePlaceholder.js b/apps/OpenSign/src/pages/TemplatePlaceholder.jsindex bf96da429..d73b27426 100644--- a/apps/OpenSign/src/pages/TemplatePlaceholder.js+++ b/apps/OpenSign/src/pages/TemplatePlaceholder.js@@ -851,7 +851,6 @@ const TemplatePlaceholder = () => {const closeTour = async () => {setTemplateTour(false);if (isDontShow) {- const extUserClass = localStorage.getItem("extended_class");let updatedTourStatus = [];if (tourStatus.length > 0) {updatedTourStatus = [...tourStatus];@@ -870,7 +869,7 @@ const TemplatePlaceholder = () => {.put(`${localStorage.getItem("baseUrl"- )}classes/${extUserClass}/${signerUserId}`,+ )}classes/contracts_Users/${signerUserId}`,{TourStatus: updatedTourStatus},diff --git a/apps/OpenSign/src/pages/UserList.js b/apps/OpenSign/src/pages/UserList.jsindex aad0af541..044e21b4a 100644--- a/apps/OpenSign/src/pages/UserList.js+++ b/apps/OpenSign/src/pages/UserList.js@@ -152,8 +152,8 @@ const UserList = () => {extUser.set("IsDisabled", !IsDisabled);await extUser.save();setIsAlert({- type: "success",- msg: "User disabled successfully."+ type: !IsDisabled === true ? "danger" : "success",+ msg: !IsDisabled === true ? "User deactivated." : "User activated."});} catch (err) {setIsAlert({ type: "danger", msg: "something went wrong." });@@ -245,8 +245,11 @@ const UserList = () => {><div className="m-[20px]"><div className="text-lg font-normal text-black">- Are you sure you want to deactivate this- user?+ Are you sure you want to{" "}+ {item?.IsDisabled+ ? "activate"+ : "deactivate"}{" "}+ this user?</div><hr className="bg-[#ccc] mt-4 " /><div className="flex items-center mt-3 gap-2 text-white">diff --git a/apps/OpenSign/src/pages/UserProfile.js b/apps/OpenSign/src/pages/UserProfile.jsindex a4099b446..fc81cc5dd 100644--- a/apps/OpenSign/src/pages/UserProfile.js+++ b/apps/OpenSign/src/pages/UserProfile.js@@ -155,7 +155,6 @@ function UserProfile() {// `updateExtUser` is used to update user details in extended classconst updateExtUser = async (obj) => {- const extClass = localStorage.getItem("extended_class");const extData = JSON.parse(localStorage.getItem("Extand_Class"));const ExtUserId = extData[0].objectId;const body = {@@ -168,7 +167,7 @@ function UserProfile() {};await axios.put(- parseBaseUrl + "classes/" + extClass + "/" + ExtUserId,+ parseBaseUrl + "classes/contracts_Users/" + ExtUserId,body,{headers: {diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.jsindex 04293e86c..12f421681 100644--- a/apps/OpenSign/src/primitives/GetReportDisplay.js+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js@@ -568,7 +568,6 @@ const ReportTable = (props) => {if (props.isDontShow) {const serverUrl = localStorage.getItem("baseUrl");const appId = localStorage.getItem("parseAppId");- const extUserClass = localStorage.getItem("extended_class");const json = JSON.parse(localStorage.getItem("Extand_Class"));const extUserId = json && json.length > 0 && json[0].objectId;// console.log("extUserId ", extUserId)@@ -589,7 +588,7 @@ const ReportTable = (props) => {}await axios.put(- serverUrl + "classes/" + extUserClass + "/" + extUserId,+ serverUrl + "classes/contracts_Users/" + extUserId,{TourStatus: updatedTourStatus},