marvin-auth-kit
Advanced tools
Comparing version 4.3.0 to 4.3.1
import React from 'react'; | ||
interface Props { | ||
isLoading: boolean; | ||
children: React.ReactElement; | ||
children: React.ReactNode; | ||
loader?: React.ReactElement; | ||
@@ -6,0 +6,0 @@ } |
@@ -6,8 +6,6 @@ import React from 'react'; | ||
export const LoginRoute = (props) => { | ||
const { component: Component, redirectTo, loader, ...rest } = props; | ||
const { redirectTo, loader, ...rest } = props; | ||
const [isLoading, isAuthenticated] = useIsAuthenticated(); | ||
if (!Component) { | ||
throw Error('component is undefined'); | ||
} | ||
const render = (props) => { | ||
return (React.createElement(Preloader, { isLoading: isLoading, loader: loader }, renderRoute())); | ||
function renderRoute() { | ||
if (isAuthenticated) { | ||
@@ -17,7 +15,5 @@ return React.createElement(Redirect, { to: { pathname: redirectTo } }); | ||
if (isLoading === false) | ||
return React.createElement(Component, Object.assign({}, props)); | ||
return React.createElement(Route, Object.assign({}, props)); | ||
return null; | ||
}; | ||
return (React.createElement(Preloader, { isLoading: isLoading, loader: loader }, | ||
React.createElement(Route, Object.assign({}, rest, { render: render })))); | ||
} | ||
}; |
@@ -6,10 +6,8 @@ import React from 'react'; | ||
export const PrivateRoute = (props) => { | ||
const { component: Component, redirectTo, loader, ...rest } = props; | ||
const { redirectTo, loader, ...rest } = props; | ||
const [isLoading, isAuthenticated] = useIsAuthenticated(); | ||
if (!Component) { | ||
throw Error('component is undefined'); | ||
} | ||
const render = (props) => { | ||
return (React.createElement(Preloader, { isLoading: isLoading, loader: loader }, renderRoute())); | ||
function renderRoute() { | ||
if (isAuthenticated) { | ||
return React.createElement(Component, Object.assign({}, props)); | ||
return React.createElement(Route, Object.assign({}, rest)); | ||
} | ||
@@ -19,6 +17,4 @@ if (isLoading === false) | ||
return null; | ||
}; | ||
return (React.createElement(Preloader, { isLoading: isLoading, loader: loader }, | ||
React.createElement(Route, Object.assign({}, rest, { render: render })))); | ||
} | ||
}; | ||
PrivateRoute.defaultProps = { redirectTo: '/login' }; |
{ | ||
"name": "marvin-auth-kit", | ||
"version": "4.3.0", | ||
"version": "4.3.1", | ||
"description": "Javscript authentication kit", | ||
@@ -8,3 +8,2 @@ "main": "dist/index.js", | ||
"scripts": { | ||
"prepare": "yarn run build", | ||
"build": "tsc", | ||
@@ -51,8 +50,8 @@ "test": "jest" | ||
"js-cookie": "^2.2.1", | ||
"mailslurp-client": "^8.7.8", | ||
"react": "^16.13.1", | ||
"react-router": "^5.2.0", | ||
"ts-jest": "^26.3.0", | ||
"typescript": "^4.0.2", | ||
"mailslurp-client": "^8.7.8" | ||
"typescript": "^4.0.2" | ||
} | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
319884
3990