From 0584e1588ddbf9e304812773a5da099773471bfa Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Thu, 4 Nov 2021 18:30:20 +0100
Subject: [PATCH] var remote_user -> remote_user_js

---
 templates/config.js.j2          | 2 +-
 templates/nginx.default.conf.j2 | 6 ++++--
 templates/pep.js.j2             | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/templates/config.js.j2 b/templates/config.js.j2
index bc7975f..85d06c4 100644
--- a/templates/config.js.j2
+++ b/templates/config.js.j2
@@ -1,6 +1,6 @@
 export default { config, exportBackendHeaders };
 function exportBackendHeaders(context){
-//  exportVariable("remote_user", context.authn.verified_token.preferred_username)
+//  exportVariable("remote_user_js", context.authn.verified_token.preferred_username)
   return context
 }
 var config = {
diff --git a/templates/nginx.default.conf.j2 b/templates/nginx.default.conf.j2
index ec56cd5..c463304 100644
--- a/templates/nginx.default.conf.j2
+++ b/templates/nginx.default.conf.j2
@@ -1,7 +1,7 @@
 proxy_cache_path /var/cache/nginx/pep keys_zone=token_responses:1m max_size=2m;
 js_var $auth_token;
 js_var $pep_credentials;
-js_var $remote_user;
+js_var $remote_user_js;
 underscores_in_headers on;
 
 upstream _inception-server {
@@ -42,6 +42,8 @@ server {
     proxy_set_header X-Forwarded-Port $server_port;
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Original-URI $request_uri;
+    proxy_set_header Authorization "Bearer $auth_token";
+    proxy_set_header remote_user "$remote_user_js";
     proxy_pass http://_inception-server;
   }
 
@@ -60,7 +62,7 @@ server {
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Original-URI $request_uri;
     proxy_set_header Authorization "Bearer $auth_token";
-    proxy_set_header remote_user "$remote_user";
+    proxy_set_header remote_user "$remote_user_js";
     proxy_pass http://_inception-server;
     rewrite ^/_d4sauth / last;
   }
diff --git a/templates/pep.js.j2 b/templates/pep.js.j2
index 11b2544..91dea45 100644
--- a/templates/pep.js.j2
+++ b/templates/pep.js.j2
@@ -40,7 +40,7 @@ log(context, "headers " + njs.dump(r.headersIn))
         throw new Error("Unauthorized")
       }
     }).then(userinfo => {
-      exportVariable(context, "remote_user", userinfo.result.username)
+      exportVariable(context, "remote_user_js", userinfo.result.username)
 {% if nginx_pep_debug_enabled %}
       log(context, "username is " + userinfo.result.username)
 {% endif %}