From 300577706ad8879481c1d1de311e48cb198b959e Mon Sep 17 00:00:00 2001 From: srgooglo Date: Sat, 15 Oct 2022 17:04:52 +0200 Subject: [PATCH] improve public routes parser --- packages/app/src/layout.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/app/src/layout.jsx b/packages/app/src/layout.jsx index 3e2198c2..b43ba3f6 100755 --- a/packages/app/src/layout.jsx +++ b/packages/app/src/layout.jsx @@ -133,8 +133,9 @@ export default class Layout extends React.PureComponent { if (!this.props.user && currentRoute !== config.app?.authPath && currentRoute !== "/") { const isPublicRoute = publicRoutes.some((route) => { - const regex = new RegExp(route.replace("*", ".*")) - return regex.test(currentRoute) + const routePath = route.replace(/\*/g, ".*").replace(/!/g, "^") + + return new RegExp(routePath).test(currentRoute) }) if (!isPublicRoute) {