Skip to content

add validation for subscription routes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nxglabs merged 1 commit into from
Oct 22, 2023
Merged

add validation for subscription routes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions apps/OpenSign/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions apps/OpenSign/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,17 @@ function App() {
<Routes>
<Route exact path="/" element={<Login />} />
<Route exact path="/signup" element={<Signup />} />
<Route exact path="/pgsignup" element={<Pgsignup />} />
<Route exact path="/forgetpassword" element={<ForgetPassword />} />
<Route exact path="/subscription" element={<PlanSubscriptions />} />
{process.env.REACT_APP_ENABLE_SUBSCRIPTION && (
<>
<Route exact path="/pgsignup" element={<Pgsignup />} />
<Route
exact
path="/subscription"
element={<PlanSubscriptions />}
/>
</>
)}
<Route
exact
path="/changepassword"
Expand Down
196 changes: 27 additions & 169 deletions apps/OpenSign/src/routes/Login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Parse from "parse";
import "../styles/toast.css";
import "../styles/loader.css";
import { connect } from "react-redux";
import { fetchAppInfo, setEnableCart, showTenantName } from "../redux/actions";
import { fetchAppInfo, showTenantName } from "../redux/actions";
import axios from "axios";
import Title from "../components/Title";
import GoogleSignInBtn from "../components/LoginGoogle";
Expand Down Expand Up @@ -43,34 +43,6 @@ class Login extends Component {
}
};

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 to={`/microapp/${iframeUrl}`} />;
}, 4000);
} catch (error) {
console.log(error);
}
};

handleSubmit = async (event) => {
event.preventDefault();
const { email, password } = this.state;
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -225,7 +187,7 @@ class Login extends Component {
element.pageType
);
this.setState({ loading: false });
return <Navigate to={`/`} />;
window.location = "/";
} else {
extendedInfo.forEach((x) => {
if (x.TenantId) {
Expand Down Expand Up @@ -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"),
Expand All @@ -285,39 +247,16 @@ class Login extends Component {
localStorage.removeItem(
"userDetails"
);
if (
element.pageType === "microapp"
) {
this.setLocalIframe(
element.pageId
);
} else {
return (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
}

window.location = `/${element.pageType}/${element.pageId}`;
} else {
return (
<Navigate to={`/subscription`} />
);
window.location = `/subscription`;
}
} else {
return (
<Navigate to={`/subscription`} />
);
window.location = `/subscription`;
}
} else {
if (element.pageType === "microapp") {
this.setLocalIframe(element.pageId);
} else {
return (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
}
window.location = `/${element.pageType}/${element.pageId}`;
}
}
} else {
Expand All @@ -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,
Expand All @@ -350,20 +288,10 @@ class Login extends Component {
);
const billingDate = "";
if (billingDate) {
return (
<Navigate to={`/subscription`} />
);
window.location = `/subscription`;
}
} else {
if (element.pageType === "microapp") {
this.setLocalIframe(element.pageId);
} else {
return (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
}
window.location = `/${element.pageType}/${element.pageId}`;
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -641,7 +563,7 @@ class Login extends Component {
);
this.setThirdpartyLoader(false);
this.setState({ loading: false });
return <Navigate to={`/login`} />;
window.location = "/";
} else {
extendedInfo.forEach((x) => {
if (x.TenantId) {
Expand Down Expand Up @@ -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 (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
}
window.location = `/${element.pageType}/${element.pageId}`;
} else {
return (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
window.location = `/subscription`;
}
} else {
return (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
window.location = `/subscription`;
}
}
} else {
Expand All @@ -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 (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
}

window.location = `/${element.pageType}/${element.pageId}`;
} else {
return (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
window.location = `/subscription`;
}
} else {
return (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
window.location = `/subscription`;
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -968,7 +850,7 @@ class Login extends Component {
"pageType",
element.pageType
);
return <Navigate to={`/login`} />;
window.location = `/`;
} else {
extendedInfo.forEach((x) => {
if (x.TenantId) {
Expand All @@ -995,16 +877,7 @@ class Login extends Component {
"pageType",
element.pageType
);
localStorage.removeItem("SwitcherApp");
if (element.pageType === "microapp") {
this.setLocalIframe(element.pageId);
} else {
return (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
}
window.location = `/${element.pageType}/${element.pageId}`;
}
} else {
localStorage.setItem(
Expand All @@ -1019,16 +892,7 @@ class Login extends Component {
"pageType",
element.pageType
);
localStorage.removeItem("SwitcherApp");
if (element.pageType === "microapp") {
this.setLocalIframe(element.pageId);
} else {
return (
<Navigate
to={`/${element.pageType}/${element.pageId}`}
/>
);
}
window.location = `/${element.pageType}/${element.pageId}`;
}
},
(error) => {
Expand Down Expand Up @@ -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 <Navigate to={_redirect} />;
}
let _redirect = `/${localStorage.getItem(
"pageType"
)}/${localStorage.getItem("PageLanding")}`;
return <Navigate to={_redirect} />;
}

const { email, password } = this.state;
Expand Down Expand Up @@ -1226,7 +1086,6 @@ class Login extends Component {
</div>
<div>
<span className="text-[13px]">
{/* <a href="/ForgotPassword" >Forgot Password ?</a></span> */}
<NavLink to={`/forgetpassword`}>
Forgot Password ?
</NavLink>
Expand Down Expand Up @@ -1409,6 +1268,5 @@ const mapStateToProps = (state) => {

export default connect(mapStateToProps, {
fetchAppInfo,
setEnableCart,
showTenantName
})(Login);
Loading