Skip to content

Upgrade conneted-private-route to v6 #196

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

Open
mutuajames wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade conneted-private-route to v6 #196

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
6 changes: 3 additions & 3 deletions packages/connected-private-route/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
]
},
"dependencies": {
"@onaio/session-reducer": "^0.0.13"
"@onaio/session-reducer": "^0.0.13",
"react-router": "^6.15.0",
"react-router-dom": "^6.15.0"
},
"peerDependencies": {
"@types/react-redux": "^7.0.8",
"@types/react-router": "^4.4.5",
"@types/react-router-dom": "^4.3.2",
"react-redux": "^7.0.2",
"react-router": "^5.0.0",
"react-router-dom": "^5.0.0",
"redux": "^4.0.1"
},
"devDependencies": {
Expand Down
42 changes: 23 additions & 19 deletions packages/connected-private-route/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { isAuthenticated } from '@onaio/session-reducer';
import queryString from 'querystring';
import React from 'react';
import { connect } from 'react-redux';
import { Redirect, Route, RouteProps } from 'react-router-dom';
import { Navigate, PathRouteProps, Route, RouteProps, Routes, useLocation } from 'react-router-dom';
import { Store } from 'redux';

/** interface for PrivateRoute props */
interface PrivateRouteProps extends RouteProps {
interface PrivateRouteProps extends PathRouteProps {
authenticated: boolean /** is the current user authenticated */;
disableLoginProtection: boolean /** should we disable login protection */;
redirectPath: string /** redirect to this path is use if not authenticated */;
Expand Down Expand Up @@ -34,16 +34,18 @@ const defaultPrivateRouteProps: Partial<PrivateRouteProps> = {
*/
const PrivateRoute = (props: PrivateRouteProps) => {
const {
component: Component,
Component,
authenticated,
disableLoginProtection,
redirectPath,
routerEnabled,
routerDisabledRedirectPath,
location,
...theOtherProps
} = props;

console.log({ props });
const location = useLocation();

/** recreates the url : the path; query string if any; a hash tag if any */
const currentPath = `${(location && location.pathname) || ''}${(location && location.search) ||
''}${(location && location.hash) || ''}`;
Expand All @@ -52,20 +54,22 @@ const PrivateRoute = (props: PrivateRouteProps) => {

return (
/* tslint:disable jsx-no-lambda */
<Route
{...theOtherProps}
render={routeProps => {
if (routerEnabled) {
return (authenticated === true || disableLoginProtection === true) && Component ? (
<Component {...routeProps} {...theOtherProps} />
) : (
<Redirect to={fullRedirectPath} />
);
} else {
return <Redirect to={routerDisabledRedirectPath} />;
}
}}
/>
<Routes>
<Route
{...theOtherProps}
Component={(routeProps: any) => {
if (routerEnabled) {
return (authenticated === true || disableLoginProtection === true) && Component ? (
<Component {...routeProps} {...theOtherProps} />
) : (
<Navigate to={fullRedirectPath} />
);
} else {
return <Navigate to={routerDisabledRedirectPath} />;
}
}}
/>
</Routes>
/* tslint:enable jsx-no-lambda */
);
};
Expand All @@ -77,7 +81,7 @@ export { PrivateRoute }; // export the un-connected component
/** Connect the component to the store */

/** interface to describe props from mapStateToProps */
interface DispatchedStateProps extends RouteProps {
interface DispatchedStateProps {
authenticated: boolean;
}

Expand Down
Loading