[camel-karavan] branch main updated: OIDC server url for frontend and backend

[marat]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new f940abb  OIDC server url for frontend and backend
f940abb is described below

commit f940abbde6916b7e0cb7d9ebeed43ad5a5f636ba
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Wed Sep 14 18:19:58 2022 -0400

    OIDC server url for frontend and backend
---
 .../src/main/java/org/apache/camel/karavan/service/AuthService.java  | 2 +-
 karavan-app/src/main/resources/application.properties                | 1 +
 karavan-cloud/openshift/karavan-app-oidc.yaml                        | 5 +++++
 karavan-cloud/openshift/karavan-secret.yaml                          | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
index 3823081..bcd8f90 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
@@ -34,6 +34,6 @@ public class AuthService {
     }
 
     public Map<String, String> getSsoConfig() throws MalformedURLException {
-        return Map.of("url", 
ConfigProvider.getConfig().getValue("quarkus.oidc.auth-server-url", 
String.class));
+        return Map.of("url", 
ConfigProvider.getConfig().getValue("karavan.frontend.auth-server-url", 
String.class));
     }
 }
diff --git a/karavan-app/src/main/resources/application.properties 
b/karavan-app/src/main/resources/application.properties
index f0bfa37..7caf204 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -81,6 +81,7 @@ quarkus.http.auth.permission.public.methods=GET,HEAD,POST
 %oidc.quarkus.oidc.enabled=true
 %oidc.quarkus.http.auth.basic=false
 %oidc.quarkus.security.users.embedded.enabled=false
+%oidc.karavan.frontend.auth-server-url=${oidc-frontend-url}
 %oidc.quarkus.oidc.auth-server-url=${oidc-server-url}
 %oidc.quarkus.oidc.client-id=karavan-backend
 %oidc.quarkus.oidc.credentials.secret=${oidc-secret}
diff --git a/karavan-cloud/openshift/karavan-app-oidc.yaml 
b/karavan-cloud/openshift/karavan-app-oidc.yaml
index 99906af..3e9f42b 100644
--- a/karavan-cloud/openshift/karavan-app-oidc.yaml
+++ b/karavan-cloud/openshift/karavan-app-oidc.yaml
@@ -40,6 +40,11 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: OIDC_FRONTEND_URL
+              valueFrom:
+                secretKeyRef:
+                  key: oidc-frontend-url
+                  name: karavan
             - name: OIDC_SERVER_URL
               valueFrom:
                 secretKeyRef:
diff --git a/karavan-cloud/openshift/karavan-secret.yaml 
b/karavan-cloud/openshift/karavan-secret.yaml
index 4974102..d7f7cb7 100644
--- a/karavan-cloud/openshift/karavan-secret.yaml
+++ b/karavan-cloud/openshift/karavan-secret.yaml
@@ -6,7 +6,8 @@ type: Opaque
 stringData:
   master-password: karavan
   oidc-secret: XXXXX
-  oidc-server-url: https://localhost/realms/karavan
+  oidc-server-url: https://localhost/auth/realms/karavan
+  oidc-frontend-url: https://localhost/auth
   projects-git-repository: https://github.com/mgubaidullin/karavan-demo.git
   projects-git-password: demo
   projects-git-username: demo