Merge branch 'main' into fix/constraints-mad

charts/puris/README.md

@@ -145,6 +145,7 @@ $ helm install puris --namespace puris --create-namespace .
 | frontend.puris.keycloak.disabled | bool | `true` | Disable the Keycloak integration. |
 | frontend.puris.keycloak.realm | string | `"Catena-X"` | Name of the Realm of the keycloak instance. |
 | frontend.puris.keycloak.redirectUrlFrontend | string | `"https://your-frontend-url.com"` | URL to use as keycloak redirect url. |
+| frontend.puris.keycloak.url | string | `"https://idp.com/auth"` | The URL to the IDP that should be used. |
 | frontend.readinessProbe | object | `{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":1}` | Checks if the pod is fully ready to operate |
 | frontend.readinessProbe.failureThreshold | int | `3` | Number of failures (threshold) for a readiness probe |
 | frontend.readinessProbe.initialDelaySeconds | int | `10` | Delay in seconds after which an initial readiness probe is checked |

charts/puris/templates/frontend-deployment.yaml

@@ -56,6 +56,8 @@ spec:
               value: "test"
             - name: IDP_DISABLE
               value: "{{ .Values.frontend.puris.keycloak.disabled }}"
+            - name: IDP_URL
+              value: "{{ .Values.frontend.puris.keycloak.url }}"
             - name: IDP_REALM
               value: "{{ .Values.frontend.puris.keycloak.realm }}"
             - name: IDP_CLIENT_ID

charts/puris/values.yaml

@@ -190,6 +190,8 @@ frontend:
         keycloak:
             # -- Disable the Keycloak integration.
             disabled: true
+            # -- The URL to the IDP that should be used.
+            url: "https://idp.com/auth"
             # -- Name of the Realm of the keycloak instance.
             realm: "Catena-X"
             # -- Name of the client which is used for the application.

frontend/.env

@@ -14,4 +14,4 @@ VITE_IDP_DISABLE=true
 VITE_IDP_URL=http://localhost:10081/
 VITE_IDP_REALM=Catena-X
 VITE_IDP_CLIENT_ID=Cl3-PURIS
-VITE_IDP_REDIRECT_URL_FRONTEND=http://localhost:3000/
+VITE_IDP_REDIRECT_URL_FRONTEND=https://localhost:3000/

frontend/src/services/AccessService.js

@@ -24,7 +24,10 @@ const getViewsWithAccess = () => {
     let views = [];
 
     if (!AuthenticationService.isEnabled) {
-        return ALL_ROUTES.filter(route=> route.name !== "Unauthorized");
+        return ALL_ROUTES.filter(
+            (route) =>
+                route.name !== "Unauthorized" && route.name !== "aboutLicense"
+        );
     }
 
     ALL_ROUTES.forEach((item) => {

local/keycloak/puris-config/Catena-X-realm.json

@@ -413,8 +413,8 @@
     "enabled" : true,
     "alwaysDisplayInConsole" : false,
     "clientAuthenticatorType" : "client-secret",
-    "redirectUris" : [ "http://localhost:3000/*" ],
-    "webOrigins" : [ "http://localhost:3000" ],
+    "redirectUris" : [ "https://localhost:3000/*" ],
+    "webOrigins" : [ "https://localhost:3000" ],
     "notBefore" : 0,
     "bearerOnly" : false,
     "consentRequired" : false,