From 0c5a76b39145a1b00d97359311723fe0465f6c6c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 30 Aug 2018 22:42:30 +0100
Subject: [PATCH] Add env.get to Function node

---
 nodes/core/core/80-function.html         |  4 +++-
 nodes/core/core/80-function.js           |  7 ++++++
 test/nodes/core/core/80-function_spec.js | 30 ++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/nodes/core/core/80-function.html b/nodes/core/core/80-function.html
index e406e9d16..13ef20db0 100644
--- a/nodes/core/core/80-function.html
+++ b/nodes/core/core/80-function.html
@@ -53,12 +53,14 @@
     <p>The Catch node can also be used to handle errors. To invoke a Catch node,
     pass <code>msg</code> as a second argument to <code>node.error</code>:</p>
     <pre>node.error("Error",msg);</pre>
-    <h4>Referring Node Information</h4>
+    <h4>Accessing Node Information</h4>
     <p>In the function block, id and name of the node can be referenced using the following properties:</p>
     <ul>
         <li><code>node.id</code> - id of the node</li>
         <li><code>node.name</code> - name of the node</li>
     </ul>
+    <h4>Using environment variables</h4>
+    <p>Environment variables can be accessed using <code>env.get("MY_ENV_VAR")</code>.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/nodes/core/core/80-function.js b/nodes/core/core/80-function.js
index 931958c7b..0e1efbdcd 100644
--- a/nodes/core/core/80-function.js
+++ b/nodes/core/core/80-function.js
@@ -156,6 +156,13 @@ module.exports = function(RED) {
                     return node.context().global.keys.apply(node,arguments);
                 }
             },
+            env: {
+                get: function(envVar) {
+                    // For now, just return the env var. This will eventually
+                    // also return project settings and subflow instance properties
+                    return process.env[envVar]
+                }
+            },
             setTimeout: function () {
                 var func = arguments[0];
                 var timerId;
diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/core/80-function_spec.js
index 9c6d9e041..1f3b5ac93 100644
--- a/test/nodes/core/core/80-function_spec.js
+++ b/test/nodes/core/core/80-function_spec.js
@@ -1249,6 +1249,36 @@ describe('function node', function() {
         });
     });
 
+    it('should allow accessing env vars', function(done) {
+        var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = env.get('_TEST_FOO_'); return msg;"},
+        {id:"n2", type:"helper"}];
+        helper.load(functionNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            var count = 0;
+            delete process.env._TEST_FOO_;
+
+            n2.on("input", function(msg) {
+                try {
+                    if (count === 0) {
+                        msg.should.have.property('payload', undefined);
+                        process.env._TEST_FOO_ = "hello";
+                        count++;
+                        n1.receive({payload:"foo",topic: "bar"});
+                    } else {
+                        msg.should.have.property('payload', "hello");
+                        done();
+                    }
+                } catch(err) {
+                    done(err);
+                } finally {
+                    delete process.env._TEST_FOO_;
+                }
+            });
+            n1.receive({payload:"foo",topic: "bar"});
+        });
+    });
+
     describe('Logger', function () {
         it('should log an Info Message', function (done) {
             var flow = [{id: "n1", type: "function", wires: [["n2"]], func: "node.log('test');"}];