From ae6417c0710b7e4119f552e5c36c573be485bdb1 Mon Sep 17 00:00:00 2001
From: Ricardo van der Heijden
<20791917+ricardovdheijden@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:55:51 +0100
Subject: [PATCH 1/3] 460 Adds policy checks for the navigation and its pages
---
tsconfig.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tsconfig.json b/tsconfig.json
index 4c8dcbc8..41a4218d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,16 +3,16 @@
"compilerOptions": {
"baseUrl": ".",
"paths": {
- "@/*": ["./*"],
+ "@/*": ["./*"]
},
"plugins": [
{
- "name": "next",
- },
+ "name": "next"
+ }
],
"strictNullChecks": true,
- "jsx": "preserve",
+ "jsx": "preserve"
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
- "exclude": ["node_modules"],
+ "exclude": ["node_modules"]
}
From 870ba724a8da4c0d46c81cf8b020a7b48c17eb48 Mon Sep 17 00:00:00 2001
From: Ricardo van der Heijden
<20791917+ricardovdheijden@users.noreply.github.com>
Date: Thu, 22 Feb 2024 14:06:43 +0100
Subject: [PATCH 2/3] 460 Applies Pages policies
---
pages/metadata/index.tsx | 14 ++++++++++++++
pages/subscriptions/index.tsx | 14 ++++++++++++--
pages/tasks/index.tsx | 12 ++++++++++--
pages/workflows/index.tsx | 14 ++++++++++++--
4 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/pages/metadata/index.tsx b/pages/metadata/index.tsx
index 6b7f262d..27d4ce34 100644
--- a/pages/metadata/index.tsx
+++ b/pages/metadata/index.tsx
@@ -1,7 +1,21 @@
+import React from 'react';
+
import { useRouter } from 'next/router';
+import {
+ PolicyResource,
+ WfoPageUnauthorized,
+ usePolicy,
+} from '@orchestrator-ui/orchestrator-ui-components';
+
export const IndexPage = () => {
const router = useRouter();
+ const { isAllowed } = usePolicy();
+
+ if (!isAllowed(PolicyResource.NAVIGATION_METADATA)) {
+ return ;
+ }
+
router.push('/metadata/products');
};
diff --git a/pages/subscriptions/index.tsx b/pages/subscriptions/index.tsx
index 5beb40ce..b3fd2db4 100644
--- a/pages/subscriptions/index.tsx
+++ b/pages/subscriptions/index.tsx
@@ -1,7 +1,17 @@
import React from 'react';
-import { WfoSubscriptionsListPage } from '@orchestrator-ui/orchestrator-ui-components';
+import {
+ PolicyResource,
+ WfoPolicyRenderPageFallback,
+ WfoSubscriptionsListPage,
+} from '@orchestrator-ui/orchestrator-ui-components';
export default function SubscriptionsPage() {
- return ;
+ return (
+
+
+
+ );
}
diff --git a/pages/tasks/index.tsx b/pages/tasks/index.tsx
index 27877f5e..34589ed7 100644
--- a/pages/tasks/index.tsx
+++ b/pages/tasks/index.tsx
@@ -1,9 +1,17 @@
import React from 'react';
-import { WfoTasksListPage } from '@orchestrator-ui/orchestrator-ui-components';
+import {
+ PolicyResource,
+ WfoPolicyRenderPageFallback,
+ WfoTasksListPage,
+} from '@orchestrator-ui/orchestrator-ui-components';
export function TasksPage() {
- return ;
+ return (
+
+
+
+ );
}
export default TasksPage;
diff --git a/pages/workflows/index.tsx b/pages/workflows/index.tsx
index 04258f78..d9fc1a22 100644
--- a/pages/workflows/index.tsx
+++ b/pages/workflows/index.tsx
@@ -1,7 +1,17 @@
import React from 'react';
-import { WfoWorkflowsListPage } from '@orchestrator-ui/orchestrator-ui-components';
+import {
+ PolicyResource,
+ WfoPolicyRenderPageFallback,
+ WfoWorkflowsListPage,
+} from '@orchestrator-ui/orchestrator-ui-components';
export default function WorkflowsPage() {
- return ;
+ return (
+
+
+
+ );
}
From 600c02dec0d5463ca3ee9899c3d70f8b75aeda58 Mon Sep 17 00:00:00 2001
From: Ricardo van der Heijden
<20791917+ricardovdheijden@users.noreply.github.com>
Date: Thu, 22 Feb 2024 17:26:01 +0100
Subject: [PATCH 3/3] 460 Updates env vars in the example files
---
.env.example | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.env.example b/.env.example
index f3f5dcfa..ae195826 100644
--- a/.env.example
+++ b/.env.example
@@ -16,6 +16,9 @@ NEXTAUTH_ISSUER="http://localhost:8085/realms/orchestrator"
NEXTAUTH_WELL_KNOWN_OVERRIDE="http://localhost:8085/auth/.well-known/openid-configuration"
NEXTAUTH_URL=http://localhost:3000/api/auth
+OPA_PUBLIC_BUNDLE_URL="https://localhost/api/v1/opa/public-bundle"
+OPA_CLIENT_ID="orchestrator-client"
+
# docker-compose variables
KEYCLOAK_ADMIN=admin
KEYCLOAK_ADMIN_PASSWORD=admin