From ed5a635f4c113ba7a535b51b30245adc5cfb6cf0 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sat, 31 Oct 2020 20:15:27 -0400
Subject: [PATCH] Add `req` to EJS render args when possible

This makes it possible for EJS templates and `eejsBlock_*` hook
functions to access the user's express-session state.
---
 src/node/hooks/express/admin.js         |  2 +-
 src/node/hooks/express/adminplugins.js  | 10 +++++-----
 src/node/hooks/express/adminsettings.js |  9 +++------
 src/node/hooks/express/specialpages.js  |  4 ++--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/node/hooks/express/admin.js b/src/node/hooks/express/admin.js
index 5df45b18a..3971d1a32 100644
--- a/src/node/hooks/express/admin.js
+++ b/src/node/hooks/express/admin.js
@@ -3,7 +3,7 @@ var eejs = require('ep_etherpad-lite/node/eejs');
 exports.expressCreateServer = function (hook_name, args, cb) {
   args.app.get('/admin', function(req, res) {
     if('/' != req.path[req.path.length-1]) return res.redirect('./admin/');
-    res.send( eejs.require("ep_etherpad-lite/templates/admin/index.html", {}) );
+    res.send(eejs.require('ep_etherpad-lite/templates/admin/index.html', {req}));
   });
   return cb();
 }
diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js
index 3d5db155f..d1c6b389e 100644
--- a/src/node/hooks/express/adminplugins.js
+++ b/src/node/hooks/express/adminplugins.js
@@ -8,13 +8,12 @@ const UpdateCheck = require('ep_etherpad-lite/node/utils/UpdateCheck');
 
 exports.expressCreateServer = function(hook_name, args, cb) {
   args.app.get('/admin/plugins', function(req, res) {
-    var render_args = {
+    res.send(eejs.require('ep_etherpad-lite/templates/admin/plugins.html', {
       plugins: plugins.plugins,
+      req,
       search_results: {},
       errors: [],
-    };
-
-    res.send(eejs.require("ep_etherpad-lite/templates/admin/plugins.html", render_args));
+    }));
   });
 
   args.app.get('/admin/plugins/info', function(req, res) {
@@ -24,7 +23,8 @@ exports.expressCreateServer = function(hook_name, args, cb) {
     res.send(eejs.require("ep_etherpad-lite/templates/admin/plugins-info.html", {
       gitCommit: gitCommit,
       epVersion: epVersion,
-      latestVersion: UpdateCheck.getLatestVersion()
+      latestVersion: UpdateCheck.getLatestVersion(),
+      req,
     }));
   });
 
diff --git a/src/node/hooks/express/adminsettings.js b/src/node/hooks/express/adminsettings.js
index 98f30cf26..201c7533f 100644
--- a/src/node/hooks/express/adminsettings.js
+++ b/src/node/hooks/express/adminsettings.js
@@ -5,15 +5,12 @@ var fs = require('fs');
 
 exports.expressCreateServer = function (hook_name, args, cb) {
   args.app.get('/admin/settings', function(req, res) {
-
-    var render_args = {
+    res.send(eejs.require('ep_etherpad-lite/templates/admin/settings.html', {
+      req,
       settings: "",
       search_results: {},
       errors: []
-    };
-
-    res.send( eejs.require("ep_etherpad-lite/templates/admin/settings.html", render_args) );
-
+    }));
   });
   return cb();
 }
diff --git a/src/node/hooks/express/specialpages.js b/src/node/hooks/express/specialpages.js
index 97715b623..eb5c4a7fe 100644
--- a/src/node/hooks/express/specialpages.js
+++ b/src/node/hooks/express/specialpages.js
@@ -14,13 +14,13 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   //serve index.html under /
   args.app.get('/', function(req, res)
   {
-    res.send(eejs.require("ep_etherpad-lite/templates/index.html"));
+    res.send(eejs.require('ep_etherpad-lite/templates/index.html', {req}));
   });
 
   //serve javascript.html
   args.app.get('/javascript', function(req, res)
   {
-    res.send(eejs.require("ep_etherpad-lite/templates/javascript.html"));
+    res.send(eejs.require('ep_etherpad-lite/templates/javascript.html'), {req});
   });