From 4611ef371308415ba95f0646f8e80e429a2bd9a0 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Thu, 17 Oct 2024 11:39:36 -0400
Subject: [PATCH] connect wip

---
 salt/hydra/defaults.yaml | 13 ++++---------
 salt/hydra/map.jinja     |  7 +++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/salt/hydra/defaults.yaml b/salt/hydra/defaults.yaml
index 99615cb00..a9a26c151 100644
--- a/salt/hydra/defaults.yaml
+++ b/salt/hydra/defaults.yaml
@@ -2,13 +2,10 @@ hydra:
   enabled: False
   config:
     serve:
-      cookies:
-        same_site_mode: Lax
-
-    public:
-      port: 4444
-    admin:
-      port: 4445
+      public:
+        port: 4444
+      admin:
+        port: 4445
     urls:
       self:
         issuer: https://URL_BASE/connect
@@ -19,8 +16,6 @@ hydra:
       identity_provider:
         url: http://127.0.0.1:4434/admin
         publicUrl: https://URL_BASE/auth
-        headers:
-          Authorization: Bearer some-token
           
     secrets:
       system: []
diff --git a/salt/hydra/map.jinja b/salt/hydra/map.jinja
index fdc5d2e9d..ca801a700 100644
--- a/salt/hydra/map.jinja
+++ b/salt/hydra/map.jinja
@@ -6,4 +6,11 @@
 {% from 'vars/globals.map.jinja' import GLOBALS %}
 {% import_yaml 'hydra/defaults.yaml' as HYDRADEFAULTS %}
 
+{% do HYDRADEFAULTS.hydra.config.urls.self.update({'issuer': HYDRADEFAULTS.hydra.config.urls.self.issuer | replace("URL_BASE", GLOBALS.url_base)}) %}
+{% do HYDRADEFAULTS.hydra.config.urls.self.update({'public': HYDRADEFAULTS.hydra.config.urls.self.public | replace("URL_BASE", GLOBALS.url_base)}) %}
+{% do HYDRADEFAULTS.hydra.config.urls.self.update({'admin': HYDRADEFAULTS.hydra.config.urls.self.admin | replace("URL_BASE", GLOBALS.url_base)}) %}
+{% do HYDRADEFAULTS.hydra.config.urls.update({'login': HYDRADEFAULTS.hydra.config.urls.login | replace("URL_BASE", GLOBALS.url_base)}) %}
+{% do HYDRADEFAULTS.hydra.config.urls.update({'logout': HYDRADEFAULTS.hydra.config.urls.logout | replace("URL_BASE", GLOBALS.url_base)}) %}
+{% do HYDRADEFAULTS.hydra.config.urls.identity_provider.update({'publicUrl': HYDRADEFAULTS.hydra.config.urls.identity_provider.publicUrl | replace("URL_BASE", GLOBALS.url_base)}) %}
+
 {% set HYDRAMERGED = salt['pillar.get']('hydra', default=HYDRADEFAULTS.hydra, merge=true) %}
\ No newline at end of file