From 65cdba77055b1c3ba1d780b40a5c64dc41e7b4e2 Mon Sep 17 00:00:00 2001
From: Thomas E Lackey <telackey@bozemanpass.com>
Date: Mon, 23 Jan 2023 10:39:15 -0600
Subject: [PATCH] Update keycloak to include X-User-Id header. (#147)

---
 .../config/keycloak/nginx/keycloak_proxy.conf | 25 +++++++++++--------
 .../container-build/cerc-keycloak/Dockerfile  |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/data/config/keycloak/nginx/keycloak_proxy.conf b/app/data/config/keycloak/nginx/keycloak_proxy.conf
index fb77ef81..f06c6700 100644
--- a/app/data/config/keycloak/nginx/keycloak_proxy.conf
+++ b/app/data/config/keycloak/nginx/keycloak_proxy.conf
@@ -20,17 +20,20 @@ server {
         proxy_pass  http://fixturenet-eth-geth-1:8545;
     }
 
-### ipld-eth-server
-#    location ~ ^/ipld/eth/([^/]*)$ {
-#        set $apiKey $1;
-#        if ($apiKey = '') {
-#          set $apiKey $http_X_API_KEY;
-#        }
-#        auth_request /auth;
-#        proxy_buffering off;
-#        rewrite /.*$ / break;
-#        proxy_pass  http://ipld-eth-server:8081;
-#    }
+## ipld-eth-server
+    location ~ ^/ipld/eth/([^/]*)$ {
+        set $apiKey $1;
+        if ($apiKey = '') {
+          set $apiKey $http_X_API_KEY;
+        }
+        auth_request /auth;
+        auth_request_set $user_id $sent_http_x_user_id;
+        proxy_buffering off;
+        rewrite /.*$ / break;
+        proxy_pass  http://ipld-eth-server:8081;
+        proxy_set_header X-Original-Remote-Addr $remote_addr;
+        proxy_set_header X-User-Id $user_id;
+    }
 #
 #    location ~ ^/ipld/gql/([^/]*)$ {
 #        set $apiKey $1;
diff --git a/app/data/container-build/cerc-keycloak/Dockerfile b/app/data/container-build/cerc-keycloak/Dockerfile
index 0e70a0b0..000f38cd 100644
--- a/app/data/container-build/cerc-keycloak/Dockerfile
+++ b/app/data/container-build/cerc-keycloak/Dockerfile
@@ -1,4 +1,4 @@
 FROM quay.io/keycloak/keycloak:20.0
 WORKDIR /opt/keycloak/providers
 RUN curl -L https://github.com/aerogear/keycloak-metrics-spi/releases/download/2.5.3/keycloak-metrics-spi-2.5.3.jar --output keycloak-metrics-spi.jar
-RUN curl -L https://github.com/cerc-io/keycloak-api-key-demo/releases/download/v0.1/api-key-module-0.1.jar --output api-key-module.jar
+RUN curl -L https://github.com/cerc-io/keycloak-api-key-demo/releases/download/v0.2/api-key-module-0.2.jar --output api-key-module.jar