From 95516ce9daacec4d9c2e14ff95a15017b4b6de4b Mon Sep 17 00:00:00 2001 From: prafullnavkar-nxg Date: Sun, 22 Oct 2023 22:06:37 +0530 Subject: [PATCH] add validation for subscription routes --- apps/OpenSign/package-lock.json | 16 --- apps/OpenSign/src/App.js | 12 +- apps/OpenSign/src/routes/Login.js | 196 ++++------------------------- apps/OpenSign/src/routes/Signup.js | 56 ++------- 4 files changed, 45 insertions(+), 235 deletions(-) diff --git a/apps/OpenSign/package-lock.json b/apps/OpenSign/package-lock.json index cb8b60236b..817014b2ec 100644 --- a/apps/OpenSign/package-lock.json +++ b/apps/OpenSign/package-lock.json @@ -49,7 +49,6 @@ "eslint": "^8.51.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.33.2", - "husky": "^8.0.3", "lint-staged": "^15.0.1", "postcss": "^8.4.31", "prettier": "^2.8.0", @@ -10198,21 +10197,6 @@ "node": ">=10.17.0" } }, - "node_modules/husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", - "dev": true, - "bin": { - "husky": "lib/bin.js" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/typicode" - } - }, "node_modules/iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", diff --git a/apps/OpenSign/src/App.js b/apps/OpenSign/src/App.js index 0e01db6d91..2d42dbe398 100644 --- a/apps/OpenSign/src/App.js +++ b/apps/OpenSign/src/App.js @@ -59,9 +59,17 @@ function App() { } /> } /> - } /> } /> - } /> + {process.env.REACT_APP_ENABLE_SUBSCRIPTION && ( + <> + } /> + } + /> + + )} { - try { - let data = { - accesstoken: localStorage.getItem("accesstoken"), - baseUrl: localStorage.getItem("baseUrl"), - parseAppId: localStorage.getItem("parseAppId"), - extended_class: localStorage.getItem("extended_class"), - extend_details: localStorage.getItem("Extand_Class"), - userSettings: localStorage.getItem("userSettings"), - username: localStorage.getItem("username"), - _appName: localStorage.getItem("_appName"), - TenetId: localStorage.getItem("TenetId") - }; - let storage = JSON.stringify({ - key: "storage", - method: "set", - data: data - }); - var iframe = document.getElementById("def_iframe"); - iframe.contentWindow.postMessage(storage, "*"); - setTimeout(() => { - ; - }, 4000); - } catch (error) { - console.log(error); - } - }; - handleSubmit = async (event) => { event.preventDefault(); const { email, password } = this.state; @@ -145,16 +117,6 @@ class Login extends Component { "" ); localStorage.setItem("_user_role", _role); - - if (element.enableCart) { - localStorage.setItem( - "EnableCart", - element.enableCart - ); - this.props.setEnableCart(element.enableCart); - } else { - localStorage.removeItem("EnableCart"); - } // Get TenentID from Extendend Class localStorage.setItem( "extended_class", @@ -225,7 +187,7 @@ class Login extends Component { element.pageType ); this.setState({ loading: false }); - return ; + window.location = "/"; } else { extendedInfo.forEach((x) => { if (x.TenantId) { @@ -264,8 +226,8 @@ class Login extends Component { ); this.setState({ loading: false }); if ( - localStorage.getItem("domain") === - "contracts" + process.env + .REACT_APP_ENABLE_SUBSCRIPTION ) { const LocalUserDetails = { name: results[0].get("Name"), @@ -285,39 +247,16 @@ class Login extends Component { localStorage.removeItem( "userDetails" ); - if ( - element.pageType === "microapp" - ) { - this.setLocalIframe( - element.pageId - ); - } else { - return ( - - ); - } + + window.location = `/${element.pageType}/${element.pageId}`; } else { - return ( - - ); + window.location = `/subscription`; } } else { - return ( - - ); + window.location = `/subscription`; } } else { - if (element.pageType === "microapp") { - this.setLocalIframe(element.pageId); - } else { - return ( - - ); - } + window.location = `/${element.pageType}/${element.pageId}`; } } } else { @@ -335,8 +274,7 @@ class Login extends Component { ); this.setState({ loading: false }); if ( - localStorage.getItem("domain") === - "contracts" + process.env.REACT_APP_ENABLE_SUBSCRIPTION ) { const LocalUserDetails = { name: _user.name, @@ -350,20 +288,10 @@ class Login extends Component { ); const billingDate = ""; if (billingDate) { - return ( - - ); + window.location = `/subscription`; } } else { - if (element.pageType === "microapp") { - this.setLocalIframe(element.pageId); - } else { - return ( - - ); - } + window.location = `/${element.pageType}/${element.pageId}`; } } }, @@ -569,12 +497,6 @@ class Login extends Component { ); localStorage.setItem("_user_role", _role); - if (element.enableCart) { - localStorage.setItem("EnableCart", element.enableCart); - this.props.setEnableCart(element.enableCart); - } else { - localStorage.removeItem("EnableCart"); - } // Get TenentID from Extendend Class localStorage.setItem( "extended_class", @@ -641,7 +563,7 @@ class Login extends Component { ); this.setThirdpartyLoader(false); this.setState({ loading: false }); - return ; + window.location = "/"; } else { extendedInfo.forEach((x) => { if (x.TenantId) { @@ -682,28 +604,12 @@ class Login extends Component { if (billingDate) { if (billingDate > new Date()) { localStorage.removeItem("userDetails"); - if (element.pageType === "microapp") { - this.setLocalIframe(element.pageId); - } else { - return ( - - ); - } + window.location = `/${element.pageType}/${element.pageId}`; } else { - return ( - - ); + window.location = `/subscription`; } } else { - return ( - - ); + window.location = `/subscription`; } } } else { @@ -718,28 +624,13 @@ class Login extends Component { if (billingDate) { if (billingDate > new Date()) { localStorage.removeItem("userDetails"); - if (element.pageType === "microapp") { - this.setLocalIframe(element.pageId); - } else { - return ( - - ); - } + + window.location = `/${element.pageType}/${element.pageId}`; } else { - return ( - - ); + window.location = `/subscription`; } } else { - return ( - - ); + window.location = `/subscription`; } } }, @@ -909,15 +800,6 @@ class Login extends Component { ); localStorage.setItem("_user_role", _role); - if (element.enableCart) { - localStorage.setItem( - "EnableCart", - element.enableCart - ); - this.props.setEnableCart(element.enableCart); - } else { - localStorage.removeItem("EnableCart"); - } // Get TenentID from Extendend Class localStorage.setItem( "extended_class", @@ -968,7 +850,7 @@ class Login extends Component { "pageType", element.pageType ); - return ; + window.location = `/`; } else { extendedInfo.forEach((x) => { if (x.TenantId) { @@ -995,16 +877,7 @@ class Login extends Component { "pageType", element.pageType ); - localStorage.removeItem("SwitcherApp"); - if (element.pageType === "microapp") { - this.setLocalIframe(element.pageId); - } else { - return ( - - ); - } + window.location = `/${element.pageType}/${element.pageId}`; } } else { localStorage.setItem( @@ -1019,16 +892,7 @@ class Login extends Component { "pageType", element.pageType ); - localStorage.removeItem("SwitcherApp"); - if (element.pageType === "microapp") { - this.setLocalIframe(element.pageId); - } else { - return ( - - ); - } + window.location = `/${element.pageType}/${element.pageId}`; } }, (error) => { @@ -1139,14 +1003,10 @@ class Login extends Component { localStorage.getItem("accesstoken") && localStorage.getItem("pageType") ) { - if (localStorage.getItem("pageType") === "microapp") { - this.setLocalIframe(localStorage.getItem("PageLanding")); - } else { - let _redirect = `/${localStorage.getItem( - "pageType" - )}/${localStorage.getItem("PageLanding")}`; - return ; - } + let _redirect = `/${localStorage.getItem( + "pageType" + )}/${localStorage.getItem("PageLanding")}`; + return ; } const { email, password } = this.state; @@ -1226,7 +1086,6 @@ class Login extends Component {
- {/* Forgot Password ? */} Forgot Password ? @@ -1409,6 +1268,5 @@ const mapStateToProps = (state) => { export default connect(mapStateToProps, { fetchAppInfo, - setEnableCart, showTenantName })(Login); diff --git a/apps/OpenSign/src/routes/Signup.js b/apps/OpenSign/src/routes/Signup.js index 51567247a2..e414d98dcb 100644 --- a/apps/OpenSign/src/routes/Signup.js +++ b/apps/OpenSign/src/routes/Signup.js @@ -109,33 +109,6 @@ const Signup = (props) => { } }; - const setLocalIframe = (iframeUrl) => { - try { - let data = { - accesstoken: localStorage.getItem("accesstoken"), - baseUrl: localStorage.getItem("baseUrl"), - parseAppId: localStorage.getItem("parseAppId"), - extended_class: localStorage.getItem("extended_class"), - extend_details: localStorage.getItem("Extand_Class"), - userSettings: localStorage.getItem("userSettings"), - username: localStorage.getItem("username"), - _appName: localStorage.getItem("_appName"), - TenetId: localStorage.getItem("TenetId") - }; - let storage = JSON.stringify({ - key: "storage", - method: "set", - data: data - }); - var iframe = document.getElementById("def_iframe"); - iframe.contentWindow.postMessage(storage, "*"); - setTimeout(() => { - navigate(`/microapp/${iframeUrl}`); - }, 4000); - } catch (error) { - console.log(error); - } - }; const handleNavigation = async (sessionToken) => { const baseUrl = localStorage.getItem("BaseUrl12"); const parseAppId = localStorage.getItem("AppID12"); @@ -316,19 +289,13 @@ const Signup = (props) => { element.pageType ); setState({ loading: false }); - if ( - localStorage.getItem("domain") === "contracts" - ) { + if (process.env.REACT_APP_ENABLE_SUBSCRIPTION) { navigate("/subscription"); } else { alert("Registered user successfully"); - if (element.pageType === "microapp") { - setLocalIframe(element.pageId); - } else { - navigate( - `/${element.pageType}/${element.pageId}` - ); - } + navigate( + `/${element.pageType}/${element.pageId}` + ); } } } else { @@ -340,19 +307,12 @@ const Signup = (props) => { ); localStorage.setItem("pageType", element.pageType); setState({ loading: false }); - - if ( - localStorage.getItem("domain") === "contracts" - ) { + if (process.env.REACT_APP_ENABLE_SUBSCRIPTION) { navigate("/subscription"); } else { - if (element.pageType === "microapp") { - setLocalIframe(element.pageId); - } else { - navigate( - `/${element.pageType}/${element.pageId}` - ); - } + navigate( + `/${element.pageType}/${element.pageId}` + ); } } },