Skip to content

Commit

Permalink
fix unauthorized access to pages
Browse files Browse the repository at this point in the history
  • Loading branch information
torkashvandmt committed Jun 3, 2024
1 parent 387169d commit 1a85729
Show file tree
Hide file tree
Showing 8 changed files with 134 additions and 67 deletions.
24 changes: 17 additions & 7 deletions pages/metadata/productblocks.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
import React from 'react';

import { WfoProductBlocksPage } from '@orchestrator-ui/orchestrator-ui-components';

export const ProductBlocksPage = () => <WfoProductBlocksPage />;

export default ProductBlocksPage;
import {
PolicyResource,
WfoPolicyRenderPageFallback,
WfoProductBlocksPage,
} from '@orchestrator-ui/orchestrator-ui-components';
import React from 'react';

export const ProductBlocksPage = () => {
return (
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_METADATA}>
<WfoProductBlocksPage />
</WfoPolicyRenderPageFallback>
);
};

export default ProductBlocksPage;

22 changes: 15 additions & 7 deletions pages/metadata/products.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import React from 'react';

import { WfoProductsPage } from '@orchestrator-ui/orchestrator-ui-components';

export const ProductsPage = () => <WfoProductsPage />;

export default ProductsPage;
import {
PolicyResource,
WfoPolicyRenderPageFallback,
WfoProductsPage,
} from '@orchestrator-ui/orchestrator-ui-components';
import React from 'react';

export const ProductsPage = () => (
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_METADATA}>
<WfoProductsPage />
</WfoPolicyRenderPageFallback>
);

export default ProductsPage;

22 changes: 15 additions & 7 deletions pages/metadata/resource-types.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import React from 'react';

import { WfoResourceTypesPage } from '@orchestrator-ui/orchestrator-ui-components';

export const ResourceTypesPage = () => <WfoResourceTypesPage />;

export default ResourceTypesPage;
import {
PolicyResource,
WfoPolicyRenderPageFallback,
WfoResourceTypesPage,
} from '@orchestrator-ui/orchestrator-ui-components';
import React from 'react';

export const ResourceTypesPage = () => (
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_METADATA}>
<WfoResourceTypesPage />
</WfoPolicyRenderPageFallback>
);

export default ResourceTypesPage;

22 changes: 15 additions & 7 deletions pages/metadata/tasks.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import React from 'react';

import { WfoTasksPage } from '@orchestrator-ui/orchestrator-ui-components';

export const TasksPage = () => <WfoTasksPage />;

export default TasksPage;
import {
PolicyResource,
WfoPolicyRenderPageFallback,
WfoTasksPage,
} from '@orchestrator-ui/orchestrator-ui-components';
import React from 'react';

export const TasksPage = () => (
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_METADATA}>
<WfoTasksPage />
</WfoPolicyRenderPageFallback>
);

export default TasksPage;

22 changes: 15 additions & 7 deletions pages/metadata/workflows.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import React from 'react';

import { WfoWorkflowsPage } from '@orchestrator-ui/orchestrator-ui-components';

export const WorkflowsPage = () => <WfoWorkflowsPage />;

export default WorkflowsPage;
import {
PolicyResource,
WfoPolicyRenderPageFallback,
WfoWorkflowsPage,
} from '@orchestrator-ui/orchestrator-ui-components';
import React from 'react';

export const WorkflowsPage = () => (
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_METADATA}>
<WfoWorkflowsPage />
</WfoPolicyRenderPageFallback>
);

export default WorkflowsPage;

24 changes: 15 additions & 9 deletions pages/settings.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import React from 'react';

import { WfoSettingsPage } from '@orchestrator-ui/orchestrator-ui-components';

export function SettingsPage() {
return <WfoSettingsPage />;
}

export default SettingsPage;
import {
PolicyResource,
WfoPolicyRenderPageFallback,
WfoSettingsPage,
} from '@orchestrator-ui/orchestrator-ui-components';
import React from 'react';

export const SettingsPage = () => (
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_SETTINGS}>
<WfoSettingsPage />
</WfoPolicyRenderPageFallback>
);

export default SettingsPage;

24 changes: 17 additions & 7 deletions pages/subscriptions/[subscriptionId].tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
import React from 'react';

import { WfoSubscriptionDetailPage } from '@orchestrator-ui/orchestrator-ui-components';

const SubscriptionDetailPage = () => <WfoSubscriptionDetailPage />;

export default SubscriptionDetailPage;
import {
PolicyResource,
WfoPolicyRenderPageFallback,
WfoSubscriptionDetailPage,
} from '@orchestrator-ui/orchestrator-ui-components';
import React from 'react';

const SubscriptionDetailPage = () => (
<WfoPolicyRenderPageFallback
resource={PolicyResource.NAVIGATION_SUBSCRIPTIONS}
>
<WfoSubscriptionDetailPage />
</WfoPolicyRenderPageFallback>
);

export default SubscriptionDetailPage;

41 changes: 25 additions & 16 deletions pages/tasks/[taskId].tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
import React from 'react';

import { useRouter } from 'next/router';

import { WfoProcessDetailPage } from '@orchestrator-ui/orchestrator-ui-components';

const TaskDetailPage = () => {
import {
PolicyResource,
usePolicy,
WfoPageUnauthorized,
WfoProcessDetailPage,
} from '@orchestrator-ui/orchestrator-ui-components';
import { useRouter } from 'next/router';
import React from 'react';

const TaskDetailPage = () => {
const router = useRouter();
const { taskId } = router.query;


const { isAllowed } = usePolicy();
if (!isAllowed(PolicyResource.NAVIGATION_TASKS)) {
return <WfoPageUnauthorized />;
}

return (
<>
{(taskId && typeof taskId === 'string' && (
<WfoProcessDetailPage processId={taskId} />
)) || <div>Invalid taskId</div>}
</>
<>
{(taskId && typeof taskId === 'string' && (
<WfoProcessDetailPage processId={taskId} />
)) || <div>Invalid taskId</div>}
</>
);
};

export default TaskDetailPage;
};

export default TaskDetailPage;

0 comments on commit 1a85729

Please sign in to comment.