admin/ota-admin-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "CEC-2977 Filter portal access based on auth provider (#231)"

Browse Source 
This reverts commit f2f046968e.
This commit is contained in:
jwu-fisker
2022-11-08 16:49:10 -08:00
parent f2f046968e
commit 33bfc4fb13
76 changed files with 912 additions and 1316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/Routes/AuthRoute.jsx
View File

@@ -8,7 +8,7 @@ export const TYPES = {
PROTECTED: 2,
};
export const AuthRoute = ({ token, type, groups, rolesPerGroup, providers, ...others }) => {
export const AuthRoute = ({ token, type, roles, groups, ...others }) => {
if (type === TYPES.PROTECTED && !token) {
return <Redirect to="/" />;
} else if (type === TYPES.GUEST && token) {
@@ -16,9 +16,8 @@ export const AuthRoute = ({ token, type, groups, rolesPerGroup, providers, ...ot
} else if (
type === TYPES.PROTECTED &&
token &&
rolesPerGroup &&
providers &&
!hasRole(groups, rolesPerGroup, providers)
roles &&
!hasRole(roles, groups)
) {
return <Redirect to="/home" />;
}

77
src/components/Routes/SiteRoutes.jsx
View File

@@ -1,10 +1,10 @@
import React, { Suspense } from "react";
import { Switch } from "react-router-dom";
import { Permissions } from "../../utils/roles";
import { useUserContext } from "../Contexts/UserContext";
import { MessageBar } from "../MessageBar";
import { AuthRoute, TYPES } from "../Routes/AuthRoute";
import { MessageBar } from "../MessageBar";
import { useUserContext } from "../Contexts/UserContext";
import { Roles } from "../../utils/roles";
const CANFilterCreate = React.lazy(() => import("../CANFilter/Add"));
const CANFilterUpdate = React.lazy(() => import("../CANFilter/Update"));
@@ -39,7 +39,7 @@ const SuppliersList = React.lazy(() => import("../Suppliers/List"));
const SupplierDetails = React.lazy(() => import("../Suppliers/Details"));
const Datascope = React.lazy(() => import("../Dashboard"));
const SiteRoutes = () => {
const { token, groups, providers } = useUserContext();
const { token, groups } = useUserContext();
return (
<Suspense fallback={"Loading..."}>
<MessageBar />
@@ -57,8 +57,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerCreate}
providers={providers}
roles={[Roles.CREATE]}
/>
<AuthRoute
path="/filter-update"
@@ -66,8 +65,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerCreate}
providers={providers}
roles={[Roles.CREATE]}
/>
<AuthRoute
path="/fleets"
@@ -75,8 +73,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/fleet/:name/vehicle-add"
@@ -84,8 +81,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/fleet/:name/filter-add"
@@ -93,8 +89,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/fleet/:name/filter-update"
@@ -102,8 +97,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/fleet/:name"
@@ -111,8 +105,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/fleet-add"
@@ -120,8 +113,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerRead}
providers={providers}
roles={[Roles.CREATE]}
/>
<AuthRoute
path="/fleet-update"
@@ -129,8 +121,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerCreate}
providers={providers}
roles={[Roles.CREATE]}
/>
<AuthRoute
path="/home"
@@ -144,8 +135,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerMagnaRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/package-deploy/:manifest_id"
@@ -153,8 +143,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerMagnaRead}
providers={providers}
roles={[Roles.CREATE]}
/>
<AuthRoute
path="/package-status/:manifest_id"
@@ -162,8 +151,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerMagnaRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/package-update/:manifest_id"
@@ -171,8 +159,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/vehicles"
@@ -180,8 +167,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerMagnaRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/vehicle-add"
@@ -189,8 +175,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerCreate}
providers={providers}
roles={[Roles.CREATE]}
/>
<AuthRoute
path="/vehicle-status/:vin/:carupdateid"
@@ -198,8 +183,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerMagnaRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/vehicle-status/:vin"
@@ -207,8 +191,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerMagnaRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<AuthRoute
path="/vehicle-update"
@@ -216,8 +199,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerCreate}
providers={providers}
roles={[Roles.CREATE]}
/>
<AuthRoute
path="/tools/certificates/add"
@@ -225,8 +207,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerCertificate}
providers={providers}
roles={[Roles.CERTIFICATES]}
/>
<AuthRoute
path="/tools/sms/send"
@@ -234,8 +215,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerCreate}
providers={providers}
roles={[Roles.CREATE]}
/>
<AuthRoute
path="/suppliers"
@@ -243,8 +223,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerSupplierAdmin}
providers={providers}
roles={[Roles.APPROVESUPPLIERS]}
/>
<AuthRoute
path="/supplier/:email"
@@ -252,8 +231,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerSupplierAdmin}
providers={providers}
roles={[Roles.APPROVESUPPLIERS]}
/>
<AuthRoute
path="/datascope"
@@ -261,8 +239,7 @@ const SiteRoutes = () => {
type={TYPES.PROTECTED}
token={token}
groups={groups}
rolesPerGroup={Permissions.FiskerRead}
providers={providers}
roles={[Roles.READ, Roles.CREATE]}
/>
<PageNotFound />
</Switch>