Merge pull request #27 from LuisValgoi/issue-24

[ISSUE-24] Refactor Validator Components prop names

Author: LuisValgoi

packages/ui5-webcomponents-react-seed/src/permissions/ComponentValidator.js renamed to packages/ui5-webcomponents-react-seed/src/auth/ComponentValidator.js

@@ -11,12 +11,12 @@ const fetchUser = async () => {
   return res.data;
 };
 
-const ComponentValidator = ({ allowedPermissions, allowenceKey, children }) => {
+const ComponentValidator = ({ allowedAuthorities, authorityKey, children }) => {
   const { data, status } = useQuery('GET_USER_LOGGED', fetchUser);
 
   const getRoute = () => {
     if (status === Constants.CODES.RQ_SUCCESS) {
-      const hasAccess = data.data.user[allowenceKey].some(permission => allowedPermissions.includes(permission));
+      const hasAccess = data.data.user[authorityKey].some(permission => allowedAuthorities.includes(permission));
       if (hasAccess) {
         return children;
       }

packages/ui5-webcomponents-react-seed/src/permissions/RouteValidator.js renamed to packages/ui5-webcomponents-react-seed/src/auth/RouteValidator.js

@@ -15,12 +15,12 @@ const fetchUser = async () => {
   return res.data;
 };
 
-const RouteValidator = ({ allowedPermissions, allowenceKey, path, component, ...props }) => {
+const RouteValidator = ({ allowedAuthorities, authorityKey, path, component, ...props }) => {
   const { data, status } = useQuery('GET_USER_LOGGED', fetchUser);
 
   const getRoute = () => {
     if (status === Constants.CODES.RQ_SUCCESS) {
-      const hasAccess = data.data.user[allowenceKey].some(permission => allowedPermissions.includes(permission));
+      const hasAccess = data.data.user[authorityKey].some(permission => allowedAuthorities.includes(permission));
       return <Route path={path} {...props} component={hasAccess ? component : NotFound} />;
     }
 

packages/ui5-webcomponents-react-seed/src/pages/Todo/List/TodoList.js

@@ -4,7 +4,7 @@ import { Helmet } from 'react-helmet';
 
 import CenteredLink from '../../../components/CenteredLink/CenteredLink';
 import BrowserURL from '../../../util/BrowserURL';
-import ComponentValidator from '../../../permissions/ComponentValidator';
+import ComponentValidator from '../../../auth/ComponentValidator';
 
 export default function TodoList() {
   const history = useHistory();
@@ -16,7 +16,7 @@ export default function TodoList() {
       <br />
       <CenteredLink onClick={() => history.push(BrowserURL.BUGGY)} text='Test Error Page' />
       <br />
-      <ComponentValidator allowedPermissions={['canAccessDropApplication']} allowenceKey='permissions'>
+      <ComponentValidator allowedAuthorities={['canAccessDropApplication']} authorityKey='permissions'>
         <CenteredLink text='Drop Application (this is a restricted text and you should not see unless you have access)' />
       </ComponentValidator>
     </>

packages/ui5-webcomponents-react-seed/src/routes/Routes.js

@@ -5,7 +5,7 @@ import BrowserURL from '../util/BrowserURL';
 import TodoList from '../pages/Todo/List/TodoList';
 import NotFound from '../pages/Fallback/NotFound';
 import Buggy from '../pages/Fallback/Buggy';
-import RouteValidator from '../permissions/RouteValidator';
+import RouteValidator from '../auth/RouteValidator';
 
 const Routes = () => {
   return (
@@ -15,8 +15,8 @@ const Routes = () => {
         exact
         to={BrowserURL.TODO_LIST} />
       <RouteValidator
-        allowedPermissions={['canAccessTodoListPage']}
-        allowenceKey='permissions'
+        allowedAuthorities={['canAccessTodoListPage']}
+        authorityKey='permissions'
         path={BrowserURL.TODO_LIST}
         component={TodoList} />
       <Route