Merge pull request #399 from telefonicaid/task/add_authentication_opt…

…ions add authentication options
telefonicaid · Oct 16, 2019 · 0f02d91 · 0f02d91
2 parents 20046b8 + 91ceb68
commit 0f02d91
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
+- Add authentication config env vars (#349)
 - Add full support for pagination in APIs /rules and /vrules (#364)
 - Add Fiware-Total-Count header to response when count
 - Refactor updateAction doItWithToken to include version 1 and 2

diff --git a/bin/perseo b/bin/perseo
@@ -72,8 +72,11 @@ function loadConfiguration() {
         'PERSEO_SMPP_FROM',
         'PERSEO_SMPP_ENABLED',
         'PERSEO_NOTICES_PATH',
-        'PERSEO_RULES_PATH'
-
+        'PERSEO_RULES_PATH',
+        'PERSEO_AUTHENTICATION_HOST',
+        'PERSEO_AUTHENTICATION_PORT',
+        'PERSEO_AUTHENTICATION_USER',
+        'PERSEO_AUTHENTICATION_PASSWORD'
     ];
 
     for (var i = 0; i < environmentValues.length; i++) {
@@ -154,6 +157,12 @@ function loadConfiguration() {
     config.smpp.enabled = process.env.PERSEO_SMPP_ENABLED || config.smpp.enabled;
     config.endpoint.noticesPath = process.env.PERSEO_NOTICES_PATH || config.endpoint.noticesPath;
     config.endpoint.rulesPath = process.env.PERSEO_RULES_PATH || config.endpoint.rulesPath;
+
+    config.authentication = config.authentication || {};
+    config.authentication.host = process.env.PERSEO_AUTHENTICATION_HOST || config.authentication.host;
+    config.authentication.port = process.env.PERSEO_AUTHENTICATION_PORT || config.authentication.port;
+    config.authentication.user = process.env.PERSEO_AUTHENTICATION_USER || config.authentication.user;
+    config.authentication.password = process.env.PERSEO_AUTHENTICATION_PASSWORD || config.authentication.password;
 }
 
 loadConfiguration();

diff --git a/documentation/configuration.md b/documentation/configuration.md
@@ -44,6 +44,10 @@ The following table shows the environment variables available for Perseo configu
 | PERSEO_SMPP_ENABLED                | SMPP is default method for SMS instead of use SMS gateway                                  |
 | PERSEO_NOTICES_PATH                | Path for incoming notices, default value '/notices'                                        |
 | PERSEO_RULES_PATH                  | Path for incoming rules, default value '/rules'                                            |
+| PERSEO_AUTHENTICATION_HOST         | Host of the authentication endpoint                                                        |
+| PERSEO_AUTHENTICATION_PORT         | Port of the authentication endpoint                                                        |
+| PERSEO_AUTHENTICATION_USER         | User to perform authentication                                                             |
+| PERSEO_AUTHENTICATION_PASSWORD     | Password for the user to perform authentication                                            |
 
 ### Basic Configuration