Stopped authorized section from spreading own props to children and made adjustments in line with comments that came up during review

Author: qh4r

packages/react-router-pagination/src/react-router-pagination.types.js.flow

@@ -1,5 +1,5 @@
 // @flow
-import type { Location, RouterHistory } from 'react-router-dom';
+import type { Location, RouterHistory } from 'react-router';
 
 export type ConfigOptions = {
   currentPageKey: string,

packages/react-router-permissions/.gitignore

@@ -1,7 +1,2 @@
 es
-/*.js
-authorization-strategy
-authorized-route
-authorized-section
-permissions-context
-permissions-provider
+/*.js

packages/react-router-permissions/README.md

@@ -103,7 +103,7 @@ There are some strategies provided with the package out of the box. Those are:
 - Role based strategy
 
   ```js
-  const strategy = ['MODERATOR', 'PREMIUM_USER'];
+  const permissions = ['MODERATOR', 'PREMIUM_USER'];
 
   ...
   // authorization will pass
@@ -125,7 +125,7 @@ There are some strategies provided with the package out of the box. Those are:
 * Permissions based strategy
 
   ```js
-  const strategy = {
+  const permissions = {
     canReadPosts: true,
     canManagePosts: true,
     canManageUsers: false,
@@ -151,7 +151,7 @@ There are some strategies provided with the package out of the box. Those are:
 * At least one strategy
 
   ```js
-  const strategy = {
+  const permissions = {
     canReadPosts: true,
     canManagePosts: false,
     canManageUsers: false,

packages/react-router-permissions/package.json

@@ -15,9 +15,7 @@
   ],
   "peerDependencies": {
     "react": "^16.6.0",
-    "react-dom": "^16.6.0",
-    "react-router": "^4.3.1",
-    "react-router-dom": "^4.3.1"
+    "react-router": "^4.3.1"
   },
   "scripts": {
     "build": "node scripts/build.js",
@@ -36,10 +34,10 @@
     "babel-core": "^7.0.0-0",
     "babel-jest": "^23.6.0",
     "codecov": "^3.1.0",
-    "flow-bin": "^0.81.0",
-    "jest": "^23.6.0",
     "enzyme": "^3.7.0",
-    "enzyme-adapter-react-16": "^1.7.0"
+    "enzyme-adapter-react-16": "^1.7.0",
+    "flow-bin": "^0.81.0",
+    "jest": "^23.6.0"
   },
   "jest": {
     "collectCoverageFrom": [

packages/react-router-permissions/src/authorized-route/authorized-route.js

@@ -20,10 +20,9 @@ export class AuthorizedRoute extends React.Component<AuthorizedRouteProps> {
         children={(routerProps: ContextRouter) =>
           routerProps.match ? (
             <AuthorizedSection
-              {...routerProps}
               requires={requires}
               authorizationStrategy={authorizationStrategy}
-              children={children}
+              children={({ isAuthorized }: { isAuthorized: * }) => children({ ...routerProps, isAuthorized })}
             />
           ) : null
         }

packages/react-router-permissions/src/authorized-route/authorized-route.spec.js

@@ -2,7 +2,7 @@ import React from 'react';
 import Enzyme, { mount } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 
-import { MemoryRouter, Switch } from 'react-router-dom';
+import { MemoryRouter, Switch } from 'react-router';
 
 import AuthorizedRoute from './authorized-route';
 import PermissionsProvider from '../permissions-provider/permissions-provider';

packages/react-router-permissions/src/authorized-section/authorized-section.js

@@ -5,16 +5,15 @@ import { PermissionsContext } from '../permissions-context/permissions.context';
 
 export type AuthorizedSectionProps = {
   requires: *,
-  authorizationStrategy?: (*, *) => *,
+  authorizationStrategy?: (permissions: *, requirement: *) => *,
   children: ({
-    isAuthorized: boolean,
+    isAuthorized: *,
   }) => React.Node,
-  [string]: *,
 };
 
 export class AuthorizedSection extends React.Component<AuthorizedSectionProps> {
   render() {
-    const { requires, authorizationStrategy: overrideStrategy, children, ...rest } = this.props;
+    const { requires, authorizationStrategy: overrideStrategy, children } = this.props;
 
     return (
       <PermissionsContext.Consumer>
@@ -23,7 +22,6 @@ export class AuthorizedSection extends React.Component<AuthorizedSectionProps> {
             ? overrideStrategy(permissions, requires)
             : authorizationStrategy(permissions, requires);
           return children({
-            ...rest,
             isAuthorized,
           });
         }}

packages/react-router-permissions/src/authorized-section/authorized-section.spec.js

@@ -50,17 +50,4 @@ describe('Authorized Section', () => {
 
     expect(authorization).toBeCalledWith(false);
   });
-
-  it('passes cuctom props along isAuthorized', () => {
-    const trapForFoo = jest.fn();
-    mount(
-      <PermissionsProvider permissions={{ isLogged: true }} authorizationStrategy={strategy}>
-        <AuthorizedSection requires="isLogged" foo="bar">
-          {({ foo }) => trapForFoo(foo)}
-        </AuthorizedSection>
-      </PermissionsProvider>,
-    );
-
-    expect(trapForFoo).toBeCalledWith('bar');
-  });
 });